summaryrefslogtreecommitdiff
path: root/t/t5531-deep-submodule-push.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-01-08 10:47:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-13 17:35:45 (GMT)
commit0b1985050e512d6e0a5fff084ecc7c2232596065 (patch)
tree09929d7423556a20dcf2bc0c66e432f5be39dcf2 /t/t5531-deep-submodule-push.sh
parent54a3c67375384a38eae946b7996d226dbd9c26d4 (diff)
downloadgit-0b1985050e512d6e0a5fff084ecc7c2232596065.zip
git-0b1985050e512d6e0a5fff084ecc7c2232596065.tar.gz
git-0b1985050e512d6e0a5fff084ecc7c2232596065.tar.bz2
t5531: further "matching" fixups
Commit 43eb920 switched one of the sub-repository in this test to matching to prepare for a world where the default becomes "simple". However, the main repository needs a similar change. We did not notice any test failure when merged with b2ed944 (push: switch default from "matching" to "simple", 2013-01-04) because t5531.6 is trying to provoke a failure of "git push" due to a submodule check. When combined with b2ed944 the push still fails, but for the wrong reason (because our upstream setup does not exist, not because of the submodule). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5531-deep-submodule-push.sh')
-rwxr-xr-xt/t5531-deep-submodule-push.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 8c16e04..445bb5f 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -12,6 +12,7 @@ test_expect_success setup '
(
cd work &&
git init &&
+ git config push.default matching &&
mkdir -p gar/bage &&
(
cd gar/bage &&