summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-07-27 14:55:02 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-27 12:27:37 -0700
commit1bd37509cac35877761a21c0654eba18fb5a73ad (patch)
tree787954e7f3ff2a8f72241974ced7068c8ddf63e1 /Documentation/merge-config.txt
parentGit 2.9.2 (diff)
downloadtgif-1bd37509cac35877761a21c0654eba18fb5a73ad.tar.xz
t4205: drop top-level &&-chaining
The test currently does something like: do_one() && do_two() && test_expect_success ... We generally avoid performing actions at the top-level of the script (outside of a test_expect block) for two reasons: 1. The test harness is not checking and reporting if they fail. 2. Their output is not handled correctly (not hidden by default, nor shown with "-v"). Using &&-chains seems like it should help with (1), but it doesn't. If either of the commands fails, we simply skip running the follow-on test entirely, and the test harness has no idea. We can fix this by pushing that setup into its own block. It _could_ go into the following test block, but since the result in this case is used by multiple tests, it's more clear to mark it explicitly as a distinct setup step. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions