aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-11-09 00:41:39 +0100
committerJunio C Hamano <gitster@pobox.com>2007-11-08 23:55:55 -0800
commitd9c8344b467bb97b8dca8d811c99d4735eca88f2 (patch)
tree39b01977ecc6403de9165003d9e37bb7e7fe59e8 /t
parentd349a03e7401625a9bb92f403f36923472e498c6 (diff)
downloadgit-d9c8344b467bb97b8dca8d811c99d4735eca88f2.tar.gz
git-d9c8344b467bb97b8dca8d811c99d4735eca88f2.tar.xz
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 <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t1400-update-ref.sh2
1 files changed, 1 insertions, 1 deletions
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 <<EOF