From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 25 Sep 2008 16:16:33 +0000 (-0700)
Subject: Merge branch 'mv/commit-tree'
X-Git-Tag: v1.6.1-rc1~206
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1fa24f8f3d950b17ac15979c09b733c8e6f5c00c?hp=-c

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
---

1fa24f8f3d950b17ac15979c09b733c8e6f5c00c
diff --combined builtin-merge.c
index 1094c5fd58,4a8ec604d3..1942e72aaf
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@@ -476,8 -476,6 +476,8 @@@ static int git_merge_config(const char 
  
  		buf = xstrdup(v);
  		argc = split_cmdline(buf, &argv);
 +		if (argc < 0)
 +			die("Bad branch.%s.mergeoptions string", branch);
  		argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
  		memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
  		argc++;
@@@ -693,7 -691,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 -720,7 +722,7 @@@ static int finish_automerge(struct comm
  	}
  	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);