summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_-SF_master_--max-count=1
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-01-08 05:47:56 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 09:35:45 -0800
commit0b1985050e512d6e0a5fff084ecc7c2232596065 (patch)
tree09929d7423556a20dcf2bc0c66e432f5be39dcf2 /t/t4013/diff.log_-SF_master_--max-count=1
parentMerge branch 'jc/push-2.0-default-to-simple' (early part) (diff)
downloadtgif-0b1985050e512d6e0a5fff084ecc7c2232596065.tar.xz
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/t4013/diff.log_-SF_master_--max-count=1')
0 files changed, 0 insertions, 0 deletions