From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Mar 2008 09:05:12 +0000 (-0700)
Subject: Merge branch 'jc/cherry-pick' (early part)
X-Git-Tag: v1.5.5-rc0~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d921e2931e5041884d8f86fdccc9004a7b071cc;p=git

Merge branch 'jc/cherry-pick' (early part)

* 'jc/cherry-pick' (early part):
  expose a helper function peel_to_type().
  merge-recursive: split low-level merge functions out.

Conflicts:

	Makefile
	builtin-merge-recursive.c
	sha1_name.c
---

5d921e2931e5041884d8f86fdccc9004a7b071cc
diff --cc Makefile
index 7fbb815782,64f67afb8d..514738046f
--- a/Makefile
+++ b/Makefile
@@@ -308,8 -301,7 +308,8 @@@ LIB_H = 
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
  	tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
  	utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
- 	mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h fsck.h \
 -	mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h
++	mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h fsck.h \
 +	pack-revindex.h
  
  DIFF_OBJS = \
  	diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -332,8 -324,7 +332,8 @@@ LIB_OBJS = 
  	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
  	color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
  	convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \
 -	transport.o bundle.o walker.o parse-options.o ws.o archive.o ll-merge.o
 +	transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \
- 	alias.o fsck.o pack-revindex.o
++	ll-merge.o alias.o fsck.o pack-revindex.o
  
  BUILTIN_OBJS = \
  	builtin-add.o \
diff --cc builtin-merge-recursive.c
index 6fe4102c0c,d09f66e5f3..5a0a7b5297
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@@ -16,9 -14,7 +15,10 @@@
  #include "unpack-trees.h"
  #include "path-list.h"
  #include "xdiff-interface.h"
+ #include "ll-merge.h"
 +#include "interpolate.h"
 +#include "attr.h"
 +#include "merge-recursive.h"
  
  static int subtree_merge;