mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mv/commit-tree'

Browse Source 
* 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
This commit is contained in:
Shawn O. Pearce
2008-09-25 09:16:33 -07:00
parent 81b84bcbe3 7a172b0dcb
commit 1fa24f8f3d
5 changed files with 79 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-merge.c
View File

@ -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);