summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-05 11:24:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-06 16:20:01 (GMT)
commit18b037a5b61532cba7f19efdb2e75c258d87d3d7 (patch)
treec41f8c974a9728d7ab8ce495a4527e121240664c /builtin/checkout.c
parent73cf7f713da4fc797e2393a9e490ad4ec9466c53 (diff)
downloadgit-18b037a5b61532cba7f19efdb2e75c258d87d3d7.zip
git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.tar.gz
git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.tar.bz2
ll-merge: let caller decide whether to renormalize
Add a “renormalize” bit to the ll-merge options word so callers can decide on a case-by-case basis whether the merge is likely to have overlapped with a change in smudge/clean rules. This reveals a few commands that have not been taking that situation into account, though it does not fix them. No functional change intended. Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 1994be9..a0c00d3 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -150,6 +150,10 @@ static int checkout_merged(int pos, struct checkout *state)
read_mmblob(&ours, active_cache[pos+1]->sha1);
read_mmblob(&theirs, active_cache[pos+2]->sha1);
+ /*
+ * NEEDSWORK: re-create conflicts from merges with
+ * merge.renormalize set, too
+ */
status = ll_merge(&result_buf, path, &ancestor, "base",
&ours, "ours", &theirs, "theirs", 0);
free(ancestor.ptr);