summaryrefslogtreecommitdiffstats
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2011-12-08 14:10:15 +0100
committerJunio C Hamano <gitster@pobox.com>2011-12-09 01:01:47 +0100
commit2f139044f96227deb8332942627a04b29c70c2bf (patch)
tree2fad330f7671004d3fc178e7c516de8c56a3df8f /t/t3310-notes-merge-manual-resolve.sh
parentMerge branch 'master' of git://bogomips.org/git-svn (diff)
downloadgit-2f139044f96227deb8332942627a04b29c70c2bf.tar.xz
git-2f139044f96227deb8332942627a04b29c70c2bf.zip
t3200 (branch): fix '&&' chaining
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Fix these breaks. The 'git branch --help' in the test may fail if git manual pages are not installed, but the point of the test is to make sure it does not create a bogus branch "--help", so run it under 'test_might_fail'. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions