diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-19 00:32:52 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 00:32:52 +0300 |
commit | f8a1cee7b38ef3125ce69dad24af41746a0722a0 (patch) | |
tree | 5f7c28593053ec30766bb6606b6945c6217d0124 /t | |
parent | 30f5257611f80dc36bc6f15bdd6228ec094c2087 (diff) | |
parent | 39664cb0aca42f240468ddf84fe75df4172ab63f (diff) |
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
Diffstat (limited to 't')
-rwxr-xr-x | t/t4211-line-log.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 2d1d7b5d19..85d151423d 100755 --- 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 && |