From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Dec 2007 03:23:03 +0000 (-0800)
Subject: fix git commit --amend -m "new message"
X-Git-Tag: v1.5.4-rc2~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fbcf1184026197128582369074201c490009b4eb;p=git.git

fix git commit --amend -m "new message"

The prepare_log_message() function serves two purposes:

 - Prepares the commit log message template, to be given to the end
   user;

 - Return true if there is something committable;

7168624c3530d8c7ee32f930f8fb2ba302b9801f (Do not generate full commit
log message if it is not going to be used) cheated to omit the former
when we know the log message template is not going to be used.  However,
its replacement logic to see if there is something committable was
botched.  When amending, it should compare the index with the parent of
the HEAD, not the current HEAD.  Otherwise you cannot run --amend to
fix only the message without changing the tree.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-commit.c b/builtin-commit.c
index 0a9101324..96410de55 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -375,6 +375,7 @@ static int prepare_log_message(const char *index_file, const char *prefix)
 	if (no_edit) {
 		struct rev_info rev;
 		unsigned char sha1[40];
+		const char *parent = "HEAD";
 
 		fclose(fp);
 
@@ -384,9 +385,12 @@ static int prepare_log_message(const char *index_file, const char *prefix)
 		if (get_sha1("HEAD", sha1) != 0)
 			return !!active_nr;
 
+		if (amend)
+			parent = "HEAD^1";
+
 		init_revisions(&rev, "");
 		rev.abbrev = 0;
-		setup_revisions(0, NULL, &rev, "HEAD");
+		setup_revisions(0, NULL, &rev, parent);
 		DIFF_OPT_SET(&rev.diffopt, QUIET);
 		DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
 		run_diff_index(&rev, 1 /* cached */);