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>
Jonathan Nieder committed
Aug 5, 2010 at 06:24 UTC
18b037a5b61532cba7f19efdb2e75c258d87d3d7
5 files changed
+19
-8
builtin/checkout.c
+4
@@ -150,6 +150,10 @@ static int checkout_merged(int pos, struct checkout *state)
150
read_mmblob(&ours, active_cache[pos+1]->sha1);
151
read_mmblob(&theirs, active_cache[pos+2]->sha1);
152
153
+ /*
154
+ * NEEDSWORK: re-create conflicts from merges with
155
+ * merge.renormalize set, too
156
+ */
157
status = ll_merge(&result_buf, path, &ancestor, "base",
158
&ours, "ours", &theirs, "theirs", 0);
159
free(ancestor.ptr);
ll-merge.c
+3
-3
@@ -99,8 +99,8 @@ static int ll_union_merge(const struct ll_merge_driver *drv_unused,
99
int flag, int marker_size)
100
{
101
/* Use union favor */
102
- flag = (flag & LL_OPT_VIRTUAL_ANCESTOR) |
103
- create_ll_flag(XDL_MERGE_FAVOR_UNION);
102
+ flag &= ~LL_OPT_FAVOR_MASK;
103
+ flag |= create_ll_flag(XDL_MERGE_FAVOR_UNION);
104
return ll_xdl_merge(drv_unused, result, path_unused,
105
orig, NULL, src1, NULL, src2, NULL,
106
flag, marker_size);
@@ -345,7 +345,7 @@ int ll_merge(mmbuffer_t *result_buf,
345
const struct ll_merge_driver *driver;
346
int virtual_ancestor = flag & LL_OPT_VIRTUAL_ANCESTOR;
347
348
- if (merge_renormalize) {
348
+ if (flag & LL_OPT_RENORMALIZE) {
349
normalize_file(ancestor, path);
350
normalize_file(ours, path);
351
normalize_file(theirs, path);
ll-merge.h
+1
@@ -8,6 +8,7 @@
8
#define LL_OPT_VIRTUAL_ANCESTOR (1 << 0)
9
#define LL_OPT_FAVOR_MASK ((1 << 1) | (1 << 2))
10
#define LL_OPT_FAVOR_SHIFT 1
11
+#define LL_OPT_RENORMALIZE (1 << 3)
12
13
static inline int ll_opt_favor(int flag)
14
{
merge-recursive.c
+1
@@ -648,6 +648,7 @@ static int merge_3way(struct merge_options *o,
648
merge_status = ll_merge(result_buf, a->path, &orig, base_name,
649
&src1, name1, &src2, name2,
650
((o->call_depth ? LL_OPT_VIRTUAL_ANCESTOR : 0) |
651
+ (o->renormalize ? LL_OPT_RENORMALIZE : 0) |
652
create_ll_flag(favor)));
653
654
free(name1);
rerere.c
+10
-5
@@ -319,6 +319,10 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
319
if (!mmfile[i].ptr && !mmfile[i].size)
320
mmfile[i].ptr = xstrdup("");
321
}
322
+ /*
323
+ * NEEDSWORK: handle conflicts from merges with
324
+ * merge.renormalize set, too
325
+ */
326
ll_merge(&result, path, &mmfile[0], NULL,
327
&mmfile[1], "ours",
328
&mmfile[2], "theirs", 0);
@@ -361,7 +365,7 @@ static int find_conflict(struct string_list *conflict)
365
return 0;
366
}
367
364
-static int merge(const char *name, const char *path)
368
+static int merge(const char *name, int renormalize, const char *path)
369
{
370
int ret;
371
mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
@@ -376,7 +380,8 @@ static int merge(const char *name, const char *path)
380
ret = 1;
381
goto out;
382
}
379
- ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0);
383
+ ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "",
384
+ renormalize ? LL_OPT_RENORMALIZE : 0);
385
if (!ret) {
386
FILE *f = fopen(path, "w");
387
if (!f)
@@ -424,7 +429,7 @@ static int update_paths(struct string_list *update)
429
return status;
430
}
431
427
-static int do_plain_rerere(struct string_list *rr, int fd)
432
+static int do_plain_rerere(struct string_list *rr, int fd, int renormalize)
433
{
434
struct string_list conflict = { NULL, 0, 0, 1 };
435
struct string_list update = { NULL, 0, 0, 1 };
@@ -469,7 +474,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)
474
const char *name = (const char *)rr->items[i].util;
475
476
if (has_rerere_resolution(name)) {
472
- if (!merge(name, path)) {
477
+ if (!merge(name, renormalize, path)) {
478
if (rerere_autoupdate)
479
string_list_insert(path, &update);
480
fprintf(stderr,
@@ -553,7 +558,7 @@ int rerere(int flags)
558
fd = setup_rerere(&merge_rr, flags);
559
if (fd < 0)
560
return 0;
556
- return do_plain_rerere(&merge_rr, fd);
561
+ return do_plain_rerere(&merge_rr, fd, merge_renormalize);
562
}
563
564
static int rerere_forget_one_path(const char *path, struct string_list *rr)