[PATCH] fix git commit --amend -m "new message"
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 20, 2007, 03:23 UTC
- Message-ID
- <7v8x3qrqw8.fsf@gitster.siamese.dyndns.org>
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> ---
* I think the other cheat to return !!active_nr is checking if it is the initial commit, and its test that appear in the context of this patch should be replaced with "if (initial_commit)", but I wanted to first fix the bug.
builtin-commit.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c index 0a91013..96410de 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 */);