undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-commit: Allow to amend a merge commit that does not change the tree

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2007-12-02 23:55:23 -08:00
parent 69e7491835
commit 9663c3bc6a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin-commit.c
View File

@ -676,6 +676,14 @@ int git_commit_config(const char *k, const char *v)
return git_status_config(k, 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[] = static const char commit_utf8_warn[] =
"Warning: commit message does not conform to UTF-8.\n" "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" "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; 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); run_status(stdout, index_file, prefix);
rollback_index_files(); rollback_index_files();
unlink(commit_editmsg); unlink(commit_editmsg);