From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 29 Sep 2008 18:04:20 +0000 (-0700)
Subject: Merge branch 'bc/master-diff-hunk-header-fix'
X-Git-Tag: v1.6.1-rc1~194
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9800c0df412869c7949935b61581b9361fc49bd1?ds=inline;hp=-c

Merge branch 'bc/master-diff-hunk-header-fix'

* bc/master-diff-hunk-header-fix:
Clarify commit error message for unmerged files
Use strchrnul() instead of strchr() plus manual workaround
Use remove_path from dir.c instead of own implementation
Add remove_path: a function to remove as much as possible of a path
git-submodule: Fix "Unable to checkout" for the initial 'update'
Clarify how the user can satisfy stash's 'dirty state' check.
t4018-diff-funcname: test syntax of builtin xfuncname patterns
t4018-diff-funcname: test syntax of builtin xfuncname patterns
make "git remote" report multiple URLs
diff hunk pattern: fix misconverted "\{" tex macro introducers
diff: fix "multiple regexp" semantics to find hunk header comment
diff: use extended regexp to find hunk headers
diff: use extended regexp to find hunk headers
diff.*.xfuncname which uses "extended" regex's for hunk header selection
diff.c: associate a flag with each pattern and use it for compiling regex
diff.c: return pattern entry pointer rather than just the hunk header pattern

Conflicts:
builtin-merge-recursive.c
t/t7201-co.sh
xdiff-interface.h
---

9800c0df412869c7949935b61581b9361fc49bd1
diff --combined builtin-apply.c
index 2ab4aba5a0,70c9f93554..e2c611bf96
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@@ -13,6 -13,7 +13,7 @@@
  #include "delta.h"
  #include "builtin.h"
  #include "string-list.h"
+ #include "dir.h"
  
  /*
   *  --check turns on checking that the working tree matches the
@@@ -2735,15 -2736,7 +2736,7 @@@ static void remove_file(struct patch *p
  				warning("unable to remove submodule %s",
  					patch->old_name);
  		} else if (!unlink(patch->old_name) && rmdir_empty) {
- 			char *name = xstrdup(patch->old_name);
- 			char *end = strrchr(name, '/');
- 			while (end) {
- 				*end = 0;
- 				if (rmdir(name))
- 					break;
- 				end = strrchr(name, '/');
- 			}
- 			free(name);
+ 			remove_path(patch->old_name);
  		}
  	}
  }
@@@ -2994,45 -2987,29 +2987,45 @@@ static int write_out_results(struct pat
  
  static struct lock_file lock_file;
  
 -static struct excludes {
 -	struct excludes *next;
 -	const char *path;
 -} *excludes;
 +static struct string_list limit_by_name;
 +static int has_include;
 +static void add_name_limit(const char *name, int exclude)
 +{
 +	struct string_list_item *it;
 +
 +	it = string_list_append(name, &limit_by_name);
 +	it->util = exclude ? NULL : (void *) 1;
 +}
  
  static int use_patch(struct patch *p)
  {
  	const char *pathname = p->new_name ? p->new_name : p->old_name;
 -	struct excludes *x = excludes;
 -	while (x) {
 -		if (fnmatch(x->path, pathname, 0) == 0)
 -			return 0;
 -		x = x->next;
 -	}
 +	int i;
 +
 +	/* Paths outside are not touched regardless of "--include" */
  	if (0 < prefix_length) {
  		int pathlen = strlen(pathname);
  		if (pathlen <= prefix_length ||
  		    memcmp(prefix, pathname, prefix_length))
  			return 0;
  	}
 -	return 1;
 +
 +	/* See if it matches any of exclude/include rule */
 +	for (i = 0; i < limit_by_name.nr; i++) {
 +		struct string_list_item *it = &limit_by_name.items[i];
 +		if (!fnmatch(it->string, pathname, 0))
 +			return (it->util != NULL);
 +	}
 +
 +	/*
 +	 * If we had any include, a path that does not match any rule is
 +	 * not used.  Otherwise, we saw bunch of exclude rules (or none)
 +	 * and such a path is used.
 +	 */
 +	return !has_include;
  }
  
 +
  static void prefix_one(char **name)
  {
  	char *old_name = *name;
@@@ -3173,12 -3150,10 +3166,12 @@@ int cmd_apply(int argc, const char **ar
  			continue;
  		}
  		if (!prefixcmp(arg, "--exclude=")) {
 -			struct excludes *x = xmalloc(sizeof(*x));
 -			x->path = arg + 10;
 -			x->next = excludes;
 -			excludes = x;
 +			add_name_limit(arg + 10, 1);
 +			continue;
 +		}
 +		if (!prefixcmp(arg, "--include=")) {
 +			add_name_limit(arg + 10, 0);
 +			has_include = 1;
  			continue;
  		}
  		if (!prefixcmp(arg, "-p")) {
diff --combined builtin-commit.c
index 55e1087d27,6b23143cd7..b920257524
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@@ -639,7 -639,7 +639,7 @@@ static int prepare_to_commit(const cha
  		active_cache_tree = cache_tree();
  	if (cache_tree_update(active_cache_tree,
  			      active_cache, active_nr, 0, 0) < 0) {
- 		error("Error building trees");
+ 		error("Error building trees; the index is unmerged?");
  		return 0;
  	}
  
@@@ -667,14 -667,14 +667,14 @@@
  }
  
  /*
 - * Find out if the message starting at position 'start' in the strbuf
 - * contains only whitespace and Signed-off-by lines.
 + * Find out if the message in the strbuf contains only whitespace and
 + * Signed-off-by lines.
   */
 -static int message_is_empty(struct strbuf *sb, int start)
 +static int message_is_empty(struct strbuf *sb)
  {
  	struct strbuf tmpl;
  	const char *nl;
 -	int eol, i;
 +	int eol, i, start = 0;
  
  	if (cleanup_mode == CLEANUP_NONE && sb->len)
  		return 0;
@@@ -929,14 -929,34 +929,14 @@@ static const char commit_utf8_warn[] 
  "You may want to amend it after fixing the message, or set the config\n"
  "variable i18n.commitencoding to the encoding your project uses.\n";
  
 -static void add_parent(struct strbuf *sb, const unsigned char *sha1)
 -{
 -	struct object *obj = parse_object(sha1);
 -	const char *parent = sha1_to_hex(sha1);
 -	const char *cp;
 -
 -	if (!obj)
 -		die("Unable to find commit parent %s", parent);
 -	if (obj->type != OBJ_COMMIT)
 -		die("Parent %s isn't a proper commit", parent);
 -
 -	for (cp = sb->buf; cp && (cp = strstr(cp, "\nparent ")); cp += 8) {
 -		if (!memcmp(cp + 8, parent, 40) && cp[48] == '\n') {
 -			error("duplicate parent %s ignored", parent);
 -			return;
 -		}
 -	}
 -	strbuf_addf(sb, "parent %s\n", parent);
 -}
 -
  int cmd_commit(int argc, const char **argv, const char *prefix)
  {
 -	int header_len;
  	struct strbuf sb;
  	const char *index_file, *reflog_msg;
  	char *nl, *p;
  	unsigned char commit_sha1[20];
  	struct ref_lock *ref_lock;
 +	struct commit_list *parents = NULL, **pptr = &parents;
  
  	git_config(git_commit_config, NULL);
  
@@@ -951,6 -971,13 +951,6 @@@
  		return 1;
  	}
  
 -	/*
 -	 * The commit object
 -	 */
 -	strbuf_init(&sb, 0);
 -	strbuf_addf(&sb, "tree %s\n",
 -		    sha1_to_hex(active_cache_tree->sha1));
 -
  	/* Determine parents */
  	if (initial_commit) {
  		reflog_msg = "commit (initial)";
@@@ -964,13 -991,13 +964,13 @@@
  			die("could not parse HEAD commit");
  
  		for (c = commit->parents; c; c = c->next)
 -			add_parent(&sb, c->item->object.sha1);
 +			pptr = &commit_list_insert(c->item, pptr)->next;
  	} else if (in_merge) {
  		struct strbuf m;
  		FILE *fp;
  
  		reflog_msg = "commit (merge)";
 -		add_parent(&sb, head_sha1);
 +		pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
  		strbuf_init(&m, 0);
  		fp = fopen(git_path("MERGE_HEAD"), "r");
  		if (fp == NULL)
@@@ -980,18 -1007,24 +980,18 @@@
  			unsigned char sha1[20];
  			if (get_sha1_hex(m.buf, sha1) < 0)
  				die("Corrupt MERGE_HEAD file (%s)", m.buf);
 -			add_parent(&sb, sha1);
 +			pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
  		}
  		fclose(fp);
  		strbuf_release(&m);
  	} else {
  		reflog_msg = "commit";
 -		strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1));
 +		pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
  	}
 -
 -	strbuf_addf(&sb, "author %s\n",
 -		    fmt_ident(author_name, author_email, author_date, IDENT_ERROR_ON_NO_NAME));
 -	strbuf_addf(&sb, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME));
 -	if (!is_encoding_utf8(git_commit_encoding))
 -		strbuf_addf(&sb, "encoding %s\n", git_commit_encoding);
 -	strbuf_addch(&sb, '\n');
 +	parents = reduce_heads(parents);
  
  	/* Finally, get the commit message */
 -	header_len = sb.len;
 +	strbuf_init(&sb, 0);
  	if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
  		rollback_index_files();
  		die("could not read commit message");
@@@ -1004,15 -1037,16 +1004,15 @@@
  
  	if (cleanup_mode != CLEANUP_NONE)
  		stripspace(&sb, cleanup_mode == CLEANUP_ALL);
 -	if (sb.len < header_len || message_is_empty(&sb, header_len)) {
 +	if (message_is_empty(&sb)) {
  		rollback_index_files();
  		fprintf(stderr, "Aborting commit due to empty commit message.\n");
  		exit(1);
  	}
 -	strbuf_addch(&sb, '\0');
 -	if (is_encoding_utf8(git_commit_encoding) && !is_utf8(sb.buf))
 -		fprintf(stderr, commit_utf8_warn);
  
 -	if (write_sha1_file(sb.buf, sb.len - 1, commit_type, commit_sha1)) {
 +	if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
 +			fmt_ident(author_name, author_email, author_date,
 +				IDENT_ERROR_ON_NO_NAME))) {
  		rollback_index_files();
  		die("failed to write commit object");
  	}
@@@ -1021,11 -1055,12 +1021,11 @@@
  					   initial_commit ? NULL : head_sha1,
  					   0);
  
 -	nl = strchr(sb.buf + header_len, '\n');
 +	nl = strchr(sb.buf, '\n');
  	if (nl)
  		strbuf_setlen(&sb, nl + 1 - sb.buf);
  	else
  		strbuf_addch(&sb, '\n');
 -	strbuf_remove(&sb, 0, header_len);
  	strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
  	strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
  
diff --combined builtin-for-each-ref.c
index e59bd8075e,72c087840c..fa6c1ed752
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@@ -320,9 -320,7 +320,7 @@@ static const char *find_wholine(const c
  
  static const char *copy_line(const char *buf)
  {
- 	const char *eol = strchr(buf, '\n');
- 	if (!eol) // simulate strchrnul()
- 		eol = buf + strlen(buf);
+ 	const char *eol = strchrnul(buf, '\n');
  	return xmemdupz(buf, eol - buf);
  }
  
@@@ -545,107 -543,6 +543,107 @@@ static void grab_values(struct atom_val
  	}
  }
  
 +/*
 + * generate a format suitable for scanf from a ref_rev_parse_rules
 + * rule, that is replace the "%.*s" spec with a "%s" spec
 + */
 +static void gen_scanf_fmt(char *scanf_fmt, const char *rule)
 +{
 +	char *spec;
 +
 +	spec = strstr(rule, "%.*s");
 +	if (!spec || strstr(spec + 4, "%.*s"))
 +		die("invalid rule in ref_rev_parse_rules: %s", rule);
 +
 +	/* copy all until spec */
 +	strncpy(scanf_fmt, rule, spec - rule);
 +	scanf_fmt[spec - rule] = '\0';
 +	/* copy new spec */
 +	strcat(scanf_fmt, "%s");
 +	/* copy remaining rule */
 +	strcat(scanf_fmt, spec + 4);
 +
 +	return;
 +}
 +
 +/*
 + * Shorten the refname to an non-ambiguous form
 + */
 +static char *get_short_ref(struct refinfo *ref)
 +{
 +	int i;
 +	static char **scanf_fmts;
 +	static int nr_rules;
 +	char *short_name;
 +
 +	/* pre generate scanf formats from ref_rev_parse_rules[] */
 +	if (!nr_rules) {
 +		size_t total_len = 0;
 +
 +		/* the rule list is NULL terminated, count them first */
 +		for (; ref_rev_parse_rules[nr_rules]; nr_rules++)
 +			/* no +1 because strlen("%s") < strlen("%.*s") */
 +			total_len += strlen(ref_rev_parse_rules[nr_rules]);
 +
 +		scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len);
 +
 +		total_len = 0;
 +		for (i = 0; i < nr_rules; i++) {
 +			scanf_fmts[i] = (char *)&scanf_fmts[nr_rules]
 +					+ total_len;
 +			gen_scanf_fmt(scanf_fmts[i], ref_rev_parse_rules[i]);
 +			total_len += strlen(ref_rev_parse_rules[i]);
 +		}
 +	}
 +
 +	/* bail out if there are no rules */
 +	if (!nr_rules)
 +		return ref->refname;
 +
 +	/* buffer for scanf result, at most ref->refname must fit */
 +	short_name = xstrdup(ref->refname);
 +
 +	/* skip first rule, it will always match */
 +	for (i = nr_rules - 1; i > 0 ; --i) {
 +		int j;
 +		int short_name_len;
 +
 +		if (1 != sscanf(ref->refname, scanf_fmts[i], short_name))
 +			continue;
 +
 +		short_name_len = strlen(short_name);
 +
 +		/*
 +		 * check if the short name resolves to a valid ref,
 +		 * but use only rules prior to the matched one
 +		 */
 +		for (j = 0; j < i; j++) {
 +			const char *rule = ref_rev_parse_rules[j];
 +			unsigned char short_objectname[20];
 +
 +			/*
 +			 * the short name is ambiguous, if it resolves
 +			 * (with this previous rule) to a valid ref
 +			 * read_ref() returns 0 on success
 +			 */
 +			if (!read_ref(mkpath(rule, short_name_len, short_name),
 +				      short_objectname))
 +				break;
 +		}
 +
 +		/*
 +		 * short name is non-ambiguous if all previous rules
 +		 * haven't resolved to a valid ref
 +		 */
 +		if (j == i)
 +			return short_name;
 +	}
 +
 +	free(short_name);
 +	return ref->refname;
 +}
 +
 +
  /*
   * Parse the object referred by ref, and grab needed value.
   */
@@@ -671,33 -568,13 +669,33 @@@ static void populate_value(struct refin
  	for (i = 0; i < used_atom_cnt; i++) {
  		const char *name = used_atom[i];
  		struct atom_value *v = &ref->value[i];
 -		if (!strcmp(name, "refname"))
 -			v->s = ref->refname;
 -		else if (!strcmp(name, "*refname")) {
 -			int len = strlen(ref->refname);
 -			char *s = xmalloc(len + 4);
 -			sprintf(s, "%s^{}", ref->refname);
 -			v->s = s;
 +		int deref = 0;
 +		if (*name == '*') {
 +			deref = 1;
 +			name++;
 +		}
 +		if (!prefixcmp(name, "refname")) {
 +			const char *formatp = strchr(name, ':');
 +			const char *refname = ref->refname;
 +
 +			/* look for "short" refname format */
 +			if (formatp) {
 +				formatp++;
 +				if (!strcmp(formatp, "short"))
 +					refname = get_short_ref(ref);
 +				else
 +					die("unknown refname format %s",
 +					    formatp);
 +			}
 +
 +			if (!deref)
 +				v->s = refname;
 +			else {
 +				int len = strlen(refname);
 +				char *s = xmalloc(len + 4);
 +				sprintf(s, "%s^{}", refname);
 +				v->s = s;
 +			}
  		}
  	}
  
diff --combined diff.c
index a2f4850d4f,a3793f65e7..b001d7b507
--- a/diff.c
+++ b/diff.c
@@@ -24,7 -24,6 +24,7 @@@ static int diff_suppress_blank_empty
  int diff_use_color_default = -1;
  static const char *external_diff_cmd_cfg;
  int diff_auto_refresh_index = 1;
 +static int diff_mnemonic_prefix;
  
  static char diff_colors[][COLOR_MAXLEN] = {
  	"\033[m",	/* reset */
@@@ -96,32 -95,37 +96,37 @@@ static int parse_lldiff_command(const c
   * to define a customized regexp to find the beginning of a function to
   * be used for hunk header lines of "diff -p" style output.
   */
- static struct funcname_pattern {
+ struct funcname_pattern_entry {
  	char *name;
  	char *pattern;
- 	struct funcname_pattern *next;
+ 	int cflags;
+ };
+ static struct funcname_pattern_list {
+ 	struct funcname_pattern_list *next;
+ 	struct funcname_pattern_entry e;
  } *funcname_pattern_list;
  
- static int parse_funcname_pattern(const char *var, const char *ep, const char *value)
+ static int parse_funcname_pattern(const char *var, const char *ep, const char *value, int cflags)
  {
  	const char *name;
  	int namelen;
- 	struct funcname_pattern *pp;
+ 	struct funcname_pattern_list *pp;
  
  	name = var + 5; /* "diff." */
  	namelen = ep - name;
  
  	for (pp = funcname_pattern_list; pp; pp = pp->next)
- 		if (!strncmp(pp->name, name, namelen) && !pp->name[namelen])
+ 		if (!strncmp(pp->e.name, name, namelen) && !pp->e.name[namelen])
  			break;
  	if (!pp) {
  		pp = xcalloc(1, sizeof(*pp));
- 		pp->name = xmemdupz(name, namelen);
+ 		pp->e.name = xmemdupz(name, namelen);
  		pp->next = funcname_pattern_list;
  		funcname_pattern_list = pp;
  	}
- 	free(pp->pattern);
- 	pp->pattern = xstrdup(value);
+ 	free(pp->e.pattern);
+ 	pp->e.pattern = xstrdup(value);
+ 	pp->e.cflags = cflags;
  	return 0;
  }
  
@@@ -151,10 -155,6 +156,10 @@@ int git_diff_ui_config(const char *var
  		diff_auto_refresh_index = git_config_bool(var, value);
  		return 0;
  	}
 +	if (!strcmp(var, "diff.mnemonicprefix")) {
 +		diff_mnemonic_prefix = git_config_bool(var, value);
 +		return 0;
 +	}
  	if (!strcmp(var, "diff.external"))
  		return git_config_string(&external_diff_cmd_cfg, var, value);
  	if (!prefixcmp(var, "diff.")) {
@@@ -194,7 -194,13 +199,13 @@@ int git_diff_basic_config(const char *v
  			if (!strcmp(ep, ".funcname")) {
  				if (!value)
  					return config_error_nonbool(var);
- 				return parse_funcname_pattern(var, ep, value);
+ 				return parse_funcname_pattern(var, ep, value,
+ 					0);
+ 			} else if (!strcmp(ep, ".xfuncname")) {
+ 				if (!value)
+ 					return config_error_nonbool(var);
+ 				return parse_funcname_pattern(var, ep, value,
+ 					REG_EXTENDED);
  			}
  		}
  	}
@@@ -317,15 -323,6 +328,15 @@@ static void emit_rewrite_diff(const cha
  	const char *new = diff_get_color(color_diff, DIFF_FILE_NEW);
  	const char *reset = diff_get_color(color_diff, DIFF_RESET);
  	static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
 +	const char *a_prefix, *b_prefix;
 +
 +	if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
 +		a_prefix = o->b_prefix;
 +		b_prefix = o->a_prefix;
 +	} else {
 +		a_prefix = o->a_prefix;
 +		b_prefix = o->b_prefix;
 +	}
  
  	name_a += (*name_a == '/');
  	name_b += (*name_b == '/');
@@@ -334,8 -331,8 +345,8 @@@
  
  	strbuf_reset(&a_name);
  	strbuf_reset(&b_name);
 -	quote_two_c_style(&a_name, o->a_prefix, name_a, 0);
 -	quote_two_c_style(&b_name, o->b_prefix, name_b, 0);
 +	quote_two_c_style(&a_name, a_prefix, name_a, 0);
 +	quote_two_c_style(&b_name, b_prefix, name_b, 0);
  
  	diff_populate_filespec(one, 0);
  	diff_populate_filespec(two, 0);
@@@ -1131,13 -1128,9 +1142,13 @@@ static void show_dirstat(struct diff_op
  		/*
  		 * Original minus copied is the removed material,
  		 * added is the new material.  They are both damages
 -		 * made to the preimage.
 +		 * made to the preimage. In --dirstat-by-file mode, count
 +		 * damaged files, not damaged lines. This is done by
 +		 * counting only a single damaged line per file.
  		 */
  		damage = (p->one->size - copied) + added;
 +		if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE) && damage > 0)
 +			damage = 1;
  
  		ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
  		dir.files[dir.nr].name = name;
@@@ -1400,42 -1393,45 +1411,45 @@@ int diff_filespec_is_binary(struct diff
  	return one->is_binary;
  }
  
- static const char *funcname_pattern(const char *ident)
+ static const struct funcname_pattern_entry *funcname_pattern(const char *ident)
  {
- 	struct funcname_pattern *pp;
+ 	struct funcname_pattern_list *pp;
  
  	for (pp = funcname_pattern_list; pp; pp = pp->next)
- 		if (!strcmp(ident, pp->name))
- 			return pp->pattern;
+ 		if (!strcmp(ident, pp->e.name))
+ 			return &pp->e;
  	return NULL;
  }
  
- static struct builtin_funcname_pattern {
- 	const char *name;
- 	const char *pattern;
- } builtin_funcname_pattern[] = {
- 	{ "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
- 	{ "html", "^\\s*\\(<[Hh][1-6]\\s.*>.*\\)$" },
- 	{ "java", "!^[ 	]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
- 			"new\\|return\\|switch\\|throw\\|while\\)\n"
- 			"^[ 	]*\\(\\([ 	]*"
- 			"[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
- 			"[ 	]*([^;]*\\)$" },
- 	{ "pascal", "^\\(\\(procedure\\|function\\|constructor\\|"
- 			"destructor\\|interface\\|implementation\\|"
- 			"initialization\\|finalization\\)[ \t]*.*\\)$"
- 			"\\|"
- 			"^\\(.*=[ \t]*\\(class\\|record\\).*\\)$"
- 			},
- 	{ "php", "^[\t ]*\\(\\(function\\|class\\).*\\)" },
- 	{ "python", "^\\s*\\(\\(class\\|def\\)\\s.*\\)$" },
- 	{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
- 	{ "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
+ static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
+ 	{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
+ 	  REG_EXTENDED },
+ 	{ "html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", REG_EXTENDED },
+ 	{ "java",
+ 	  "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
+ 	  "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
+ 	  REG_EXTENDED },
+ 	{ "pascal",
+ 	  "^((procedure|function|constructor|destructor|interface|"
+ 		"implementation|initialization|finalization)[ \t]*.*)$"
+ 	  "\n"
+ 	  "^(.*=[ \t]*(class|record).*)$",
+ 	  REG_EXTENDED },
+ 	{ "php", "^[\t ]*((function|class).*)", REG_EXTENDED },
+ 	{ "python", "^[ \t]*((class|def)[ \t].*)$", REG_EXTENDED },
+ 	{ "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
+ 	  REG_EXTENDED },
+ 	{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
+ 	  REG_EXTENDED },
+ 	{ "tex",
+ 	  "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
+ 	  REG_EXTENDED },
  };
  
- static const char *diff_funcname_pattern(struct diff_filespec *one)
+ static const struct funcname_pattern_entry *diff_funcname_pattern(struct diff_filespec *one)
  {
- 	const char *ident, *pattern;
+ 	const char *ident;
+ 	const struct funcname_pattern_entry *pe;
  	int i;
  
  	diff_filespec_check_attr(one);
@@@ -1450,9 -1446,9 +1464,9 @@@
  		return funcname_pattern("default");
  
  	/* Look up custom "funcname.$ident" regexp from config. */
- 	pattern = funcname_pattern(ident);
- 	if (pattern)
- 		return pattern;
+ 	pe = funcname_pattern(ident);
+ 	if (pe)
+ 		return pe;
  
  	/*
  	 * And define built-in fallback patterns here.  Note that
@@@ -1460,19 -1456,11 +1474,19 @@@
  	 */
  	for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
  		if (!strcmp(ident, builtin_funcname_pattern[i].name))
- 			return builtin_funcname_pattern[i].pattern;
+ 			return &builtin_funcname_pattern[i];
  
  	return NULL;
  }
  
 +void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
 +{
 +	if (!options->a_prefix)
 +		options->a_prefix = a;
 +	if (!options->b_prefix)
 +		options->b_prefix = b;
 +}
 +
  static void builtin_diff(const char *name_a,
  			 const char *name_b,
  			 struct diff_filespec *one,
@@@ -1486,19 -1474,9 +1500,19 @@@
  	char *a_one, *b_two;
  	const char *set = diff_get_color_opt(o, DIFF_METAINFO);
  	const char *reset = diff_get_color_opt(o, DIFF_RESET);
 +	const char *a_prefix, *b_prefix;
 +
 +	diff_set_mnemonic_prefix(o, "a/", "b/");
 +	if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
 +		a_prefix = o->b_prefix;
 +		b_prefix = o->a_prefix;
 +	} else {
 +		a_prefix = o->a_prefix;
 +		b_prefix = o->b_prefix;
 +	}
  
 -	a_one = quote_two(o->a_prefix, name_a + (*name_a == '/'));
 -	b_two = quote_two(o->b_prefix, name_b + (*name_b == '/'));
 +	a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
 +	b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
  	lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
  	lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
  	fprintf(o->file, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
@@@ -1556,11 -1534,11 +1570,11 @@@
  		xdemitconf_t xecfg;
  		xdemitcb_t ecb;
  		struct emit_callback ecbdata;
- 		const char *funcname_pattern;
+ 		const struct funcname_pattern_entry *pe;
  
- 		funcname_pattern = diff_funcname_pattern(one);
- 		if (!funcname_pattern)
- 			funcname_pattern = diff_funcname_pattern(two);
+ 		pe = diff_funcname_pattern(one);
+ 		if (!pe)
+ 			pe = diff_funcname_pattern(two);
  
  		memset(&xecfg, 0, sizeof(xecfg));
  		memset(&ecbdata, 0, sizeof(ecbdata));
@@@ -1572,8 -1550,8 +1586,8 @@@
  		xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
  		xecfg.ctxlen = o->context;
  		xecfg.flags = XDL_EMIT_FUNCNAMES;
- 		if (funcname_pattern)
- 			xdiff_set_find_func(&xecfg, funcname_pattern);
+ 		if (pe)
+ 			xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
  		if (!diffopts)
  			;
  		else if (!prefixcmp(diffopts, "--unified="))
@@@ -2355,10 -2333,8 +2369,10 @@@ void diff_setup(struct diff_options *op
  		DIFF_OPT_CLR(options, COLOR_DIFF);
  	options->detect_rename = diff_detect_rename_default;
  
 -	options->a_prefix = "a/";
 -	options->b_prefix = "b/";
 +	if (!diff_mnemonic_prefix) {
 +		options->a_prefix = "a/";
 +		options->b_prefix = "b/";
 +	}
  }
  
  int diff_setup_done(struct diff_options *options)
@@@ -2515,10 -2491,6 +2529,10 @@@ int diff_opt_parse(struct diff_options 
  	else if (!strcmp(arg, "--cumulative")) {
  		options->output_format |= DIFF_FORMAT_DIRSTAT;
  		DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
 +	} else if (opt_arg(arg, 0, "dirstat-by-file",
 +			   &options->dirstat_percent)) {
 +		options->output_format |= DIFF_FORMAT_DIRSTAT;
 +		DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
  	}
  	else if (!strcmp(arg, "--check"))
  		options->output_format |= DIFF_FORMAT_CHECKDIFF;
diff --combined git-submodule.sh
index 92be0feb58,c3d0d24bc7..65178ae8e3
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -194,7 -194,7 +194,7 @@@ cmd_add(
  	else
  
  		module_clone "$path" "$realrepo" || exit
- 		(unset GIT_DIR; cd "$path" && git checkout -q ${branch:+-b "$branch" "origin/$branch"}) ||
+ 		(unset GIT_DIR; cd "$path" && git checkout -f -q ${branch:+-b "$branch" "origin/$branch"}) ||
  		die "Unable to checkout submodule '$path'"
  	fi
  
@@@ -340,8 -340,13 +340,13 @@@ cmd_update(
  
  		if test "$subsha1" != "$sha1"
  		then
+ 			force=
+ 			if test -z "$subsha1"
+ 			then
+ 				force="-f"
+ 			fi
  			(unset GIT_DIR; cd "$path" && git-fetch &&
- 				git-checkout -q "$sha1") ||
+ 				git-checkout $force -q "$sha1") ||
  			die "Unable to checkout '$sha1' in submodule path '$path'"
  
  			say "Submodule path '$path': checked out '$sha1'"
@@@ -634,14 -639,6 +639,14 @@@ cmd_sync(
  	do
  		name=$(module_name "$path")
  		url=$(git config -f .gitmodules --get submodule."$name".url)
 +
 +		# Possibly a url relative to parent
 +		case "$url" in
 +		./*|../*)
 +			url=$(resolve_relative_url "$url") || exit
 +			;;
 +		esac
 +
  		if test -e "$path"/.git
  		then
  		(
diff --combined merge-recursive.c
index 08917314fb,0000000000..6bc3eac85c
mode 100644,000000..100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@@ -1,1372 -1,0 +1,1357 @@@
 +/*
 + * Recursive Merge algorithm stolen from git-merge-recursive.py by
 + * Fredrik Kuivinen.
 + * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
 + */
 +#include "cache.h"
 +#include "cache-tree.h"
 +#include "commit.h"
 +#include "blob.h"
 +#include "builtin.h"
 +#include "tree-walk.h"
 +#include "diff.h"
 +#include "diffcore.h"
 +#include "tag.h"
 +#include "unpack-trees.h"
 +#include "string-list.h"
 +#include "xdiff-interface.h"
 +#include "ll-merge.h"
 +#include "interpolate.h"
 +#include "attr.h"
 +#include "merge-recursive.h"
++#include "dir.h"
 +
 +static struct tree *shift_tree_object(struct tree *one, struct tree *two)
 +{
 +	unsigned char shifted[20];
 +
 +	/*
 +	 * NEEDSWORK: this limits the recursion depth to hardcoded
 +	 * value '2' to avoid excessive overhead.
 +	 */
 +	shift_tree(one->object.sha1, two->object.sha1, shifted, 2);
 +	if (!hashcmp(two->object.sha1, shifted))
 +		return two;
 +	return lookup_tree(shifted);
 +}
 +
 +/*
 + * A virtual commit has (const char *)commit->util set to the name.
 + */
 +
 +struct commit *make_virtual_commit(struct tree *tree, const char *comment)
 +{
 +	struct commit *commit = xcalloc(1, sizeof(struct commit));
 +	commit->tree = tree;
 +	commit->util = (void*)comment;
 +	/* avoid warnings */
 +	commit->object.parsed = 1;
 +	return commit;
 +}
 +
 +/*
 + * Since we use get_tree_entry(), which does not put the read object into
 + * the object pool, we cannot rely on a == b.
 + */
 +static int sha_eq(const unsigned char *a, const unsigned char *b)
 +{
 +	if (!a && !b)
 +		return 2;
 +	return a && b && hashcmp(a, b) == 0;
 +}
 +
 +/*
 + * Since we want to write the index eventually, we cannot reuse the index
 + * for these (temporary) data.
 + */
 +struct stage_data
 +{
 +	struct
 +	{
 +		unsigned mode;
 +		unsigned char sha[20];
 +	} stages[4];
 +	unsigned processed:1;
 +};
 +
 +static int show(struct merge_options *o, int v)
 +{
 +	return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
 +}
 +
 +static void flush_output(struct merge_options *o)
 +{
 +	if (o->obuf.len) {
 +		fputs(o->obuf.buf, stdout);
 +		strbuf_reset(&o->obuf);
 +	}
 +}
 +
 +static void output(struct merge_options *o, int v, const char *fmt, ...)
 +{
 +	int len;
 +	va_list ap;
 +
 +	if (!show(o, v))
 +		return;
 +
 +	strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
 +	memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
 +	strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
 +
 +	va_start(ap, fmt);
 +	len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
 +	va_end(ap);
 +
 +	if (len < 0)
 +		len = 0;
 +	if (len >= strbuf_avail(&o->obuf)) {
 +		strbuf_grow(&o->obuf, len + 2);
 +		va_start(ap, fmt);
 +		len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
 +		va_end(ap);
 +		if (len >= strbuf_avail(&o->obuf)) {
 +			die("this should not happen, your snprintf is broken");
 +		}
 +	}
 +	strbuf_setlen(&o->obuf, o->obuf.len + len);
 +	strbuf_add(&o->obuf, "\n", 1);
 +	if (!o->buffer_output)
 +		flush_output(o);
 +}
 +
 +static void output_commit_title(struct merge_options *o, struct commit *commit)
 +{
 +	int i;
 +	flush_output(o);
 +	for (i = o->call_depth; i--;)
 +		fputs("  ", stdout);
 +	if (commit->util)
 +		printf("virtual %s\n", (char *)commit->util);
 +	else {
 +		printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
 +		if (parse_commit(commit) != 0)
 +			printf("(bad commit)\n");
 +		else {
 +			const char *s;
 +			int len;
 +			for (s = commit->buffer; *s; s++)
 +				if (*s == '\n' && s[1] == '\n') {
 +					s += 2;
 +					break;
 +				}
 +			for (len = 0; s[len] && '\n' != s[len]; len++)
 +				; /* do nothing */
 +			printf("%.*s\n", len, s);
 +		}
 +	}
 +}
 +
 +static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
 +		const char *path, int stage, int refresh, int options)
 +{
 +	struct cache_entry *ce;
 +	ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
 +	if (!ce)
 +		return error("addinfo_cache failed for path '%s'", path);
 +	return add_cache_entry(ce, options);
 +}
 +
 +static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
 +{
 +	parse_tree(tree);
 +	init_tree_desc(desc, tree->buffer, tree->size);
 +}
 +
 +static int git_merge_trees(int index_only,
 +			   struct tree *common,
 +			   struct tree *head,
 +			   struct tree *merge)
 +{
 +	int rc;
 +	struct tree_desc t[3];
 +	struct unpack_trees_options opts;
 +
 +	memset(&opts, 0, sizeof(opts));
 +	if (index_only)
 +		opts.index_only = 1;
 +	else
 +		opts.update = 1;
 +	opts.merge = 1;
 +	opts.head_idx = 2;
 +	opts.fn = threeway_merge;
 +	opts.src_index = &the_index;
 +	opts.dst_index = &the_index;
 +
 +	init_tree_desc_from_tree(t+0, common);
 +	init_tree_desc_from_tree(t+1, head);
 +	init_tree_desc_from_tree(t+2, merge);
 +
 +	rc = unpack_trees(3, t, &opts);
 +	cache_tree_free(&active_cache_tree);
 +	return rc;
 +}
 +
 +struct tree *write_tree_from_memory(struct merge_options *o)
 +{
 +	struct tree *result = NULL;
 +
 +	if (unmerged_cache()) {
 +		int i;
 +		output(o, 0, "There are unmerged index entries:");
 +		for (i = 0; i < active_nr; i++) {
 +			struct cache_entry *ce = active_cache[i];
 +			if (ce_stage(ce))
 +				output(o, 0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
 +		}
 +		return NULL;
 +	}
 +
 +	if (!active_cache_tree)
 +		active_cache_tree = cache_tree();
 +
 +	if (!cache_tree_fully_valid(active_cache_tree) &&
 +	    cache_tree_update(active_cache_tree,
 +			      active_cache, active_nr, 0, 0) < 0)
 +		die("error building trees");
 +
 +	result = lookup_tree(active_cache_tree->sha1);
 +
 +	return result;
 +}
 +
 +static int save_files_dirs(const unsigned char *sha1,
 +		const char *base, int baselen, const char *path,
 +		unsigned int mode, int stage, void *context)
 +{
 +	int len = strlen(path);
 +	char *newpath = xmalloc(baselen + len + 1);
 +	struct merge_options *o = context;
 +
 +	memcpy(newpath, base, baselen);
 +	memcpy(newpath + baselen, path, len);
 +	newpath[baselen + len] = '\0';
 +
 +	if (S_ISDIR(mode))
 +		string_list_insert(newpath, &o->current_directory_set);
 +	else
 +		string_list_insert(newpath, &o->current_file_set);
 +	free(newpath);
 +
 +	return READ_TREE_RECURSIVE;
 +}
 +
 +static int get_files_dirs(struct merge_options *o, struct tree *tree)
 +{
 +	int n;
 +	if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
 +		return 0;
 +	n = o->current_file_set.nr + o->current_directory_set.nr;
 +	return n;
 +}
 +
 +/*
 + * Returns an index_entry instance which doesn't have to correspond to
 + * a real cache entry in Git's index.
 + */
 +static struct stage_data *insert_stage_data(const char *path,
 +		struct tree *o, struct tree *a, struct tree *b,
 +		struct string_list *entries)
 +{
 +	struct string_list_item *item;
 +	struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
 +	get_tree_entry(o->object.sha1, path,
 +			e->stages[1].sha, &e->stages[1].mode);
 +	get_tree_entry(a->object.sha1, path,
 +			e->stages[2].sha, &e->stages[2].mode);
 +	get_tree_entry(b->object.sha1, path,
 +			e->stages[3].sha, &e->stages[3].mode);
 +	item = string_list_insert(path, entries);
 +	item->util = e;
 +	return e;
 +}
 +
 +/*
 + * Create a dictionary mapping file names to stage_data objects. The
 + * dictionary contains one entry for every path with a non-zero stage entry.
 + */
 +static struct string_list *get_unmerged(void)
 +{
 +	struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
 +	int i;
 +
 +	unmerged->strdup_strings = 1;
 +
 +	for (i = 0; i < active_nr; i++) {
 +		struct string_list_item *item;
 +		struct stage_data *e;
 +		struct cache_entry *ce = active_cache[i];
 +		if (!ce_stage(ce))
 +			continue;
 +
 +		item = string_list_lookup(ce->name, unmerged);
 +		if (!item) {
 +			item = string_list_insert(ce->name, unmerged);
 +			item->util = xcalloc(1, sizeof(struct stage_data));
 +		}
 +		e = item->util;
 +		e->stages[ce_stage(ce)].mode = ce->ce_mode;
 +		hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
 +	}
 +
 +	return unmerged;
 +}
 +
 +struct rename
 +{
 +	struct diff_filepair *pair;
 +	struct stage_data *src_entry;
 +	struct stage_data *dst_entry;
 +	unsigned processed:1;
 +};
 +
 +/*
 + * Get information of all renames which occurred between 'o_tree' and
 + * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
 + * 'b_tree') to be able to associate the correct cache entries with
 + * the rename information. 'tree' is always equal to either a_tree or b_tree.
 + */
 +static struct string_list *get_renames(struct merge_options *o,
 +				       struct tree *tree,
 +				       struct tree *o_tree,
 +				       struct tree *a_tree,
 +				       struct tree *b_tree,
 +				       struct string_list *entries)
 +{
 +	int i;
 +	struct string_list *renames;
 +	struct diff_options opts;
 +
 +	renames = xcalloc(1, sizeof(struct string_list));
 +	diff_setup(&opts);
 +	DIFF_OPT_SET(&opts, RECURSIVE);
 +	opts.detect_rename = DIFF_DETECT_RENAME;
 +	opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
 +			    o->diff_rename_limit >= 0 ? o->diff_rename_limit :
 +			    500;
 +	opts.warn_on_too_large_rename = 1;
 +	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
 +	if (diff_setup_done(&opts) < 0)
 +		die("diff setup failed");
 +	diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
 +	diffcore_std(&opts);
 +	for (i = 0; i < diff_queued_diff.nr; ++i) {
 +		struct string_list_item *item;
 +		struct rename *re;
 +		struct diff_filepair *pair = diff_queued_diff.queue[i];
 +		if (pair->status != 'R') {
 +			diff_free_filepair(pair);
 +			continue;
 +		}
 +		re = xmalloc(sizeof(*re));
 +		re->processed = 0;
 +		re->pair = pair;
 +		item = string_list_lookup(re->pair->one->path, entries);
 +		if (!item)
 +			re->src_entry = insert_stage_data(re->pair->one->path,
 +					o_tree, a_tree, b_tree, entries);
 +		else
 +			re->src_entry = item->util;
 +
 +		item = string_list_lookup(re->pair->two->path, entries);
 +		if (!item)
 +			re->dst_entry = insert_stage_data(re->pair->two->path,
 +					o_tree, a_tree, b_tree, entries);
 +		else
 +			re->dst_entry = item->util;
 +		item = string_list_insert(pair->one->path, renames);
 +		item->util = re;
 +	}
 +	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
 +	diff_queued_diff.nr = 0;
 +	diff_flush(&opts);
 +	return renames;
 +}
 +
 +static int update_stages(const char *path, struct diff_filespec *o,
 +			 struct diff_filespec *a, struct diff_filespec *b,
 +			 int clear)
 +{
 +	int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
 +	if (clear)
 +		if (remove_file_from_cache(path))
 +			return -1;
 +	if (o)
 +		if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
 +			return -1;
 +	if (a)
 +		if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
 +			return -1;
 +	if (b)
 +		if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
 +			return -1;
 +	return 0;
 +}
 +
- static int remove_path(const char *name)
- {
- 	char *slash, *dirs;
- 
- 	if (unlink(name))
- 		return -1;
- 	dirs = xstrdup(name);
- 	while ((slash = strrchr(name, '/'))) {
- 		*slash = '\0';
- 		if (rmdir(name) != 0)
- 			break;
- 	}
- 	free(dirs);
- 	return 0;
- }
- 
 +static int remove_file(struct merge_options *o, int clean,
 +		       const char *path, int no_wd)
 +{
 +	int update_cache = o->call_depth || clean;
 +	int update_working_directory = !o->call_depth && !no_wd;
 +
 +	if (update_cache) {
 +		if (remove_file_from_cache(path))
 +			return -1;
 +	}
 +	if (update_working_directory) {
 +		if (remove_path(path) && errno != ENOENT)
 +			return -1;
 +	}
 +	return 0;
 +}
 +
 +static char *unique_path(struct merge_options *o, const char *path, const char *branch)
 +{
 +	char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
 +	int suffix = 0;
 +	struct stat st;
 +	char *p = newpath + strlen(path);
 +	strcpy(newpath, path);
 +	*(p++) = '~';
 +	strcpy(p, branch);
 +	for (; *p; ++p)
 +		if ('/' == *p)
 +			*p = '_';
 +	while (string_list_has_string(&o->current_file_set, newpath) ||
 +	       string_list_has_string(&o->current_directory_set, newpath) ||
 +	       lstat(newpath, &st) == 0)
 +		sprintf(p, "_%d", suffix++);
 +
 +	string_list_insert(newpath, &o->current_file_set);
 +	return newpath;
 +}
 +
 +static void flush_buffer(int fd, const char *buf, unsigned long size)
 +{
 +	while (size > 0) {
 +		long ret = write_in_full(fd, buf, size);
 +		if (ret < 0) {
 +			/* Ignore epipe */
 +			if (errno == EPIPE)
 +				break;
 +			die("merge-recursive: %s", strerror(errno));
 +		} else if (!ret) {
 +			die("merge-recursive: disk full?");
 +		}
 +		size -= ret;
 +		buf += ret;
 +	}
 +}
 +
 +static int make_room_for_path(const char *path)
 +{
 +	int status;
 +	const char *msg = "failed to create path '%s'%s";
 +
 +	status = safe_create_leading_directories_const(path);
 +	if (status) {
 +		if (status == -3) {
 +			/* something else exists */
 +			error(msg, path, ": perhaps a D/F conflict?");
 +			return -1;
 +		}
 +		die(msg, path, "");
 +	}
 +
 +	/* Successful unlink is good.. */
 +	if (!unlink(path))
 +		return 0;
 +	/* .. and so is no existing file */
 +	if (errno == ENOENT)
 +		return 0;
 +	/* .. but not some other error (who really cares what?) */
 +	return error(msg, path, ": perhaps a D/F conflict?");
 +}
 +
 +static void update_file_flags(struct merge_options *o,
 +			      const unsigned char *sha,
 +			      unsigned mode,
 +			      const char *path,
 +			      int update_cache,
 +			      int update_wd)
 +{
 +	if (o->call_depth)
 +		update_wd = 0;
 +
 +	if (update_wd) {
 +		enum object_type type;
 +		void *buf;
 +		unsigned long size;
 +
 +		if (S_ISGITLINK(mode))
 +			die("cannot read object %s '%s': It is a submodule!",
 +			    sha1_to_hex(sha), path);
 +
 +		buf = read_sha1_file(sha, &type, &size);
 +		if (!buf)
 +			die("cannot read object %s '%s'", sha1_to_hex(sha), path);
 +		if (type != OBJ_BLOB)
 +			die("blob expected for %s '%s'", sha1_to_hex(sha), path);
 +		if (S_ISREG(mode)) {
 +			struct strbuf strbuf;
 +			strbuf_init(&strbuf, 0);
 +			if (convert_to_working_tree(path, buf, size, &strbuf)) {
 +				free(buf);
 +				size = strbuf.len;
 +				buf = strbuf_detach(&strbuf, NULL);
 +			}
 +		}
 +
 +		if (make_room_for_path(path) < 0) {
 +			update_wd = 0;
 +			free(buf);
 +			goto update_index;
 +		}
 +		if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
 +			int fd;
 +			if (mode & 0100)
 +				mode = 0777;
 +			else
 +				mode = 0666;
 +			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
 +			if (fd < 0)
 +				die("failed to open %s: %s", path, strerror(errno));
 +			flush_buffer(fd, buf, size);
 +			close(fd);
 +		} else if (S_ISLNK(mode)) {
 +			char *lnk = xmemdupz(buf, size);
 +			safe_create_leading_directories_const(path);
 +			unlink(path);
 +			symlink(lnk, path);
 +			free(lnk);
 +		} else
 +			die("do not know what to do with %06o %s '%s'",
 +			    mode, sha1_to_hex(sha), path);
 +		free(buf);
 +	}
 + update_index:
 +	if (update_cache)
 +		add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
 +}
 +
 +static void update_file(struct merge_options *o,
 +			int clean,
 +			const unsigned char *sha,
 +			unsigned mode,
 +			const char *path)
 +{
 +	update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
 +}
 +
 +/* Low level file merging, update and removal */
 +
 +struct merge_file_info
 +{
 +	unsigned char sha[20];
 +	unsigned mode;
 +	unsigned clean:1,
 +		 merge:1;
 +};
 +
 +static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
 +{
 +	unsigned long size;
 +	enum object_type type;
 +
 +	if (!hashcmp(sha1, null_sha1)) {
 +		mm->ptr = xstrdup("");
 +		mm->size = 0;
 +		return;
 +	}
 +
 +	mm->ptr = read_sha1_file(sha1, &type, &size);
 +	if (!mm->ptr || type != OBJ_BLOB)
 +		die("unable to read blob object %s", sha1_to_hex(sha1));
 +	mm->size = size;
 +}
 +
 +static int merge_3way(struct merge_options *o,
 +		      mmbuffer_t *result_buf,
 +		      struct diff_filespec *one,
 +		      struct diff_filespec *a,
 +		      struct diff_filespec *b,
 +		      const char *branch1,
 +		      const char *branch2)
 +{
 +	mmfile_t orig, src1, src2;
 +	char *name1, *name2;
 +	int merge_status;
 +
 +	name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
 +	name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
 +
 +	fill_mm(one->sha1, &orig);
 +	fill_mm(a->sha1, &src1);
 +	fill_mm(b->sha1, &src2);
 +
 +	merge_status = ll_merge(result_buf, a->path, &orig,
 +				&src1, name1, &src2, name2,
 +				o->call_depth);
 +
 +	free(name1);
 +	free(name2);
 +	free(orig.ptr);
 +	free(src1.ptr);
 +	free(src2.ptr);
 +	return merge_status;
 +}
 +
 +static struct merge_file_info merge_file(struct merge_options *o,
 +				         struct diff_filespec *one,
 +					 struct diff_filespec *a,
 +					 struct diff_filespec *b,
 +					 const char *branch1,
 +					 const char *branch2)
 +{
 +	struct merge_file_info result;
 +	result.merge = 0;
 +	result.clean = 1;
 +
 +	if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
 +		result.clean = 0;
 +		if (S_ISREG(a->mode)) {
 +			result.mode = a->mode;
 +			hashcpy(result.sha, a->sha1);
 +		} else {
 +			result.mode = b->mode;
 +			hashcpy(result.sha, b->sha1);
 +		}
 +	} else {
 +		if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
 +			result.merge = 1;
 +
 +		/*
 +		 * Merge modes
 +		 */
 +		if (a->mode == b->mode || a->mode == one->mode)
 +			result.mode = b->mode;
 +		else {
 +			result.mode = a->mode;
 +			if (b->mode != one->mode) {
 +				result.clean = 0;
 +				result.merge = 1;
 +			}
 +		}
 +
 +		if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
 +			hashcpy(result.sha, b->sha1);
 +		else if (sha_eq(b->sha1, one->sha1))
 +			hashcpy(result.sha, a->sha1);
 +		else if (S_ISREG(a->mode)) {
 +			mmbuffer_t result_buf;
 +			int merge_status;
 +
 +			merge_status = merge_3way(o, &result_buf, one, a, b,
 +						  branch1, branch2);
 +
 +			if ((merge_status < 0) || !result_buf.ptr)
 +				die("Failed to execute internal merge");
 +
 +			if (write_sha1_file(result_buf.ptr, result_buf.size,
 +					    blob_type, result.sha))
 +				die("Unable to add %s to database",
 +				    a->path);
 +
 +			free(result_buf.ptr);
 +			result.clean = (merge_status == 0);
 +		} else if (S_ISGITLINK(a->mode)) {
 +			result.clean = 0;
 +			hashcpy(result.sha, a->sha1);
 +		} else if (S_ISLNK(a->mode)) {
 +			hashcpy(result.sha, a->sha1);
 +
 +			if (!sha_eq(a->sha1, b->sha1))
 +				result.clean = 0;
 +		} else {
 +			die("unsupported object type in the tree");
 +		}
 +	}
 +
 +	return result;
 +}
 +
 +static void conflict_rename_rename(struct merge_options *o,
 +				   struct rename *ren1,
 +				   const char *branch1,
 +				   struct rename *ren2,
 +				   const char *branch2)
 +{
 +	char *del[2];
 +	int delp = 0;
 +	const char *ren1_dst = ren1->pair->two->path;
 +	const char *ren2_dst = ren2->pair->two->path;
 +	const char *dst_name1 = ren1_dst;
 +	const char *dst_name2 = ren2_dst;
 +	if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
 +		dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
 +		output(o, 1, "%s is a directory in %s adding as %s instead",
 +		       ren1_dst, branch2, dst_name1);
 +		remove_file(o, 0, ren1_dst, 0);
 +	}
 +	if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
 +		dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
 +		output(o, 1, "%s is a directory in %s adding as %s instead",
 +		       ren2_dst, branch1, dst_name2);
 +		remove_file(o, 0, ren2_dst, 0);
 +	}
 +	if (o->call_depth) {
 +		remove_file_from_cache(dst_name1);
 +		remove_file_from_cache(dst_name2);
 +		/*
 +		 * Uncomment to leave the conflicting names in the resulting tree
 +		 *
 +		 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
 +		 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
 +		 */
 +	} else {
 +		update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
 +		update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
 +	}
 +	while (delp--)
 +		free(del[delp]);
 +}
 +
 +static void conflict_rename_dir(struct merge_options *o,
 +				struct rename *ren1,
 +				const char *branch1)
 +{
 +	char *new_path = unique_path(o, ren1->pair->two->path, branch1);
 +	output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
 +	remove_file(o, 0, ren1->pair->two->path, 0);
 +	update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
 +	free(new_path);
 +}
 +
 +static void conflict_rename_rename_2(struct merge_options *o,
 +				     struct rename *ren1,
 +				     const char *branch1,
 +				     struct rename *ren2,
 +				     const char *branch2)
 +{
 +	char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
 +	char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
 +	output(o, 1, "Renaming %s to %s and %s to %s instead",
 +	       ren1->pair->one->path, new_path1,
 +	       ren2->pair->one->path, new_path2);
 +	remove_file(o, 0, ren1->pair->two->path, 0);
 +	update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
 +	update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
 +	free(new_path2);
 +	free(new_path1);
 +}
 +
 +static int process_renames(struct merge_options *o,
 +			   struct string_list *a_renames,
 +			   struct string_list *b_renames)
 +{
 +	int clean_merge = 1, i, j;
 +	struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
 +	const struct rename *sre;
 +
 +	for (i = 0; i < a_renames->nr; i++) {
 +		sre = a_renames->items[i].util;
 +		string_list_insert(sre->pair->two->path, &a_by_dst)->util
 +			= sre->dst_entry;
 +	}
 +	for (i = 0; i < b_renames->nr; i++) {
 +		sre = b_renames->items[i].util;
 +		string_list_insert(sre->pair->two->path, &b_by_dst)->util
 +			= sre->dst_entry;
 +	}
 +
 +	for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
 +		int compare;
 +		char *src;
 +		struct string_list *renames1, *renames2, *renames2Dst;
 +		struct rename *ren1 = NULL, *ren2 = NULL;
 +		const char *branch1, *branch2;
 +		const char *ren1_src, *ren1_dst;
 +
 +		if (i >= a_renames->nr) {
 +			compare = 1;
 +			ren2 = b_renames->items[j++].util;
 +		} else if (j >= b_renames->nr) {
 +			compare = -1;
 +			ren1 = a_renames->items[i++].util;
 +		} else {
 +			compare = strcmp(a_renames->items[i].string,
 +					b_renames->items[j].string);
 +			if (compare <= 0)
 +				ren1 = a_renames->items[i++].util;
 +			if (compare >= 0)
 +				ren2 = b_renames->items[j++].util;
 +		}
 +
 +		/* TODO: refactor, so that 1/2 are not needed */
 +		if (ren1) {
 +			renames1 = a_renames;
 +			renames2 = b_renames;
 +			renames2Dst = &b_by_dst;
 +			branch1 = o->branch1;
 +			branch2 = o->branch2;
 +		} else {
 +			struct rename *tmp;
 +			renames1 = b_renames;
 +			renames2 = a_renames;
 +			renames2Dst = &a_by_dst;
 +			branch1 = o->branch2;
 +			branch2 = o->branch1;
 +			tmp = ren2;
 +			ren2 = ren1;
 +			ren1 = tmp;
 +		}
 +		src = ren1->pair->one->path;
 +
 +		ren1->dst_entry->processed = 1;
 +		ren1->src_entry->processed = 1;
 +
 +		if (ren1->processed)
 +			continue;
 +		ren1->processed = 1;
 +
 +		ren1_src = ren1->pair->one->path;
 +		ren1_dst = ren1->pair->two->path;
 +
 +		if (ren2) {
 +			const char *ren2_src = ren2->pair->one->path;
 +			const char *ren2_dst = ren2->pair->two->path;
 +			/* Renamed in 1 and renamed in 2 */
 +			if (strcmp(ren1_src, ren2_src) != 0)
 +				die("ren1.src != ren2.src");
 +			ren2->dst_entry->processed = 1;
 +			ren2->processed = 1;
 +			if (strcmp(ren1_dst, ren2_dst) != 0) {
 +				clean_merge = 0;
 +				output(o, 1, "CONFLICT (rename/rename): "
 +				       "Rename \"%s\"->\"%s\" in branch \"%s\" "
 +				       "rename \"%s\"->\"%s\" in \"%s\"%s",
 +				       src, ren1_dst, branch1,
 +				       src, ren2_dst, branch2,
 +				       o->call_depth ? " (left unresolved)": "");
 +				if (o->call_depth) {
 +					remove_file_from_cache(src);
 +					update_file(o, 0, ren1->pair->one->sha1,
 +						    ren1->pair->one->mode, src);
 +				}
 +				conflict_rename_rename(o, ren1, branch1, ren2, branch2);
 +			} else {
 +				struct merge_file_info mfi;
 +				remove_file(o, 1, ren1_src, 1);
 +				mfi = merge_file(o,
 +						 ren1->pair->one,
 +						 ren1->pair->two,
 +						 ren2->pair->two,
 +						 branch1,
 +						 branch2);
 +				if (mfi.merge || !mfi.clean)
 +					output(o, 1, "Renaming %s->%s", src, ren1_dst);
 +
 +				if (mfi.merge)
 +					output(o, 2, "Auto-merging %s", ren1_dst);
 +
 +				if (!mfi.clean) {
 +					output(o, 1, "CONFLICT (content): merge conflict in %s",
 +					       ren1_dst);
 +					clean_merge = 0;
 +
 +					if (!o->call_depth)
 +						update_stages(ren1_dst,
 +							      ren1->pair->one,
 +							      ren1->pair->two,
 +							      ren2->pair->two,
 +							      1 /* clear */);
 +				}
 +				update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
 +			}
 +		} else {
 +			/* Renamed in 1, maybe changed in 2 */
 +			struct string_list_item *item;
 +			/* we only use sha1 and mode of these */
 +			struct diff_filespec src_other, dst_other;
 +			int try_merge, stage = a_renames == renames1 ? 3: 2;
 +
 +			remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
 +
 +			hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
 +			src_other.mode = ren1->src_entry->stages[stage].mode;
 +			hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
 +			dst_other.mode = ren1->dst_entry->stages[stage].mode;
 +
 +			try_merge = 0;
 +
 +			if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
 +				clean_merge = 0;
 +				output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
 +				       " directory %s added in %s",
 +				       ren1_src, ren1_dst, branch1,
 +				       ren1_dst, branch2);
 +				conflict_rename_dir(o, ren1, branch1);
 +			} else if (sha_eq(src_other.sha1, null_sha1)) {
 +				clean_merge = 0;
 +				output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
 +				       "and deleted in %s",
 +				       ren1_src, ren1_dst, branch1,
 +				       branch2);
 +				update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
 +			} else if (!sha_eq(dst_other.sha1, null_sha1)) {
 +				const char *new_path;
 +				clean_merge = 0;
 +				try_merge = 1;
 +				output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
 +				       "%s added in %s",
 +				       ren1_src, ren1_dst, branch1,
 +				       ren1_dst, branch2);
 +				new_path = unique_path(o, ren1_dst, branch2);
 +				output(o, 1, "Adding as %s instead", new_path);
 +				update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
 +			} else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
 +				ren2 = item->util;
 +				clean_merge = 0;
 +				ren2->processed = 1;
 +				output(o, 1, "CONFLICT (rename/rename): "
 +				       "Rename %s->%s in %s. "
 +				       "Rename %s->%s in %s",
 +				       ren1_src, ren1_dst, branch1,
 +				       ren2->pair->one->path, ren2->pair->two->path, branch2);
 +				conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
 +			} else
 +				try_merge = 1;
 +
 +			if (try_merge) {
 +				struct diff_filespec *one, *a, *b;
 +				struct merge_file_info mfi;
 +				src_other.path = (char *)ren1_src;
 +
 +				one = ren1->pair->one;
 +				if (a_renames == renames1) {
 +					a = ren1->pair->two;
 +					b = &src_other;
 +				} else {
 +					b = ren1->pair->two;
 +					a = &src_other;
 +				}
 +				mfi = merge_file(o, one, a, b,
 +						o->branch1, o->branch2);
 +
 +				if (mfi.clean &&
 +				    sha_eq(mfi.sha, ren1->pair->two->sha1) &&
 +				    mfi.mode == ren1->pair->two->mode)
 +					/*
 +					 * This messaged is part of
 +					 * t6022 test. If you change
 +					 * it update the test too.
 +					 */
 +					output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
 +				else {
 +					if (mfi.merge || !mfi.clean)
 +						output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
 +					if (mfi.merge)
 +						output(o, 2, "Auto-merging %s", ren1_dst);
 +					if (!mfi.clean) {
 +						output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
 +						       ren1_dst);
 +						clean_merge = 0;
 +
 +						if (!o->call_depth)
 +							update_stages(ren1_dst,
 +								      one, a, b, 1);
 +					}
 +					update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
 +				}
 +			}
 +		}
 +	}
 +	string_list_clear(&a_by_dst, 0);
 +	string_list_clear(&b_by_dst, 0);
 +
 +	return clean_merge;
 +}
 +
 +static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
 +{
 +	return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
 +}
 +
 +/* Per entry merge function */
 +static int process_entry(struct merge_options *o,
 +			 const char *path, struct stage_data *entry)
 +{
 +	/*
 +	printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
 +	print_index_entry("\tpath: ", entry);
 +	*/
 +	int clean_merge = 1;
 +	unsigned o_mode = entry->stages[1].mode;
 +	unsigned a_mode = entry->stages[2].mode;
 +	unsigned b_mode = entry->stages[3].mode;
 +	unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
 +	unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
 +	unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
 +
 +	if (o_sha && (!a_sha || !b_sha)) {
 +		/* Case A: Deleted in one */
 +		if ((!a_sha && !b_sha) ||
 +		    (sha_eq(a_sha, o_sha) && !b_sha) ||
 +		    (!a_sha && sha_eq(b_sha, o_sha))) {
 +			/* Deleted in both or deleted in one and
 +			 * unchanged in the other */
 +			if (a_sha)
 +				output(o, 2, "Removing %s", path);
 +			/* do not touch working file if it did not exist */
 +			remove_file(o, 1, path, !a_sha);
 +		} else {
 +			/* Deleted in one and changed in the other */
 +			clean_merge = 0;
 +			if (!a_sha) {
 +				output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
 +				       "and modified in %s. Version %s of %s left in tree.",
 +				       path, o->branch1,
 +				       o->branch2, o->branch2, path);
 +				update_file(o, 0, b_sha, b_mode, path);
 +			} else {
 +				output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
 +				       "and modified in %s. Version %s of %s left in tree.",
 +				       path, o->branch2,
 +				       o->branch1, o->branch1, path);
 +				update_file(o, 0, a_sha, a_mode, path);
 +			}
 +		}
 +
 +	} else if ((!o_sha && a_sha && !b_sha) ||
 +		   (!o_sha && !a_sha && b_sha)) {
 +		/* Case B: Added in one. */
 +		const char *add_branch;
 +		const char *other_branch;
 +		unsigned mode;
 +		const unsigned char *sha;
 +		const char *conf;
 +
 +		if (a_sha) {
 +			add_branch = o->branch1;
 +			other_branch = o->branch2;
 +			mode = a_mode;
 +			sha = a_sha;
 +			conf = "file/directory";
 +		} else {
 +			add_branch = o->branch2;
 +			other_branch = o->branch1;
 +			mode = b_mode;
 +			sha = b_sha;
 +			conf = "directory/file";
 +		}
 +		if (string_list_has_string(&o->current_directory_set, path)) {
 +			const char *new_path = unique_path(o, path, add_branch);
 +			clean_merge = 0;
 +			output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
 +			       "Adding %s as %s",
 +			       conf, path, other_branch, path, new_path);
 +			remove_file(o, 0, path, 0);
 +			update_file(o, 0, sha, mode, new_path);
 +		} else {
 +			output(o, 2, "Adding %s", path);
 +			update_file(o, 1, sha, mode, path);
 +		}
 +	} else if (a_sha && b_sha) {
 +		/* Case C: Added in both (check for same permissions) and */
 +		/* case D: Modified in both, but differently. */
 +		const char *reason = "content";
 +		struct merge_file_info mfi;
 +		struct diff_filespec one, a, b;
 +
 +		if (!o_sha) {
 +			reason = "add/add";
 +			o_sha = (unsigned char *)null_sha1;
 +		}
 +		output(o, 2, "Auto-merging %s", path);
 +		one.path = a.path = b.path = (char *)path;
 +		hashcpy(one.sha1, o_sha);
 +		one.mode = o_mode;
 +		hashcpy(a.sha1, a_sha);
 +		a.mode = a_mode;
 +		hashcpy(b.sha1, b_sha);
 +		b.mode = b_mode;
 +
 +		mfi = merge_file(o, &one, &a, &b,
 +				 o->branch1, o->branch2);
 +
 +		clean_merge = mfi.clean;
 +		if (mfi.clean)
 +			update_file(o, 1, mfi.sha, mfi.mode, path);
 +		else if (S_ISGITLINK(mfi.mode))
 +			output(o, 1, "CONFLICT (submodule): Merge conflict in %s "
 +			       "- needs %s", path, sha1_to_hex(b.sha1));
 +		else {
 +			output(o, 1, "CONFLICT (%s): Merge conflict in %s",
 +					reason, path);
 +
 +			if (o->call_depth)
 +				update_file(o, 0, mfi.sha, mfi.mode, path);
 +			else
 +				update_file_flags(o, mfi.sha, mfi.mode, path,
 +					      0 /* update_cache */, 1 /* update_working_directory */);
 +		}
 +	} else if (!o_sha && !a_sha && !b_sha) {
 +		/*
 +		 * this entry was deleted altogether. a_mode == 0 means
 +		 * we had that path and want to actively remove it.
 +		 */
 +		remove_file(o, 1, path, !a_mode);
 +	} else
 +		die("Fatal merge failure, shouldn't happen.");
 +
 +	return clean_merge;
 +}
 +
 +int merge_trees(struct merge_options *o,
 +		struct tree *head,
 +		struct tree *merge,
 +		struct tree *common,
 +		struct tree **result)
 +{
 +	int code, clean;
 +
 +	if (o->subtree_merge) {
 +		merge = shift_tree_object(head, merge);
 +		common = shift_tree_object(head, common);
 +	}
 +
 +	if (sha_eq(common->object.sha1, merge->object.sha1)) {
 +		output(o, 0, "Already uptodate!");
 +		*result = head;
 +		return 1;
 +	}
 +
 +	code = git_merge_trees(o->call_depth, common, head, merge);
 +
 +	if (code != 0)
 +		die("merging of trees %s and %s failed",
 +		    sha1_to_hex(head->object.sha1),
 +		    sha1_to_hex(merge->object.sha1));
 +
 +	if (unmerged_cache()) {
 +		struct string_list *entries, *re_head, *re_merge;
 +		int i;
 +		string_list_clear(&o->current_file_set, 1);
 +		string_list_clear(&o->current_directory_set, 1);
 +		get_files_dirs(o, head);
 +		get_files_dirs(o, merge);
 +
 +		entries = get_unmerged();
 +		re_head  = get_renames(o, head, common, head, merge, entries);
 +		re_merge = get_renames(o, merge, common, head, merge, entries);
 +		clean = process_renames(o, re_head, re_merge);
 +		for (i = 0; i < entries->nr; i++) {
 +			const char *path = entries->items[i].string;
 +			struct stage_data *e = entries->items[i].util;
 +			if (!e->processed
 +				&& !process_entry(o, path, e))
 +				clean = 0;
 +		}
 +
 +		string_list_clear(re_merge, 0);
 +		string_list_clear(re_head, 0);
 +		string_list_clear(entries, 1);
 +
 +	}
 +	else
 +		clean = 1;
 +
 +	if (o->call_depth)
 +		*result = write_tree_from_memory(o);
 +
 +	return clean;
 +}
 +
 +static struct commit_list *reverse_commit_list(struct commit_list *list)
 +{
 +	struct commit_list *next = NULL, *current, *backup;
 +	for (current = list; current; current = backup) {
 +		backup = current->next;
 +		current->next = next;
 +		next = current;
 +	}
 +	return next;
 +}
 +
 +/*
 + * Merge the commits h1 and h2, return the resulting virtual
 + * commit object and a flag indicating the cleanness of the merge.
 + */
 +int merge_recursive(struct merge_options *o,
 +		    struct commit *h1,
 +		    struct commit *h2,
 +		    struct commit_list *ca,
 +		    struct commit **result)
 +{
 +	struct commit_list *iter;
 +	struct commit *merged_common_ancestors;
 +	struct tree *mrtree = mrtree;
 +	int clean;
 +
 +	if (show(o, 4)) {
 +		output(o, 4, "Merging:");
 +		output_commit_title(o, h1);
 +		output_commit_title(o, h2);
 +	}
 +
 +	if (!ca) {
 +		ca = get_merge_bases(h1, h2, 1);
 +		ca = reverse_commit_list(ca);
 +	}
 +
 +	if (show(o, 5)) {
 +		output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
 +		for (iter = ca; iter; iter = iter->next)
 +			output_commit_title(o, iter->item);
 +	}
 +
 +	merged_common_ancestors = pop_commit(&ca);
 +	if (merged_common_ancestors == NULL) {
 +		/* if there is no common ancestor, make an empty tree */
 +		struct tree *tree = xcalloc(1, sizeof(struct tree));
 +
 +		tree->object.parsed = 1;
 +		tree->object.type = OBJ_TREE;
 +		pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
 +		merged_common_ancestors = make_virtual_commit(tree, "ancestor");
 +	}
 +
 +	for (iter = ca; iter; iter = iter->next) {
 +		const char *saved_b1, *saved_b2;
 +		o->call_depth++;
 +		/*
 +		 * When the merge fails, the result contains files
 +		 * with conflict markers. The cleanness flag is
 +		 * ignored, it was never actually used, as result of
 +		 * merge_trees has always overwritten it: the committed
 +		 * "conflicts" were already resolved.
 +		 */
 +		discard_cache();
 +		saved_b1 = o->branch1;
 +		saved_b2 = o->branch2;
 +		o->branch1 = "Temporary merge branch 1";
 +		o->branch2 = "Temporary merge branch 2";
 +		merge_recursive(o, merged_common_ancestors, iter->item,
 +				NULL, &merged_common_ancestors);
 +		o->branch1 = saved_b1;
 +		o->branch2 = saved_b2;
 +		o->call_depth--;
 +
 +		if (!merged_common_ancestors)
 +			die("merge returned no commit");
 +	}
 +
 +	discard_cache();
 +	if (!o->call_depth)
 +		read_cache();
 +
 +	clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
 +			    &mrtree);
 +
 +	if (o->call_depth) {
 +		*result = make_virtual_commit(mrtree, "merged tree");
 +		commit_list_insert(h1, &(*result)->parents);
 +		commit_list_insert(h2, &(*result)->parents->next);
 +	}
 +	flush_output(o);
 +	return clean;
 +}
 +
 +static struct commit *get_ref(const unsigned char *sha1, const char *name)
 +{
 +	struct object *object;
 +
 +	object = deref_tag(parse_object(sha1), name, strlen(name));
 +	if (!object)
 +		return NULL;
 +	if (object->type == OBJ_TREE)
 +		return make_virtual_commit((struct tree*)object, name);
 +	if (object->type != OBJ_COMMIT)
 +		return NULL;
 +	if (parse_commit((struct commit *)object))
 +		return NULL;
 +	return (struct commit *)object;
 +}
 +
 +int merge_recursive_generic(struct merge_options *o,
 +			    const unsigned char *head,
 +			    const unsigned char *merge,
 +			    int num_base_list,
 +			    const unsigned char **base_list,
 +			    struct commit **result)
 +{
 +	int clean, index_fd;
 +	struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
 +	struct commit *head_commit = get_ref(head, o->branch1);
 +	struct commit *next_commit = get_ref(merge, o->branch2);
 +	struct commit_list *ca = NULL;
 +
 +	if (base_list) {
 +		int i;
 +		for (i = 0; i < num_base_list; ++i) {
 +			struct commit *base;
 +			if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
 +				return error("Could not parse object '%s'",
 +					sha1_to_hex(base_list[i]));
 +			commit_list_insert(base, &ca);
 +		}
 +	}
 +
 +	index_fd = hold_locked_index(lock, 1);
 +	clean = merge_recursive(o, head_commit, next_commit, ca,
 +			result);
 +	if (active_cache_changed &&
 +			(write_cache(index_fd, active_cache, active_nr) ||
 +			 commit_locked_index(lock)))
 +		return error("Unable to write index.");
 +
 +	return clean ? 0 : 1;
 +}
 +
 +static int merge_recursive_config(const char *var, const char *value, void *cb)
 +{
 +	struct merge_options *o = cb;
 +	if (!strcasecmp(var, "merge.verbosity")) {
 +		o->verbosity = git_config_int(var, value);
 +		return 0;
 +	}
 +	if (!strcasecmp(var, "diff.renamelimit")) {
 +		o->diff_rename_limit = git_config_int(var, value);
 +		return 0;
 +	}
 +	if (!strcasecmp(var, "merge.renamelimit")) {
 +		o->merge_rename_limit = git_config_int(var, value);
 +		return 0;
 +	}
 +	return git_default_config(var, value, cb);
 +}
 +
 +void init_merge_options(struct merge_options *o)
 +{
 +	memset(o, 0, sizeof(struct merge_options));
 +	o->verbosity = 2;
 +	o->buffer_output = 1;
 +	o->diff_rename_limit = -1;
 +	o->merge_rename_limit = -1;
 +	git_config(merge_recursive_config, o);
 +	if (getenv("GIT_MERGE_VERBOSITY"))
 +		o->verbosity =
 +			strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
 +	if (o->verbosity >= 5)
 +		o->buffer_output = 0;
 +	strbuf_init(&o->obuf, 0);
 +	memset(&o->current_file_set, 0, sizeof(struct string_list));
 +	o->current_file_set.strdup_strings = 1;
 +	memset(&o->current_directory_set, 0, sizeof(struct string_list));
 +	o->current_directory_set.strdup_strings = 1;
 +}
diff --combined xdiff-interface.c
index 8457601bc4,6c6bb19973..8bab82ed7f
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@@ -194,31 -194,34 +194,34 @@@ static long ff_regexp(const char *line
  	char *line_buffer = xstrndup(line, len); /* make NUL terminated */
  	struct ff_regs *regs = priv;
  	regmatch_t pmatch[2];
- 	int result = 0, i;
+ 	int i;
+ 	int result = -1;
  
  	for (i = 0; i < regs->nr; i++) {
  		struct ff_reg *reg = regs->array + i;
- 		if (reg->negate ^ !!regexec(&reg->re,
- 					line_buffer, 2, pmatch, 0)) {
- 			free(line_buffer);
- 			return -1;
+ 		if (!regexec(&reg->re, line_buffer, 2, pmatch, 0)) {
+ 			if (reg->negate)
+ 				goto fail;
+ 			break;
  		}
  	}
+ 	if (regs->nr <= i)
+ 		goto fail;
  	i = pmatch[1].rm_so >= 0 ? 1 : 0;
  	line += pmatch[i].rm_so;
  	result = pmatch[i].rm_eo - pmatch[i].rm_so;
  	if (result > buffer_size)
  		result = buffer_size;
  	else
- 		while (result > 0 && (isspace(line[result - 1]) ||
- 					line[result - 1] == '\n'))
+ 		while (result > 0 && (isspace(line[result - 1])))
  			result--;
  	memcpy(buffer, line, result);
+  fail:
  	free(line_buffer);
  	return result;
  }
  
- void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value)
+ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
  {
  	int i;
  	struct ff_regs *regs;
@@@ -243,29 -246,9 +246,29 @@@
  			expression = buffer = xstrndup(value, ep - value);
  		else
  			expression = value;
- 		if (regcomp(&reg->re, expression, 0))
+ 		if (regcomp(&reg->re, expression, cflags))
  			die("Invalid regexp to look for hunk header: %s", expression);
  		free(buffer);
  		value = ep + 1;
  	}
  }
 +
 +int git_xmerge_style = -1;
 +
 +int git_xmerge_config(const char *var, const char *value, void *cb)
 +{
 +	if (!strcasecmp(var, "merge.conflictstyle")) {
 +		if (!value)
 +			die("'%s' is not a boolean", var);
 +		if (!strcmp(value, "diff3"))
 +			git_xmerge_style = XDL_MERGE_DIFF3;
 +		else if (!strcmp(value, "merge"))
 +			git_xmerge_style = 0;
 +		else
 +			die("unknown style '%s' given for '%s'",
 +			    value, var);
 +		return 0;
 +	}
 +	return git_default_config(var, value, cb);
 +}
 +
diff --combined xdiff-interface.h
index b3b5c933bf,23c49b99d1..eaf9cd3498
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@@ -16,8 -16,6 +16,8 @@@ int parse_hunk_header(char *line, int l
  int read_mmfile(mmfile_t *ptr, const char *filename);
  int buffer_is_binary(const char *ptr, unsigned long size);
  
- extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line);
+ extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
 +extern int git_xmerge_config(const char *var, const char *value, void *cb);
 +extern int git_xmerge_style;
  
  #endif