Junio C Hamano <gitster@xxxxxxxxx> writes:
>>> + if (rev->line_level_traverse) {
>>> + if (rev->diffopt.filter)
>>> + die(_("-L<range>:<file> cannot be used with pathspec"));
>>
>> Should this be checking rev->diffopt.pathspec.nr?
>
> Embarrassing but yes ;-).
I wonder if rev->prune_data.nr is what matters here, though.
The prune_data is often identical to diffopt.pathspec, but the
former affects the paths that participate in history simplification,
while the latter is used when deciding which paths to show
differences between the commit and its parent(s) and used to widen
the set independently from prune_data for the "--full-diff" option.
-- >8 --
Subject: [PATCH] log: diagnose -L used with pathspec as an error
The -L option is documented to accept no pathspec, but the
command line option parser has allowed the combination without
checking so far. Ensure that there is no pathspec when the -L
option is in effect to fix this.
Incidentally, this change fixes another bug in the command line
option parser, which has allowed the -L option used together
with the --follow option. Because the latter requires exactly
one path given, but the former takes no pathspec, they become
mutually incompatible automatically. Because the -L option
follows renames on its own, there is no reason to give --follow
at the same time.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/log.c | 3 +++
t/t4211-line-log.sh | 18 ++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/builtin/log.c b/builtin/log.c
index 0a7ed4bef9..9d70f3e60b 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -206,6 +206,9 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
if (argc > 1)
die(_("unrecognized argument: %s"), argv[1]);
+ if (rev->line_level_traverse && rev->prune_data.nr)
+ die(_("-L<range>:<file> cannot be used with pathspec"));
+
memset(&w, 0, sizeof(w));
userformat_find_requirements(NULL, &w);
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 2d1d7b5d19..3d1bd6ed80 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -8,6 +8,24 @@ test_expect_success 'setup (import history)' '
git reset --hard
'
+# Basic command line option parsing
+test_expect_success '-L is incompatible with pathspec' '
+ # This may fail due to "no such path a.c in commit",
+ # or "-L is incompatible with pathspec". Either is acceptable.
+ test_must_fail git log -L1,1:a.c -- a.c &&
+
+ # This must fail due to "-L is incompatible with pathspec".
+ test_must_fail git log -L1,1:b.c -- b.c &&
+
+ # These must fail due to "follow requires one pathspec".
+ test_must_fail git log -L1,1:b.c --follow &&
+ test_must_fail git log --follow -L1,1:b.c &&
+
+ # This may fail due to "-L is incompatible with pathspec",
+ # or "-L is incompatible with pathspec". Either is acceptable.
+ test_must_fail git log --follow -L1,1:b.c -- b.c
+'
+
canned_test_1 () {
test_expect_$1 "$2" "
git log $2 >actual &&
--
2.29.2-287-gba574db674
