Code

git-commit: Disallow amend if it is going to produce an empty non-merge commit
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 12 Sep 2007 16:14:22 +0000 (20:14 +0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2007 17:50:27 +0000 (10:50 -0700)
commit4fb5fd5d301ee53882a3c2ed717c5a9fd6dc0506
treed6e5ce7549155b3d7a2dca968afcfcd6f5895057
parent3803bceae84fe122eccb49e3096abead508cde8f
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>
git-commit.sh