summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d349a03)
raw | patch | inline | side by side (parent: d349a03)
author | Alex Riesen <raa.lkml@gmail.com> | |
Thu, 8 Nov 2007 23:41:39 +0000 (00:41 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 9 Nov 2007 07:55:55 +0000 (23:55 -0800) |
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>
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>
t/t1400-update-ref.sh | patch | blob | history |
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index ce045b2a57c13de3ef8a01f806e3472d18bdef37..a90824ba8ab0e6df5c4afad528e30d118e23455c 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
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