Merge branch 'jc/line-log-takes-no-pathspec'

"git log -L<range>:<path>" is documented to take no pathspec, but
this was not enforced by the command line option parser, which has
been corrected.

* jc/line-log-takes-no-pathspec:
  log: diagnose -L used with pathspec as an error

diff --git a/builtin/log.c b/builtin/log.c
index 9f939e6cdf2f1048177bed0a5e7ab174f4020ded..9fd49fa914c913cc5b6fdb0e5dd5424c10a9c2e9 100644 (file)
--- 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 2d1d7b5d1938a05daa6a98359a2dfd5e1be645e2..85d151423dedc363c83d6e168e33e0a612e70a6e 100755 (executable)
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -8,6 +8,28 @@ test_expect_success 'setup (import history)' '
        git reset --hard
 '
 
+test_expect_success 'basic command line parsing' '
+       # This may fail due to "no such path a.c in commit", or
+       # "-L is incompatible with pathspec", depending on the
+       # order the error is checked.  Either is acceptable.
+       test_must_fail git log -L1,1:a.c -- a.c &&
+
+       # -L requires there is no pathspec
+       test_must_fail git log -L1,1:b.c -- b.c 2>error &&
+       test_i18ngrep "cannot be used with pathspec" error &&
+
+       # This would fail because --follow wants a single path, but
+       # we may fail due to incompatibility between -L/--follow in
+       # the future.  Either is acceptable.
+       test_must_fail git log -L1,1:b.c --follow &&
+       test_must_fail git log --follow -L1,1:b.c &&
+
+       # This would fail because -L wants no pathspec, but
+       # we may fail due to incompatibility between -L/--follow in
+       # the future.  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 &&