diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:13 -0800 |
| commit | 015fba38345c685275864e5b216c74e8ba0633bb (patch) | |
| tree | 353f4ca0bb1b0d5e3bb504c9fe4d227a2fd3ad93 /t | |
| parent | Merge branch 'cw/tag-reflog-message' (diff) | |
| parent | pathspec: don't error out on all-exclusionary pathspec patterns (diff) | |
| download | tgif-015fba38345c685275864e5b216c74e8ba0633bb.tar.xz | |
Merge branch 'lt/pathspec-negative'
The "negative" pathspec feature was somewhat more cumbersome to use
than necessary in that its short-hand used "!" which needed to be
escaped from shells, and it required "exclude from what?" specified.
* lt/pathspec-negative:
pathspec: don't error out on all-exclusionary pathspec patterns
pathspec magic: add '^' as alias for '!'
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6132-pathspec-exclude.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh index d51595cf6b..9dd5cde5fc 100755 --- a/t/t6132-pathspec-exclude.sh +++ b/t/t6132-pathspec-exclude.sh @@ -25,8 +25,10 @@ EOF test_cmp expect actual ' -test_expect_success 'exclude only should error out' ' - test_must_fail git log --oneline --format=%s -- ":(exclude)sub" +test_expect_success 'exclude only no longer errors out' ' + git log --oneline --format=%s -- . ":(exclude)sub" >expect && + git log --oneline --format=%s -- ":(exclude)sub" >actual && + test_cmp expect actual ' test_expect_success 't_e_i() exclude sub' ' |