Skip to content

Commit

Permalink
t5531: further "matching" fixups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jan 13, 2014
1 parent 54a3c67 commit 0b19850
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions t/t5531-deep-submodule-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ test_expect_success setup '
(
cd work &&
git init &&
git config push.default matching &&
mkdir -p gar/bage &&
(
cd gar/bage &&
Expand Down

0 comments on commit 0b19850

Please sign in to comment.