diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:55:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:55:23 -0800 |
| commit | 9663c3bc6a04b9b4f63a54b820d3edb16aa95e6d (patch) | |
| tree | d71955c3aa9b04fec7b11564edff1106913cbbe0 | |
| parent | quote_path: fix collapsing of relative paths (diff) | |
| download | tgif-9663c3bc6a04b9b4f63a54b820d3edb16aa95e6d.tar.xz | |
git-commit: Allow to amend a merge commit that does not change the tree
Normally, it should not be allowed to generate an empty commit. A merge
commit generated with git 'merge -s ours' does not change the tree (along
the first parent), but merges are not "empty" even if they do not change
the tree. Hence, we should be careful not to forbid this case.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-commit.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index f37a90f078..6c2dc390c4 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -676,6 +676,14 @@ int git_commit_config(const char *k, const char *v) return git_status_config(k, v); } +static int is_a_merge(const unsigned char *sha1) +{ + struct commit *commit = lookup_commit(sha1); + if (!commit || parse_commit(commit)) + die("could not parse HEAD commit"); + return !!(commit->parents && commit->parents->next); +} + static const char commit_utf8_warn[] = "Warning: commit message does not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -701,7 +709,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) return 1; } - if (!prepare_log_message(index_file, prefix) && !in_merge) { + if (!prepare_log_message(index_file, prefix) && !in_merge && + !(amend && is_a_merge(head_sha1))) { run_status(stdout, index_file, prefix); rollback_index_files(); unlink(commit_editmsg); |