@matheusbsbs / matheus-bagliano / commits / a970e84e8a
Fork 0

Allow merging bare trees in merge-recursive.

To support wider use cases, such as from within `git am -3`, the merge-recursive utility needs to accept not just commit-ish but also tree-ish as arguments on its command line. If given a tree-ish then merge-recursive will create a virtual commit wrapping it, with the subject of the commit set to the best name we can derive for that tree, which is either the command line string (probably the SHA1), or whatever string appears in GITHEAD_*. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn O. Pearce committed Dec 28, 2006 at 02:35 UTC a970e84e8ad23a740e456fb4191ed61becef8989
1 file changed +3
merge-recursive.c
+3
@@ -1268,6 +1268,9 @@ static struct commit *get_ref(const char *ref)
1268 if (get_sha1(ref, sha1))
1269 die("Could not resolve ref '%s'", ref);
1270 object = deref_tag(parse_object(sha1), ref, strlen(ref));
1271 + if (object->type == OBJ_TREE)
1272 + return make_virtual_commit((struct tree*)object,
1273 + better_branch_name(ref));
1274 if (object->type != OBJ_COMMIT)
1275 return NULL;
1276 if (parse_commit((struct commit *)object))