[PATCH] t5531: further "matching" fixups
- From
Jeff King <peff@peff.net>
- Date
- Jan 8, 2014, 10:47 UTC
- Message-ID
- <20140108104756.GA32078@sigill.intra.peff.net>
- In-Reply-To
- <20140108102707.GA23145@sigill.intra.peff.net>
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> --- On Wed, Jan 08, 2014 at 05:27:07AM -0500, Jeff King wrote:
> This patch passes the test suite by itself (with or without that fixup). > But oddly, it seems to fail t5531 when merged with 'next'. I can't > figure out why, though. It shouldn't affect any code that doesn't look > at branch->pushremote.
I still don't understand the full reason for this interaction, but the failing test is actually somewhat broken in 'next' already. This patch fixes it, and should be done regardless of the other series.
t/t5531-deep-submodule-push.sh | 1 + 1 file changed, 1 insertion(+)
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 &&
-- 1.8.5.2.500.g8060133