Skip to content

Commit 0b19850

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 54a3c67 commit 0b19850

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

t/t5531-deep-submodule-push.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ test_expect_success setup '
1212
(
1313
cd work &&
1414
git init &&
15+
git config push.default matching &&
1516
mkdir -p gar/bage &&
1617
(
1718
cd gar/bage &&

0 commit comments

Comments
 (0)