From: Alex Riesen Date: Thu, 8 Nov 2007 23:41:39 +0000 (+0100) Subject: stop t1400 hiding errors in tests X-Git-Tag: v1.5.3.6~29 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d9c8344b467bb97b8dca8d811c99d4735eca88f2;p=git.git stop t1400 hiding errors in tests The last rm in the test was lacking an "&&" before it, which caused the errors in the commands be silently hidden. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index ce045b2a5..a90824ba8 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -205,7 +205,7 @@ test_expect_success \ echo $h_TEST >.git/MERGE_HEAD && GIT_AUTHOR_DATE="2005-05-26 23:45" \ GIT_COMMITTER_DATE="2005-05-26 23:45" git-commit -F M && - h_MERGED=$(git rev-parse --verify HEAD) + h_MERGED=$(git rev-parse --verify HEAD) && rm -f M' cat >expect <