diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:12 -0800 |
| commit | a878e7e62b4826a95effa1420cff47807f9cb88b (patch) | |
| tree | 15594eb261507877e60e1a35a4b62371b270f90d /t | |
| parent | Merge branch 'jk/delete-modechange-conflict' into maint (diff) | |
| parent | add: simplify -u/-A without pathspec (diff) | |
| download | tgif-a878e7e62b4826a95effa1420cff47807f9cb88b.tar.xz | |
Merge branch 'jc/add-u-A-default-to-top' into maint
"git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.
* jc/add-u-A-default-to-top:
add: simplify -u/-A without pathspec
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2200-add-update.sh | 2 | ||||
| -rwxr-xr-x | t/t2202-add-addremove.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index e16b15d3e5..314c73c5a7 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -84,6 +84,8 @@ test_expect_success 'non-qualified update in subdir updates from the root' ' ( cd dir1 && echo even more >>sub2 && + git --literal-pathspecs add -u && + echo even more >>sub2 && git add -u ) && : >expect && diff --git a/t/t2202-add-addremove.sh b/t/t2202-add-addremove.sh index fc8b59e7f7..6a5a3166b1 100755 --- a/t/t2202-add-addremove.sh +++ b/t/t2202-add-addremove.sh @@ -14,6 +14,7 @@ test_expect_success setup ' echo expect echo ignored ) >.gitignore && + git --literal-pathspecs add --all && >will-remove && git add --all && test_tick && |