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>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 1994be92c66257da18c31502bda605be170fd092..a0c00d38787ec406b952fbebd057b83f2cae69b6 100644 (file)
--- 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);

diff --git a/ll-merge.c b/ll-merge.c
index 290f764f564bdb3e046aa388d655210f3c9cb9f8..6bb3095c3a85d771bb60e8f2f025287d16e792df 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -99,8 +99,8 @@ static int ll_union_merge(const struct ll_merge_driver *drv_unused,
                          int flag, int marker_size)
 {
        /* Use union favor */
-       flag = (flag & LL_OPT_VIRTUAL_ANCESTOR) |
-              create_ll_flag(XDL_MERGE_FAVOR_UNION);
+       flag &= ~LL_OPT_FAVOR_MASK;
+       flag |= create_ll_flag(XDL_MERGE_FAVOR_UNION);
        return ll_xdl_merge(drv_unused, result, path_unused,
                            orig, NULL, src1, NULL, src2, NULL,
                            flag, marker_size);
@@ -345,7 +345,7 @@ int ll_merge(mmbuffer_t *result_buf,
        const struct ll_merge_driver *driver;
        int virtual_ancestor = flag & LL_OPT_VIRTUAL_ANCESTOR;
 
-       if (merge_renormalize) {
+       if (flag & LL_OPT_RENORMALIZE) {
                normalize_file(ancestor, path);
                normalize_file(ours, path);
                normalize_file(theirs, path);

diff --git a/ll-merge.h b/ll-merge.h
index 5990271dce38a7f965264615d3e612f1b1210fd8..ff7ca87bfa01d0e9705f4bfd83b9e4d2c155d588 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -8,6 +8,7 @@
 #define LL_OPT_VIRTUAL_ANCESTOR        (1 << 0)
 #define LL_OPT_FAVOR_MASK      ((1 << 1) | (1 << 2))
 #define LL_OPT_FAVOR_SHIFT 1
+#define LL_OPT_RENORMALIZE     (1 << 3)
 
 static inline int ll_opt_favor(int flag)
 {

diff --git a/merge-recursive.c b/merge-recursive.c
index c0c9f0ccc46a7e0c63d5445bcb6fa4927124dff2..23f7a4d139b4ed590113727cd196c7668085542f 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -648,6 +648,7 @@ static int merge_3way(struct merge_options *o,
        merge_status = ll_merge(result_buf, a->path, &orig, base_name,
                                &src1, name1, &src2, name2,
                                ((o->call_depth ? LL_OPT_VIRTUAL_ANCESTOR : 0) |
+                                (o->renormalize ? LL_OPT_RENORMALIZE : 0) |
                                 create_ll_flag(favor)));
 
        free(name1);

diff --git a/rerere.c b/rerere.c
index 2197890982e55d7ff0832b6c59b6661874fa4223..9dd4c7e1d3cd32829c3e7b464991dbb2eaabf2ff 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -319,6 +319,10 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
                if (!mmfile[i].ptr && !mmfile[i].size)
                        mmfile[i].ptr = xstrdup("");
        }
+       /*
+        * NEEDSWORK: handle conflicts from merges with
+        * merge.renormalize set, too
+        */
        ll_merge(&result, path, &mmfile[0], NULL,
                 &mmfile[1], "ours",
                 &mmfile[2], "theirs", 0);
@@ -361,7 +365,7 @@ static int find_conflict(struct string_list *conflict)
        return 0;
 }
 
-static int merge(const char *name, const char *path)
+static int merge(const char *name, int renormalize, const char *path)
 {
        int ret;
        mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
@@ -376,7 +380,8 @@ static int merge(const char *name, const char *path)
                ret = 1;
                goto out;
        }
-       ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0);
+       ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "",
+                       renormalize ? LL_OPT_RENORMALIZE : 0);
        if (!ret) {
                FILE *f = fopen(path, "w");
                if (!f)
@@ -424,7 +429,7 @@ static int update_paths(struct string_list *update)
        return status;
 }
 
-static int do_plain_rerere(struct string_list *rr, int fd)
+static int do_plain_rerere(struct string_list *rr, int fd, int renormalize)
 {
        struct string_list conflict = { NULL, 0, 0, 1 };
        struct string_list update = { NULL, 0, 0, 1 };
@@ -469,7 +474,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)
                const char *name = (const char *)rr->items[i].util;
 
                if (has_rerere_resolution(name)) {
-                       if (!merge(name, path)) {
+                       if (!merge(name, renormalize, path)) {
                                if (rerere_autoupdate)
                                        string_list_insert(path, &update);
                                fprintf(stderr,
@@ -553,7 +558,7 @@ int rerere(int flags)
        fd = setup_rerere(&merge_rr, flags);
        if (fd < 0)
                return 0;
-       return do_plain_rerere(&merge_rr, fd);
+       return do_plain_rerere(&merge_rr, fd, merge_renormalize);
 }
 
 static int rerere_forget_one_path(const char *path, struct string_list *rr)