summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-30 13:06:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-30 13:06:55 -0700
commitf7722a447ab6121f0567cb7f211093983c300a97 (patch)
treed03a4bebcfa68b24ab1706173f875f12cb1aca51 /t
parentMerge branch 'ar/clone-dissociate' (diff)
parentadd: simplify -u/-A without pathspec (diff)
downloadtgif-f7722a447ab6121f0567cb7f211093983c300a97.tar.xz
Merge branch 'jc/add-u-A-default-to-top'
"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-xt/t2200-add-update.sh2
-rwxr-xr-xt/t2202-add-addremove.sh1
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 &&