> Just to be clear, you were expecting "git merge b" to produce a
> conflict?
Yessir.
> I can imagine there might be times you would like to notice this case
> and visit it manually (e.g., even though the conflict would show both
> sides with the same content, you might want the resolution to take the
> two sides sequentially, duplicating them).
This is roughly the case here. Judgement is needed from the
person at the wheel.
> I don't think there is an easy way to get what you want. You would have
> to write a new merge 3-way strategy that handles this case differently.
> And most of the file-level heavy lifting in merge strategies is done by
> the low-level unpack_trees code, which handles this case. From "git help
I have a very rough draft that seems to do what I want, exposed
through .gitattributes (below). Given that this is something you probably
want tightly scoped, does it make sense to expose it anywhere else?
Is it accurate to speak of this as exposing merge minimal?
Thanks!
commit 3a8bc89950576c0445167e4f5ee5f42d9d737d2d
Author: Daniel Hagerty <hag@xxxxxxxxxxxx>
Date: Mon Nov 17 15:42:04 2014 -0500
merge: expose XDL_MERGE_MINIMAL behavior:
When performing a 3-way merge, an identical change to a file in both
branches is not considered a conflict by default. There exist content
for which this isn't true; simultaneous, identical edits are a
conflict.
Expose the ability to perform a minimal merge for selective files as
directed by gitattributes.
diff --git a/ll-merge.c b/ll-merge.c
index da59738..2a06ac9 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -84,7 +84,16 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
}
memset(&xmp, 0, sizeof(xmp));
- xmp.level = XDL_MERGE_ZEALOUS;
+
+ struct git_attr_check check;
+ check.attr = git_attr("merge-minimal");
+ (void) git_check_attr(path, 1, &check);
+
+ if(ATTR_TRUE(check.value))
+ xmp.level = XDL_MERGE_MINIMAL;
+ else
+ xmp.level = XDL_MERGE_ZEALOUS;
+
xmp.favor = opts->variant;
xmp.xpp.flags = opts->xdl_opts;
if (git_xmerge_style >= 0)
diff --git a/merge-recursive.c b/merge-recursive.c
index 3efc04e..dac6252 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -924,7 +924,11 @@ static struct merge_file_info merge_file_1(struct merge_options *o,
}
}
- if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
+ struct git_attr_check check;
+ check.attr = git_attr("merge-minimal");
+ (void) git_check_attr(a->path, 1, &check);
+
+ if (!ATTR_TRUE(check.value) && (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);
diff --git a/unpack-trees.c b/unpack-trees.c
index cc616c3..627356a 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1597,7 +1597,12 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
if (head) {
/* #5ALT, #15 */
- if (same(head, remote))
+
+ struct git_attr_check check;
+ check.attr = git_attr("merge-minimal");
+ (void) git_check_attr(head->name, 1, &check);
+
+ if (!ATTR_TRUE(check.value) && same(head, remote))
return merged_entry(head, index, o);
/* #13, #3ALT */
if (!df_conflict_remote && remote_match && !head_match)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html