From: Jeff King Date: Wed, 8 Jan 2014 10:47:56 +0000 (-0500) Subject: t5531: further "matching" fixups X-Git-Tag: v1.9-rc0~7^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0b1985050e512d6e0a5fff084ecc7c2232596065?ds=inline;hp=--cc 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 Signed-off-by: Junio C Hamano --- 0b1985050e512d6e0a5fff084ecc7c2232596065 diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 8c16e045a0..445bb5fe26 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 &&