@matheusbsbs / matheus-bagliano / commits / 4fb5fd5d30
Fork 0

git-commit: Disallow amend if it is going to produce an empty non-merge commit

Right now one can amend the last non-merge commit using a dirty index and in the process maybe cause the last commit to have the same tree as its parent. In such a case one would want to discard the last commit instead of amending it. This reverts commit 8588452ceb78b1da17652ba03f9942ef740e07ea. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Dmitry V. Levin committed Sep 12, 2007 at 20:14 UTC 4fb5fd5d301ee53882a3c2ed717c5a9fd6dc0506
1 file changed +1 -1
git-commit.sh
+1 -1
@@ -554,7 +554,7 @@ else
554 # we need to check if there is anything to commit
555 run_status >/dev/null
556 fi
557 -if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
557 +if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
558 then
559 rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
560 use_status_color=t