diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-10 20:10:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 22:25:46 (GMT) |
| commit | ee20a129de6f332da092e93feb2dd5f8330f9bc0 (patch) | |
| tree | 471d0e4460a41eadf03eac6cb81cda6b8c6848dc /builtin-merge.c | |
| parent | da06a80322a2357b8b5b6ddb8b5648f97ed73e83 (diff) | |
| download | git-ee20a129de6f332da092e93feb2dd5f8330f9bc0.zip git-ee20a129de6f332da092e93feb2dd5f8330f9bc0.tar.gz git-ee20a129de6f332da092e93feb2dd5f8330f9bc0.tar.bz2 | |
commit_tree(): add a new author parameter
In case it's NULL, it is still determined automatically, but now you
have the ability to specify one yourself.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 9ad9791..4a8ec60 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -691,7 +691,7 @@ static int merge_trivial(void) parent->next = xmalloc(sizeof(struct commit_list *)); parent->next->item = remoteheads->item; parent->next->next = NULL; - commit_tree(merge_msg.buf, result_tree, parent, result_commit); + commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL); finish(result_commit, "In-index merge"); drop_save(); return 0; @@ -720,7 +720,7 @@ static int finish_automerge(struct commit_list *common, } free_commit_list(remoteheads); strbuf_addch(&merge_msg, '\n'); - commit_tree(merge_msg.buf, result_tree, parents, result_commit); + commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL); strbuf_addf(&buf, "Merge made by %s.", wt_strategy); finish(result_commit, buf.buf); strbuf_release(&buf); |