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@xxxxxxxxx> --- Alex Riesen, Fri, Nov 09, 2007 00:27:52 +0100: > Kristian Høgsberg, Thu, Nov 08, 2007 17:59:00 +0100: > > This makes git commit a builtin and moves git-commit.sh to > > Applied instead of 00c8febf563da on Junio's pu it breaks t1400: > > * FAIL 29: git-commit logged updates > diff expect .git/logs/refs/heads/master > > > Which is not the test actually failed. The failed one is 28, but the > last "rm -f M" killed the error because of missed "&&" before it. just separated the fix into a patch of its own. Johannes already took care of the problem with launch_editor not reading the message file. t/t1400-update-ref.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index ce045b2..a90824b 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 -- 1.5.3.5.626.g8f33b - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
