diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 16:16:33 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 16:16:33 (GMT) |
| commit | 1fa24f8f3d950b17ac15979c09b733c8e6f5c00c (patch) | |
| tree | cd2c8c5995a42a407daabd1012d9b46faf180a9b /builtin-merge.c | |
| parent | 81b84bcbe3cc6a29a62fb1a69c68764ad6c0feeb (diff) | |
| parent | 7a172b0dcb9d8ac2311a5c3f674f711476872e71 (diff) | |
| download | git-1fa24f8f3d950b17ac15979c09b733c8e6f5c00c.zip git-1fa24f8f3d950b17ac15979c09b733c8e6f5c00c.tar.gz git-1fa24f8f3d950b17ac15979c09b733c8e6f5c00c.tar.bz2 | |
Merge branch 'mv/commit-tree'
* mv/commit-tree:
t7603: add new testcases to ensure builtin-commit uses reduce_heads()
builtin-commit: use commit_tree()
commit_tree(): add a new author parameter
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 1094c5f..1942e72 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -693,7 +693,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; @@ -722,7 +722,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); |