rerere: factor out handle_conflict function
[git/git.git] / rerere.c
CommitLineData
5b2fd956 1#include "cache.h"
b2141fc1 2#include "config.h"
697cc8ef 3#include "lockfile.h"
c455c87c 4#include "string-list.h"
5b2fd956 5#include "rerere.h"
5b2fd956 6#include "xdiff-interface.h"
dea4562b
JH
7#include "dir.h"
8#include "resolve-undo.h"
9#include "ll-merge.h"
8588567c 10#include "attr.h"
01a10b0a 11#include "pathspec.h"
1869bbe1 12#include "sha1-lookup.h"
5b2fd956 13
ac49f5ca
MZ
14#define RESOLVED 0
15#define PUNTED 1
16#define THREE_STAGED 2
17void *RERERE_RESOLVED = &RERERE_RESOLVED;
18
5b2fd956
SB
19/* if rerere_enabled == -1, fall back to detection of .git/rr-cache */
20static int rerere_enabled = -1;
21
22/* automatically update cleanly resolved paths to the index */
23static int rerere_autoupdate;
24
1869bbe1
JH
25static int rerere_dir_nr;
26static int rerere_dir_alloc;
27
2c7929b1
JH
28#define RR_HAS_POSTIMAGE 1
29#define RR_HAS_PREIMAGE 2
1869bbe1
JH
30static struct rerere_dir {
31 unsigned char sha1[20];
a13d1370
JH
32 int status_alloc, status_nr;
33 unsigned char *status;
1869bbe1
JH
34} **rerere_dir;
35
36static void free_rerere_dirs(void)
37{
38 int i;
a13d1370
JH
39 for (i = 0; i < rerere_dir_nr; i++) {
40 free(rerere_dir[i]->status);
1869bbe1 41 free(rerere_dir[i]);
a13d1370 42 }
88ce3ef6 43 FREE_AND_NULL(rerere_dir);
1869bbe1 44 rerere_dir_nr = rerere_dir_alloc = 0;
1869bbe1
JH
45}
46
1d51eced 47static void free_rerere_id(struct string_list_item *item)
5b2fd956 48{
1d51eced 49 free(item->util);
5b2fd956
SB
50}
51
1d51eced
JH
52static const char *rerere_id_hex(const struct rerere_id *id)
53{
1869bbe1 54 return sha1_to_hex(id->collection->sha1);
1d51eced
JH
55}
56
a13d1370
JH
57static void fit_variant(struct rerere_dir *rr_dir, int variant)
58{
59 variant++;
60 ALLOC_GROW(rr_dir->status, variant, rr_dir->status_alloc);
61 if (rr_dir->status_nr < variant) {
62 memset(rr_dir->status + rr_dir->status_nr,
63 '\0', variant - rr_dir->status_nr);
64 rr_dir->status_nr = variant;
65 }
66}
67
68static void assign_variant(struct rerere_id *id)
69{
70 int variant;
71 struct rerere_dir *rr_dir = id->collection;
72
73 variant = id->variant;
74 if (variant < 0) {
629716d2
JH
75 for (variant = 0; variant < rr_dir->status_nr; variant++)
76 if (!rr_dir->status[variant])
77 break;
a13d1370
JH
78 }
79 fit_variant(rr_dir, variant);
80 id->variant = variant;
1d51eced
JH
81}
82
83const char *rerere_path(const struct rerere_id *id, const char *file)
84{
85 if (!file)
86 return git_path("rr-cache/%s", rerere_id_hex(id));
87
a13d1370
JH
88 if (id->variant <= 0)
89 return git_path("rr-cache/%s/%s", rerere_id_hex(id), file);
90
91 return git_path("rr-cache/%s/%s.%d",
92 rerere_id_hex(id), file, id->variant);
5b2fd956
SB
93}
94
a13d1370 95static int is_rr_file(const char *name, const char *filename, int *variant)
2c7929b1 96{
a13d1370
JH
97 const char *suffix;
98 char *ep;
99
100 if (!strcmp(name, filename)) {
101 *variant = 0;
102 return 1;
103 }
104 if (!skip_prefix(name, filename, &suffix) || *suffix != '.')
105 return 0;
106
107 errno = 0;
108 *variant = strtol(suffix + 1, &ep, 10);
109 if (errno || *ep)
110 return 0;
111 return 1;
2c7929b1
JH
112}
113
114static void scan_rerere_dir(struct rerere_dir *rr_dir)
115{
116 struct dirent *de;
117 DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->sha1)));
118
119 if (!dir)
120 return;
121 while ((de = readdir(dir)) != NULL) {
a13d1370
JH
122 int variant;
123
124 if (is_rr_file(de->d_name, "postimage", &variant)) {
125 fit_variant(rr_dir, variant);
126 rr_dir->status[variant] |= RR_HAS_POSTIMAGE;
127 } else if (is_rr_file(de->d_name, "preimage", &variant)) {
128 fit_variant(rr_dir, variant);
129 rr_dir->status[variant] |= RR_HAS_PREIMAGE;
130 }
2c7929b1
JH
131 }
132 closedir(dir);
133}
134
1869bbe1
JH
135static const unsigned char *rerere_dir_sha1(size_t i, void *table)
136{
137 struct rerere_dir **rr_dir = table;
138 return rr_dir[i]->sha1;
139}
140
141static struct rerere_dir *find_rerere_dir(const char *hex)
142{
143 unsigned char sha1[20];
144 struct rerere_dir *rr_dir;
145 int pos;
146
147 if (get_sha1_hex(hex, sha1))
148 return NULL; /* BUG */
149 pos = sha1_pos(sha1, rerere_dir, rerere_dir_nr, rerere_dir_sha1);
150 if (pos < 0) {
151 rr_dir = xmalloc(sizeof(*rr_dir));
152 hashcpy(rr_dir->sha1, sha1);
a13d1370
JH
153 rr_dir->status = NULL;
154 rr_dir->status_nr = 0;
155 rr_dir->status_alloc = 0;
1869bbe1
JH
156 pos = -1 - pos;
157
158 /* Make sure the array is big enough ... */
159 ALLOC_GROW(rerere_dir, rerere_dir_nr + 1, rerere_dir_alloc);
160 /* ... and add it in. */
161 rerere_dir_nr++;
f919ffeb
SG
162 MOVE_ARRAY(rerere_dir + pos + 1, rerere_dir + pos,
163 rerere_dir_nr - pos - 1);
1869bbe1 164 rerere_dir[pos] = rr_dir;
2c7929b1 165 scan_rerere_dir(rr_dir);
1869bbe1
JH
166 }
167 return rerere_dir[pos];
5b2fd956
SB
168}
169
1d51eced 170static int has_rerere_resolution(const struct rerere_id *id)
5b2fd956 171{
05dd9f13 172 const int both = RR_HAS_POSTIMAGE|RR_HAS_PREIMAGE;
a13d1370 173 int variant = id->variant;
1d51eced 174
a13d1370
JH
175 if (variant < 0)
176 return 0;
177 return ((id->collection->status[variant] & both) == both);
5b2fd956
SB
178}
179
1d51eced
JH
180static struct rerere_id *new_rerere_id_hex(char *hex)
181{
182 struct rerere_id *id = xmalloc(sizeof(*id));
1869bbe1 183 id->collection = find_rerere_dir(hex);
a13d1370 184 id->variant = -1; /* not known yet */
1d51eced
JH
185 return id;
186}
187
188static struct rerere_id *new_rerere_id(unsigned char *sha1)
189{
190 return new_rerere_id_hex(sha1_to_hex(sha1));
5b2fd956
SB
191}
192
4b68c2a0
JH
193/*
194 * $GIT_DIR/MERGE_RR file is a collection of records, each of which is
195 * "conflict ID", a HT and pathname, terminated with a NUL, and is
196 * used to keep track of the set of paths that "rerere" may need to
197 * work on (i.e. what is left by the previous invocation of "git
198 * rerere" during the current conflict resolution session).
199 */
c455c87c 200static void read_rr(struct string_list *rr)
5b2fd956 201{
f5800f6a 202 struct strbuf buf = STRBUF_INIT;
e9d983f1 203 FILE *in = fopen_or_warn(git_path_merge_rr(), "r");
f5800f6a 204
5b2fd956
SB
205 if (!in)
206 return;
f5800f6a
JH
207 while (!strbuf_getwholeline(&buf, in, '\0')) {
208 char *path;
209 unsigned char sha1[20];
1d51eced 210 struct rerere_id *id;
a13d1370 211 int variant;
f5800f6a
JH
212
213 /* There has to be the hash, tab, path and then NUL */
214 if (buf.len < 42 || get_sha1_hex(buf.buf, sha1))
2373b650 215 die(_("corrupt MERGE_RR"));
f5800f6a 216
a13d1370
JH
217 if (buf.buf[40] != '.') {
218 variant = 0;
219 path = buf.buf + 40;
220 } else {
221 errno = 0;
222 variant = strtol(buf.buf + 41, &path, 10);
223 if (errno)
2373b650 224 die(_("corrupt MERGE_RR"));
a13d1370
JH
225 }
226 if (*(path++) != '\t')
2373b650 227 die(_("corrupt MERGE_RR"));
f5800f6a 228 buf.buf[40] = '\0';
1d51eced 229 id = new_rerere_id_hex(buf.buf);
a13d1370 230 id->variant = variant;
1d51eced 231 string_list_insert(rr, path)->util = id;
5b2fd956 232 }
f5800f6a 233 strbuf_release(&buf);
5b2fd956
SB
234 fclose(in);
235}
236
237static struct lock_file write_lock;
238
c455c87c 239static int write_rr(struct string_list *rr, int out_fd)
5b2fd956
SB
240{
241 int i;
242 for (i = 0; i < rr->nr; i++) {
e2cb6a95 243 struct strbuf buf = STRBUF_INIT;
1d51eced 244 struct rerere_id *id;
e2cb6a95
JH
245
246 assert(rr->items[i].util != RERERE_RESOLVED);
1d51eced
JH
247
248 id = rr->items[i].util;
249 if (!id)
5b2fd956 250 continue;
a13d1370
JH
251 assert(id->variant >= 0);
252 if (0 < id->variant)
253 strbuf_addf(&buf, "%s.%d\t%s%c",
254 rerere_id_hex(id), id->variant,
255 rr->items[i].string, 0);
256 else
257 strbuf_addf(&buf, "%s\t%s%c",
258 rerere_id_hex(id),
259 rr->items[i].string, 0);
260
06f46f23 261 if (write_in_full(out_fd, buf.buf, buf.len) < 0)
2373b650 262 die(_("unable to write rerere record"));
e2cb6a95
JH
263
264 strbuf_release(&buf);
5b2fd956
SB
265 }
266 if (commit_lock_file(&write_lock) != 0)
2373b650 267 die(_("unable to write rerere record"));
5b2fd956
SB
268 return 0;
269}
270
a96847cc
JH
271/*
272 * "rerere" interacts with conflicted file contents using this I/O
273 * abstraction. It reads a conflicted contents from one place via
274 * "getline()" method, and optionally can write it out after
275 * normalizing the conflicted hunks to the "output". Subclasses of
276 * rerere_io embed this structure at the beginning of their own
277 * rerere_io object.
278 */
279struct rerere_io {
280 int (*getline)(struct strbuf *, struct rerere_io *);
281 FILE *output;
282 int wrerror;
283 /* some more stuff */
284};
285
47d32af2
AR
286static void ferr_write(const void *p, size_t count, FILE *fp, int *err)
287{
288 if (!count || *err)
289 return;
290 if (fwrite(p, count, 1, fp) != 1)
291 *err = errno;
292}
293
294static inline void ferr_puts(const char *s, FILE *fp, int *err)
295{
296 ferr_write(s, strlen(s), fp, err);
297}
298
27d6b085
JH
299static void rerere_io_putstr(const char *str, struct rerere_io *io)
300{
301 if (io->output)
302 ferr_puts(str, io->output, &io->wrerror);
303}
304
a96847cc
JH
305/*
306 * Write a conflict marker to io->output (if defined).
307 */
191f2417
JH
308static void rerere_io_putconflict(int ch, int size, struct rerere_io *io)
309{
310 char buf[64];
311
312 while (size) {
d3c2749d 313 if (size <= sizeof(buf) - 2) {
191f2417
JH
314 memset(buf, ch, size);
315 buf[size] = '\n';
316 buf[size + 1] = '\0';
317 size = 0;
318 } else {
319 int sz = sizeof(buf) - 1;
d3c2749d
JH
320
321 /*
322 * Make sure we will not write everything out
323 * in this round by leaving at least 1 byte
324 * for the next round, giving the next round
325 * a chance to add the terminating LF. Yuck.
326 */
191f2417
JH
327 if (size <= sz)
328 sz -= (sz - size) + 1;
329 memset(buf, ch, sz);
330 buf[sz] = '\0';
331 size -= sz;
332 }
333 rerere_io_putstr(buf, io);
334 }
335}
336
27d6b085
JH
337static void rerere_io_putmem(const char *mem, size_t sz, struct rerere_io *io)
338{
339 if (io->output)
340 ferr_write(mem, sz, io->output, &io->wrerror);
341}
342
a96847cc
JH
343/*
344 * Subclass of rerere_io that reads from an on-disk file
345 */
27d6b085
JH
346struct rerere_io_file {
347 struct rerere_io io;
348 FILE *input;
349};
350
a96847cc
JH
351/*
352 * ... and its getline() method implementation
353 */
27d6b085
JH
354static int rerere_file_getline(struct strbuf *sb, struct rerere_io *io_)
355{
356 struct rerere_io_file *io = (struct rerere_io_file *)io_;
357 return strbuf_getwholeline(sb, io->input, '\n');
358}
359
67711cdc
JH
360/*
361 * Require the exact number of conflict marker letters, no more, no
362 * less, followed by SP or any whitespace
363 * (including LF).
364 */
365static int is_cmarker(char *buf, int marker_char, int marker_size)
191f2417 366{
67711cdc
JH
367 int want_sp;
368
369 /*
370 * The beginning of our version and the end of their version
371 * always are labeled like "<<<<< ours" or ">>>>> theirs",
372 * hence we set want_sp for them. Note that the version from
373 * the common ancestor in diff3-style output is not always
374 * labelled (e.g. "||||| common" is often seen but "|||||"
375 * alone is also valid), so we do not set want_sp.
376 */
377 want_sp = (marker_char == '<') || (marker_char == '>');
378
191f2417
JH
379 while (marker_size--)
380 if (*buf++ != marker_char)
381 return 0;
382 if (want_sp && *buf != ' ')
383 return 0;
384 return isspace(*buf);
385}
386
c0f16f8e 387static int handle_conflict(struct rerere_io *io, int marker_size, git_SHA_CTX *ctx)
5b2fd956 388{
cc58d7df 389 enum {
c0f16f8e
TG
390 RR_SIDE_1 = 0, RR_SIDE_2, RR_ORIGINAL
391 } hunk = RR_SIDE_1;
f285a2d7 392 struct strbuf one = STRBUF_INIT, two = STRBUF_INIT;
d58ee6db 393 struct strbuf buf = STRBUF_INIT;
c0f16f8e 394 int has_conflicts = -1;
5b2fd956 395
27d6b085 396 while (!io->getline(&buf, io)) {
67711cdc 397 if (is_cmarker(buf.buf, '<', marker_size)) {
c0f16f8e 398 break;
67711cdc 399 } else if (is_cmarker(buf.buf, '|', marker_size)) {
cc58d7df 400 if (hunk != RR_SIDE_1)
c0f16f8e 401 break;
387c9d49 402 hunk = RR_ORIGINAL;
67711cdc 403 } else if (is_cmarker(buf.buf, '=', marker_size)) {
387c9d49 404 if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL)
c0f16f8e 405 break;
cc58d7df 406 hunk = RR_SIDE_2;
67711cdc 407 } else if (is_cmarker(buf.buf, '>', marker_size)) {
cc58d7df 408 if (hunk != RR_SIDE_2)
c0f16f8e 409 break;
5b2fd956
SB
410 if (strbuf_cmp(&one, &two) > 0)
411 strbuf_swap(&one, &two);
221444f5 412 has_conflicts = 1;
191f2417 413 rerere_io_putconflict('<', marker_size, io);
27d6b085 414 rerere_io_putmem(one.buf, one.len, io);
191f2417 415 rerere_io_putconflict('=', marker_size, io);
27d6b085 416 rerere_io_putmem(two.buf, two.len, io);
191f2417 417 rerere_io_putconflict('>', marker_size, io);
c0f16f8e
TG
418 if (ctx) {
419 git_SHA1_Update(ctx, one.buf ? one.buf : "",
5b2fd956 420 one.len + 1);
c0f16f8e 421 git_SHA1_Update(ctx, two.buf ? two.buf : "",
5b2fd956
SB
422 two.len + 1);
423 }
c0f16f8e 424 break;
cc58d7df 425 } else if (hunk == RR_SIDE_1)
e992d1eb 426 strbuf_addbuf(&one, &buf);
387c9d49
JH
427 else if (hunk == RR_ORIGINAL)
428 ; /* discard */
cc58d7df 429 else if (hunk == RR_SIDE_2)
e992d1eb 430 strbuf_addbuf(&two, &buf);
5b2fd956
SB
431 }
432 strbuf_release(&one);
433 strbuf_release(&two);
d58ee6db 434 strbuf_release(&buf);
5b2fd956 435
c0f16f8e
TG
436 return has_conflicts;
437}
438
439/*
440 * Read contents a file with conflicts, normalize the conflicts
441 * by (1) discarding the common ancestor version in diff3-style,
442 * (2) reordering our side and their side so that whichever sorts
443 * alphabetically earlier comes before the other one, while
444 * computing the "conflict ID", which is just an SHA-1 hash of
445 * one side of the conflict, NUL, the other side of the conflict,
446 * and NUL concatenated together.
447 *
448 * Return 1 if conflict hunks are found, 0 if there are no conflict
449 * hunks and -1 if an error occured.
450 */
451static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_size)
452{
453 git_SHA_CTX ctx;
454 struct strbuf buf = STRBUF_INIT;
455 int has_conflicts = 0;
456 if (sha1)
457 git_SHA1_Init(&ctx);
458
459 while (!io->getline(&buf, io)) {
460 if (is_cmarker(buf.buf, '<', marker_size)) {
461 has_conflicts = handle_conflict(io, marker_size,
462 sha1 ? &ctx : NULL);
463 if (has_conflicts < 0)
464 break;
465 } else
466 rerere_io_putstr(buf.buf, io);
467 }
468 strbuf_release(&buf);
469
5b2fd956 470 if (sha1)
9126f009 471 git_SHA1_Final(sha1, &ctx);
c0f16f8e 472
221444f5 473 return has_conflicts;
27d6b085
JH
474}
475
cc899eca
JH
476/*
477 * Scan the path for conflicts, do the "handle_path()" thing above, and
478 * return the number of conflict hunks found.
479 */
27d6b085
JH
480static int handle_file(const char *path, unsigned char *sha1, const char *output)
481{
221444f5 482 int has_conflicts = 0;
27d6b085 483 struct rerere_io_file io;
8588567c 484 int marker_size = ll_merge_marker_size(path);
27d6b085
JH
485
486 memset(&io, 0, sizeof(io));
487 io.io.getline = rerere_file_getline;
488 io.input = fopen(path, "r");
489 io.io.wrerror = 0;
490 if (!io.input)
2373b650 491 return error_errno(_("could not open '%s'"), path);
27d6b085
JH
492
493 if (output) {
494 io.io.output = fopen(output, "w");
495 if (!io.io.output) {
2373b650 496 error_errno(_("could not write '%s'"), output);
27d6b085 497 fclose(io.input);
f7566f07 498 return -1;
27d6b085
JH
499 }
500 }
501
221444f5 502 has_conflicts = handle_path(sha1, (struct rerere_io *)&io, marker_size);
27d6b085
JH
503
504 fclose(io.input);
505 if (io.io.wrerror)
2373b650 506 error(_("there were errors while writing '%s' (%s)"),
27d6b085
JH
507 path, strerror(io.io.wrerror));
508 if (io.io.output && fclose(io.io.output))
2373b650 509 io.io.wrerror = error_errno(_("failed to flush '%s'"), path);
27d6b085 510
221444f5 511 if (has_conflicts < 0) {
5b2fd956 512 if (output)
691f1a28 513 unlink_or_warn(output);
2373b650 514 return error(_("could not parse conflict hunks in '%s'"), path);
5b2fd956 515 }
27d6b085 516 if (io.io.wrerror)
47d32af2 517 return -1;
221444f5 518 return has_conflicts;
5b2fd956
SB
519}
520
4b68c2a0
JH
521/*
522 * Look at a cache entry at "i" and see if it is not conflicting,
523 * conflicting and we are willing to handle, or conflicting and
524 * we are unable to handle, and return the determination in *type.
525 * Return the cache index to be looked at next, by skipping the
526 * stages we have already looked at in this invocation of this
527 * function.
528 */
ac49f5ca 529static int check_one_conflict(int i, int *type)
5b2fd956 530{
9c5e6c80 531 const struct cache_entry *e = active_cache[i];
ac49f5ca
MZ
532
533 if (!ce_stage(e)) {
534 *type = RESOLVED;
535 return i + 1;
536 }
537
538 *type = PUNTED;
5eda906b 539 while (ce_stage(active_cache[i]) == 1)
fb70a06d 540 i++;
ac49f5ca
MZ
541
542 /* Only handle regular files with both stages #2 and #3 */
543 if (i + 1 < active_nr) {
9c5e6c80
NTND
544 const struct cache_entry *e2 = active_cache[i];
545 const struct cache_entry *e3 = active_cache[i + 1];
5b2fd956
SB
546 if (ce_stage(e2) == 2 &&
547 ce_stage(e3) == 3 &&
ac49f5ca 548 ce_same_name(e, e3) &&
5b2fd956 549 S_ISREG(e2->ce_mode) &&
ac49f5ca
MZ
550 S_ISREG(e3->ce_mode))
551 *type = THREE_STAGED;
552 }
553
554 /* Skip the entries with the same name */
555 while (i < active_nr && ce_same_name(e, active_cache[i]))
556 i++;
557 return i;
558}
559
4b68c2a0
JH
560/*
561 * Scan the index and find paths that have conflicts that rerere can
562 * handle, i.e. the ones that has both stages #2 and #3.
563 *
564 * NEEDSWORK: we do not record or replay a previous "resolve by
565 * deletion" for a delete-modify conflict, as that is inherently risky
566 * without knowing what modification is being discarded. The only
567 * safe case, i.e. both side doing the deletion and modification that
568 * are identical to the previous round, might want to be handled,
569 * though.
570 */
ac49f5ca
MZ
571static int find_conflict(struct string_list *conflict)
572{
573 int i;
574 if (read_cache() < 0)
2373b650 575 return error(_("index file corrupt"));
ac49f5ca
MZ
576
577 for (i = 0; i < active_nr;) {
578 int conflict_type;
9c5e6c80 579 const struct cache_entry *e = active_cache[i];
ac49f5ca
MZ
580 i = check_one_conflict(i, &conflict_type);
581 if (conflict_type == THREE_STAGED)
582 string_list_insert(conflict, (const char *)e->name);
583 }
584 return 0;
585}
586
4b68c2a0
JH
587/*
588 * The merge_rr list is meant to hold outstanding conflicted paths
589 * that rerere could handle. Abuse the list by adding other types of
590 * entries to allow the caller to show "rerere remaining".
591 *
592 * - Conflicted paths that rerere does not handle are added
593 * - Conflicted paths that have been resolved are marked as such
594 * by storing RERERE_RESOLVED to .util field (where conflict ID
595 * is expected to be stored).
596 *
597 * Do *not* write MERGE_RR file out after calling this function.
598 *
599 * NEEDSWORK: we may want to fix the caller that implements "rerere
600 * remaining" to do this without abusing merge_rr.
601 */
ac49f5ca
MZ
602int rerere_remaining(struct string_list *merge_rr)
603{
604 int i;
9dd330e6
JK
605 if (setup_rerere(merge_rr, RERERE_READONLY))
606 return 0;
ac49f5ca 607 if (read_cache() < 0)
2373b650 608 return error(_("index file corrupt"));
ac49f5ca
MZ
609
610 for (i = 0; i < active_nr;) {
611 int conflict_type;
9c5e6c80 612 const struct cache_entry *e = active_cache[i];
ac49f5ca
MZ
613 i = check_one_conflict(i, &conflict_type);
614 if (conflict_type == PUNTED)
615 string_list_insert(merge_rr, (const char *)e->name);
616 else if (conflict_type == RESOLVED) {
617 struct string_list_item *it;
618 it = string_list_lookup(merge_rr, (const char *)e->name);
619 if (it != NULL) {
1d51eced 620 free_rerere_id(it);
ac49f5ca
MZ
621 it->util = RERERE_RESOLVED;
622 }
5b2fd956
SB
623 }
624 }
625 return 0;
626}
627
0ce02b36
JH
628/*
629 * Try using the given conflict resolution "ID" to see
630 * if that recorded conflict resolves cleanly what we
631 * got in the "cur".
632 */
633static int try_merge(const struct rerere_id *id, const char *path,
634 mmfile_t *cur, mmbuffer_t *result)
635{
636 int ret;
637 mmfile_t base = {NULL, 0}, other = {NULL, 0};
638
639 if (read_mmfile(&base, rerere_path(id, "preimage")) ||
640 read_mmfile(&other, rerere_path(id, "postimage")))
641 ret = 1;
642 else
643 /*
644 * A three-way merge. Note that this honors user-customizable
645 * low-level merge driver settings.
646 */
647 ret = ll_merge(result, path, &base, NULL, cur, "", &other, "", NULL);
648
649 free(base.ptr);
650 free(other.ptr);
651
652 return ret;
653}
654
cc899eca 655/*
18bb9934 656 * Find the conflict identified by "id"; the change between its
cc899eca
JH
657 * "preimage" (i.e. a previous contents with conflict markers) and its
658 * "postimage" (i.e. the corresponding contents with conflicts
659 * resolved) may apply cleanly to the contents stored in "path", i.e.
660 * the conflict this time around.
661 *
662 * Returns 0 for successful replay of recorded resolution, or non-zero
663 * for failure.
664 */
1d51eced 665static int merge(const struct rerere_id *id, const char *path)
5b2fd956 666{
15ed07d5 667 FILE *f;
5b2fd956 668 int ret;
0ce02b36 669 mmfile_t cur = {NULL, 0};
5b2fd956 670 mmbuffer_t result = {NULL, 0};
5b2fd956 671
cc899eca
JH
672 /*
673 * Normalize the conflicts in path and write it out to
674 * "thisimage" temporary file.
675 */
0ce02b36
JH
676 if ((handle_file(path, NULL, rerere_path(id, "thisimage")) < 0) ||
677 read_mmfile(&cur, rerere_path(id, "thisimage"))) {
689b8c29
BW
678 ret = 1;
679 goto out;
680 }
cc899eca 681
0ce02b36 682 ret = try_merge(id, path, &cur, &result);
15ed07d5
JH
683 if (ret)
684 goto out;
685
686 /*
687 * A successful replay of recorded resolution.
688 * Mark that "postimage" was used to help gc.
689 */
690 if (utime(rerere_path(id, "postimage"), NULL) < 0)
2373b650 691 warning_errno(_("failed utime() on '%s'"),
033e011e 692 rerere_path(id, "postimage"));
15ed07d5
JH
693
694 /* Update "path" with the resolution */
695 f = fopen(path, "w");
696 if (!f)
2373b650 697 return error_errno(_("could not open '%s'"), path);
15ed07d5 698 if (fwrite(result.ptr, result.size, 1, f) != 1)
2373b650 699 error_errno(_("could not write '%s'"), path);
15ed07d5 700 if (fclose(f))
2373b650 701 return error_errno(_("writing '%s' failed"), path);
5b2fd956 702
689b8c29 703out:
5b2fd956 704 free(cur.ptr);
5b2fd956
SB
705 free(result.ptr);
706
707 return ret;
708}
709
89ea9035 710static void update_paths(struct string_list *update)
5b2fd956 711{
0fa5a2ed 712 struct lock_file index_lock = LOCK_INIT;
5b2fd956 713 int i;
5b2fd956 714
b3e83cc7 715 hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
5b2fd956
SB
716
717 for (i = 0; i < update->nr; i++) {
c455c87c 718 struct string_list_item *item = &update->items[i];
89ea9035
JN
719 if (add_file_to_cache(item->string, 0))
720 exit(128);
2373b650 721 fprintf_ln(stderr, _("Staged '%s' using previous resolution."),
a14c7ab8 722 item->string);
5b2fd956
SB
723 }
724
61000814
725 if (write_locked_index(&the_index, &index_lock,
726 COMMIT_LOCK | SKIP_IF_UNCHANGED))
2373b650 727 die(_("unable to write new index file"));
5b2fd956
SB
728}
729
629716d2
JH
730static void remove_variant(struct rerere_id *id)
731{
732 unlink_or_warn(rerere_path(id, "postimage"));
733 unlink_or_warn(rerere_path(id, "preimage"));
734 id->collection->status[id->variant] = 0;
735}
736
8e7768b2
JH
737/*
738 * The path indicated by rr_item may still have conflict for which we
739 * have a recorded resolution, in which case replay it and optionally
740 * update it. Or it may have been resolved by the user and we may
741 * only have the preimage for that conflict, in which case the result
742 * needs to be recorded as a resolution in a postimage file.
743 */
744static void do_rerere_one_path(struct string_list_item *rr_item,
745 struct string_list *update)
746{
747 const char *path = rr_item->string;
a13d1370 748 struct rerere_id *id = rr_item->util;
629716d2 749 struct rerere_dir *rr_dir = id->collection;
a13d1370
JH
750 int variant;
751
a13d1370 752 variant = id->variant;
8e7768b2 753
629716d2
JH
754 /* Has the user resolved it already? */
755 if (variant >= 0) {
756 if (!handle_file(path, NULL, NULL)) {
757 copy_file(rerere_path(id, "postimage"), path, 0666);
758 id->collection->status[variant] |= RR_HAS_POSTIMAGE;
2373b650 759 fprintf_ln(stderr, _("Recorded resolution for '%s'."), path);
629716d2
JH
760 free_rerere_id(rr_item);
761 rr_item->util = NULL;
762 return;
763 }
c0a5423b 764 /*
629716d2
JH
765 * There may be other variants that can cleanly
766 * replay. Try them and update the variant number for
767 * this one.
c0a5423b 768 */
629716d2
JH
769 }
770
771 /* Does any existing resolution apply cleanly? */
772 for (variant = 0; variant < rr_dir->status_nr; variant++) {
773 const int both = RR_HAS_PREIMAGE | RR_HAS_POSTIMAGE;
774 struct rerere_id vid = *id;
775
776 if ((rr_dir->status[variant] & both) != both)
777 continue;
8e7768b2 778
629716d2
JH
779 vid.variant = variant;
780 if (merge(&vid, path))
781 continue; /* failed to replay */
782
783 /*
784 * If there already is a different variant that applies
785 * cleanly, there is no point maintaining our own variant.
786 */
787 if (0 <= id->variant && id->variant != variant)
788 remove_variant(id);
8e7768b2
JH
789
790 if (rerere_autoupdate)
791 string_list_insert(update, path);
792 else
2373b650
TG
793 fprintf_ln(stderr,
794 _("Resolved '%s' using previous resolution."),
795 path);
629716d2
JH
796 free_rerere_id(rr_item);
797 rr_item->util = NULL;
925d73c4 798 return;
8e7768b2 799 }
629716d2
JH
800
801 /* None of the existing one applies; we need a new variant */
802 assign_variant(id);
803
804 variant = id->variant;
805 handle_file(path, NULL, rerere_path(id, "preimage"));
806 if (id->collection->status[variant] & RR_HAS_POSTIMAGE) {
807 const char *path = rerere_path(id, "postimage");
808 if (unlink(path))
2373b650 809 die_errno(_("cannot unlink stray '%s'"), path);
629716d2
JH
810 id->collection->status[variant] &= ~RR_HAS_POSTIMAGE;
811 }
812 id->collection->status[variant] |= RR_HAS_PREIMAGE;
2373b650 813 fprintf_ln(stderr, _("Recorded preimage for '%s'"), path);
8e7768b2
JH
814}
815
c455c87c 816static int do_plain_rerere(struct string_list *rr, int fd)
5b2fd956 817{
183113a5
TF
818 struct string_list conflict = STRING_LIST_INIT_DUP;
819 struct string_list update = STRING_LIST_INIT_DUP;
5b2fd956
SB
820 int i;
821
822 find_conflict(&conflict);
823
824 /*
cc899eca
JH
825 * MERGE_RR records paths with conflicts immediately after
826 * merge failed. Some of the conflicted paths might have been
827 * hand resolved in the working tree since then, but the
828 * initial run would catch all and register their preimages.
5b2fd956 829 */
5b2fd956 830 for (i = 0; i < conflict.nr; i++) {
1d51eced 831 struct rerere_id *id;
c7a25d37 832 unsigned char sha1[20];
c455c87c 833 const char *path = conflict.items[i].string;
93406a28 834 int ret, has_string;
5b2fd956 835
c7a25d37
JH
836 /*
837 * Ask handle_file() to scan and assign a
838 * conflict ID. No need to write anything out
839 * yet.
840 */
841 ret = handle_file(path, sha1, NULL);
93406a28
TG
842 has_string = string_list_has_string(rr, path);
843 if (ret < 0 && has_string) {
844 remove_variant(string_list_lookup(rr, path)->util);
845 string_list_remove(rr, path, 1);
846 }
847 if (ret < 1 || has_string)
c7a25d37 848 continue;
5b2fd956 849
1d51eced 850 id = new_rerere_id(sha1);
18bb9934 851 string_list_insert(rr, path)->util = id;
cc899eca 852
c0a5423b
JH
853 /* Ensure that the directory exists. */
854 mkdir_in_gitdir(rerere_path(id, NULL));
5b2fd956
SB
855 }
856
8e7768b2
JH
857 for (i = 0; i < rr->nr; i++)
858 do_rerere_one_path(&rr->items[i], &update);
5b2fd956
SB
859
860 if (update.nr)
861 update_paths(&update);
862
863 return write_rr(rr, fd);
864}
865
633e5ad3 866static void git_rerere_config(void)
5b2fd956 867{
633e5ad3
TA
868 git_config_get_bool("rerere.enabled", &rerere_enabled);
869 git_config_get_bool("rerere.autoupdate", &rerere_autoupdate);
870 git_config(git_default_config, NULL);
5b2fd956
SB
871}
872
f932729c
JK
873static GIT_PATH_FUNC(git_path_rr_cache, "rr-cache")
874
5b2fd956
SB
875static int is_rerere_enabled(void)
876{
5b2fd956
SB
877 int rr_cache_exists;
878
879 if (!rerere_enabled)
880 return 0;
881
f932729c 882 rr_cache_exists = is_directory(git_path_rr_cache());
5b2fd956
SB
883 if (rerere_enabled < 0)
884 return rr_cache_exists;
885
f932729c 886 if (!rr_cache_exists && mkdir_in_gitdir(git_path_rr_cache()))
2373b650 887 die(_("could not create directory '%s'"), git_path_rr_cache());
5b2fd956
SB
888 return 1;
889}
890
cb6020bb 891int setup_rerere(struct string_list *merge_rr, int flags)
5b2fd956
SB
892{
893 int fd;
894
633e5ad3 895 git_rerere_config();
5b2fd956
SB
896 if (!is_rerere_enabled())
897 return -1;
898
cb6020bb
JH
899 if (flags & (RERERE_AUTOUPDATE|RERERE_NOAUTOUPDATE))
900 rerere_autoupdate = !!(flags & RERERE_AUTOUPDATE);
9dd330e6
JK
901 if (flags & RERERE_READONLY)
902 fd = 0;
903 else
904 fd = hold_lock_file_for_update(&write_lock, git_path_merge_rr(),
905 LOCK_DIE_ON_ERROR);
5b2fd956
SB
906 read_rr(merge_rr);
907 return fd;
908}
909
cc899eca
JH
910/*
911 * The main entry point that is called internally from codepaths that
912 * perform mergy operations, possibly leaving conflicted index entries
913 * and working tree files.
914 */
cb6020bb 915int rerere(int flags)
5b2fd956 916{
183113a5 917 struct string_list merge_rr = STRING_LIST_INIT_DUP;
1869bbe1 918 int fd, status;
5b2fd956 919
cb6020bb 920 fd = setup_rerere(&merge_rr, flags);
5b2fd956
SB
921 if (fd < 0)
922 return 0;
1869bbe1
JH
923 status = do_plain_rerere(&merge_rr, fd);
924 free_rerere_dirs();
925 return status;
5b2fd956 926}
dea4562b 927
3d730ed9
JH
928/*
929 * Subclass of rerere_io that reads from an in-core buffer that is a
930 * strbuf
931 */
932struct rerere_io_mem {
933 struct rerere_io io;
934 struct strbuf input;
935};
936
937/*
938 * ... and its getline() method implementation
939 */
940static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_)
941{
942 struct rerere_io_mem *io = (struct rerere_io_mem *)io_;
943 char *ep;
944 size_t len;
945
946 strbuf_release(sb);
947 if (!io->input.len)
948 return -1;
949 ep = memchr(io->input.buf, '\n', io->input.len);
950 if (!ep)
951 ep = io->input.buf + io->input.len;
952 else if (*ep == '\n')
953 ep++;
954 len = ep - io->input.buf;
955 strbuf_add(sb, io->input.buf, len);
956 strbuf_remove(&io->input, 0, len);
957 return 0;
958}
959
960static int handle_cache(const char *path, unsigned char *sha1, const char *output)
961{
962 mmfile_t mmfile[3] = {{NULL}};
963 mmbuffer_t result = {NULL, 0};
964 const struct cache_entry *ce;
221444f5 965 int pos, len, i, has_conflicts;
3d730ed9
JH
966 struct rerere_io_mem io;
967 int marker_size = ll_merge_marker_size(path);
968
969 /*
970 * Reproduce the conflicted merge in-core
971 */
972 len = strlen(path);
973 pos = cache_name_pos(path, len);
974 if (0 <= pos)
975 return -1;
976 pos = -pos - 1;
977
978 while (pos < active_nr) {
979 enum object_type type;
980 unsigned long size;
981
982 ce = active_cache[pos++];
983 if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
984 break;
985 i = ce_stage(ce) - 1;
986 if (!mmfile[i].ptr) {
b4f5aca4 987 mmfile[i].ptr = read_object_file(&ce->oid, &type,
988 &size);
3d730ed9
JH
989 mmfile[i].size = size;
990 }
991 }
992 for (i = 0; i < 3; i++)
993 if (!mmfile[i].ptr && !mmfile[i].size)
994 mmfile[i].ptr = xstrdup("");
995
996 /*
997 * NEEDSWORK: handle conflicts from merges with
998 * merge.renormalize set, too?
999 */
1000 ll_merge(&result, path, &mmfile[0], NULL,
1001 &mmfile[1], "ours",
1002 &mmfile[2], "theirs", NULL);
1003 for (i = 0; i < 3; i++)
1004 free(mmfile[i].ptr);
1005
1006 memset(&io, 0, sizeof(io));
1007 io.io.getline = rerere_mem_getline;
1008 if (output)
1009 io.io.output = fopen(output, "w");
1010 else
1011 io.io.output = NULL;
1012 strbuf_init(&io.input, 0);
1013 strbuf_attach(&io.input, result.ptr, result.size, result.size);
1014
1015 /*
1016 * Grab the conflict ID and optionally write the original
1017 * contents with conflict markers out.
1018 */
221444f5 1019 has_conflicts = handle_path(sha1, (struct rerere_io *)&io, marker_size);
3d730ed9
JH
1020 strbuf_release(&io.input);
1021 if (io.io.output)
1022 fclose(io.io.output);
221444f5 1023 return has_conflicts;
5b2fd956 1024}
dea4562b
JH
1025
1026static int rerere_forget_one_path(const char *path, struct string_list *rr)
1027{
1028 const char *filename;
1d51eced 1029 struct rerere_id *id;
dea4562b
JH
1030 unsigned char sha1[20];
1031 int ret;
8d9b5a4a 1032 struct string_list_item *item;
dea4562b 1033
963ec003
JH
1034 /*
1035 * Recreate the original conflict from the stages in the
1036 * index and compute the conflict ID
1037 */
dea4562b
JH
1038 ret = handle_cache(path, sha1, NULL);
1039 if (ret < 1)
2373b650 1040 return error(_("could not parse conflict hunks in '%s'"), path);
963ec003
JH
1041
1042 /* Nuke the recorded resolution for the conflict */
1d51eced 1043 id = new_rerere_id(sha1);
890fca84
JH
1044
1045 for (id->variant = 0;
1046 id->variant < id->collection->status_nr;
1047 id->variant++) {
1048 mmfile_t cur = { NULL, 0 };
1049 mmbuffer_t result = {NULL, 0};
1050 int cleanly_resolved;
1051
1052 if (!has_rerere_resolution(id))
1053 continue;
1054
1055 handle_cache(path, sha1, rerere_path(id, "thisimage"));
1056 if (read_mmfile(&cur, rerere_path(id, "thisimage"))) {
1057 free(cur.ptr);
2373b650 1058 error(_("failed to update conflicted state in '%s'"), path);
8f449614 1059 goto fail_exit;
890fca84
JH
1060 }
1061 cleanly_resolved = !try_merge(id, path, &cur, &result);
1062 free(result.ptr);
1063 free(cur.ptr);
1064 if (cleanly_resolved)
1065 break;
1066 }
1067
8f449614 1068 if (id->collection->status_nr <= id->variant) {
2373b650 1069 error(_("no remembered resolution for '%s'"), path);
8f449614
JH
1070 goto fail_exit;
1071 }
890fca84 1072
18bb9934 1073 filename = rerere_path(id, "postimage");
8f449614
JH
1074 if (unlink(filename)) {
1075 if (errno == ENOENT)
2373b650 1076 error(_("no remembered resolution for '%s'"), path);
8f449614 1077 else
2373b650 1078 error_errno(_("cannot unlink '%s'"), filename);
8f449614 1079 goto fail_exit;
d9d501b0 1080 }
dea4562b 1081
963ec003
JH
1082 /*
1083 * Update the preimage so that the user can resolve the
1084 * conflict in the working tree, run us again to record
1085 * the postimage.
1086 */
18bb9934 1087 handle_cache(path, sha1, rerere_path(id, "preimage"));
2373b650 1088 fprintf_ln(stderr, _("Updated preimage for '%s'"), path);
dea4562b 1089
963ec003
JH
1090 /*
1091 * And remember that we can record resolution for this
1092 * conflict when the user is done.
1093 */
8d9b5a4a 1094 item = string_list_insert(rr, path);
1d51eced 1095 free_rerere_id(item);
18bb9934 1096 item->util = id;
2373b650 1097 fprintf(stderr, _("Forgot resolution for '%s'\n"), path);
dea4562b 1098 return 0;
8f449614
JH
1099
1100fail_exit:
1101 free(id);
1102 return -1;
dea4562b
JH
1103}
1104
01a10b0a 1105int rerere_forget(struct pathspec *pathspec)
dea4562b
JH
1106{
1107 int i, fd;
183113a5
TF
1108 struct string_list conflict = STRING_LIST_INIT_DUP;
1109 struct string_list merge_rr = STRING_LIST_INIT_DUP;
dea4562b
JH
1110
1111 if (read_cache() < 0)
2373b650 1112 return error(_("index file corrupt"));
dea4562b 1113
6751e047 1114 fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
0544574c
JK
1115 if (fd < 0)
1116 return 0;
dea4562b 1117
963ec003
JH
1118 /*
1119 * The paths may have been resolved (incorrectly);
1120 * recover the original conflicted state and then
1121 * find the conflicted paths.
1122 */
dea4562b
JH
1123 unmerge_cache(pathspec);
1124 find_conflict(&conflict);
1125 for (i = 0; i < conflict.nr; i++) {
1126 struct string_list_item *it = &conflict.items[i];
854b0959 1127 if (!match_pathspec(pathspec, it->string,
ae8d0824 1128 strlen(it->string), 0, NULL, 0))
dea4562b
JH
1129 continue;
1130 rerere_forget_one_path(it->string, &merge_rr);
1131 }
1132 return write_rr(&merge_rr, fd);
1133}
0f891e7d 1134
e828de82
JH
1135/*
1136 * Garbage collection support
1137 */
1d51eced 1138
5ea82279 1139static timestamp_t rerere_created_at(struct rerere_id *id)
0f891e7d
JH
1140{
1141 struct stat st;
1d51eced 1142
18bb9934 1143 return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
0f891e7d
JH
1144}
1145
5ea82279 1146static timestamp_t rerere_last_used_at(struct rerere_id *id)
0f891e7d
JH
1147{
1148 struct stat st;
1d51eced 1149
18bb9934 1150 return stat(rerere_path(id, "postimage"), &st) ? (time_t) 0 : st.st_mtime;
0f891e7d
JH
1151}
1152
e828de82
JH
1153/*
1154 * Remove the recorded resolution for a given conflict ID
1155 */
1d51eced 1156static void unlink_rr_item(struct rerere_id *id)
0f891e7d 1157{
1be1e851
JH
1158 unlink_or_warn(rerere_path(id, "thisimage"));
1159 remove_variant(id);
1160 id->collection->status[id->variant] = 0;
1161}
1162
5ea82279
JH
1163static void prune_one(struct rerere_id *id,
1164 timestamp_t cutoff_resolve, timestamp_t cutoff_noresolve)
1be1e851 1165{
5ea82279
JH
1166 timestamp_t then;
1167 timestamp_t cutoff;
1be1e851
JH
1168
1169 then = rerere_last_used_at(id);
1170 if (then)
1171 cutoff = cutoff_resolve;
1172 else {
1173 then = rerere_created_at(id);
1174 if (!then)
1175 return;
1176 cutoff = cutoff_noresolve;
1177 }
5ea82279 1178 if (then < cutoff)
1be1e851 1179 unlink_rr_item(id);
0f891e7d
JH
1180}
1181
0f891e7d
JH
1182void rerere_gc(struct string_list *rr)
1183{
1184 struct string_list to_remove = STRING_LIST_INIT_DUP;
1185 DIR *dir;
1186 struct dirent *e;
1be1e851 1187 int i;
5ea82279
JH
1188 timestamp_t now = time(NULL);
1189 timestamp_t cutoff_noresolve = now - 15 * 86400;
1190 timestamp_t cutoff_resolve = now - 60 * 86400;
0f891e7d 1191
9dd330e6
JK
1192 if (setup_rerere(rr, 0) < 0)
1193 return;
1194
6e96cb52
JH
1195 git_config_get_expiry_in_days("gc.rerereresolved", &cutoff_resolve, now);
1196 git_config_get_expiry_in_days("gc.rerereunresolved", &cutoff_noresolve, now);
633e5ad3 1197 git_config(git_default_config, NULL);
0f891e7d
JH
1198 dir = opendir(git_path("rr-cache"));
1199 if (!dir)
2373b650 1200 die_errno(_("unable to open rr-cache directory"));
e828de82 1201 /* Collect stale conflict IDs ... */
0f891e7d 1202 while ((e = readdir(dir))) {
1be1e851
JH
1203 struct rerere_dir *rr_dir;
1204 struct rerere_id id;
1205 int now_empty;
1206
0f891e7d
JH
1207 if (is_dot_or_dotdot(e->d_name))
1208 continue;
1be1e851
JH
1209 rr_dir = find_rerere_dir(e->d_name);
1210 if (!rr_dir)
1211 continue; /* or should we remove e->d_name? */
1212
1213 now_empty = 1;
1214 for (id.variant = 0, id.collection = rr_dir;
1215 id.variant < id.collection->status_nr;
1216 id.variant++) {
5ea82279 1217 prune_one(&id, cutoff_resolve, cutoff_noresolve);
1be1e851
JH
1218 if (id.collection->status[id.variant])
1219 now_empty = 0;
0f891e7d 1220 }
1be1e851 1221 if (now_empty)
0f891e7d
JH
1222 string_list_append(&to_remove, e->d_name);
1223 }
a9930e35 1224 closedir(dir);
1be1e851
JH
1225
1226 /* ... and then remove the empty directories */
0f891e7d 1227 for (i = 0; i < to_remove.nr; i++)
1be1e851 1228 rmdir(git_path("rr-cache/%s", to_remove.items[i].string));
0f891e7d 1229 string_list_clear(&to_remove, 0);
9dd330e6 1230 rollback_lock_file(&write_lock);
0f891e7d
JH
1231}
1232
e828de82
JH
1233/*
1234 * During a conflict resolution, after "rerere" recorded the
1235 * preimages, abandon them if the user did not resolve them or
1236 * record their resolutions. And drop $GIT_DIR/MERGE_RR.
1237 *
1238 * NEEDSWORK: shouldn't we be calling this from "reset --hard"?
1239 */
0f891e7d
JH
1240void rerere_clear(struct string_list *merge_rr)
1241{
1242 int i;
1243
9dd330e6
JK
1244 if (setup_rerere(merge_rr, 0) < 0)
1245 return;
1246
0f891e7d 1247 for (i = 0; i < merge_rr->nr; i++) {
1d51eced 1248 struct rerere_id *id = merge_rr->items[i].util;
1be1e851 1249 if (!has_rerere_resolution(id)) {
18bb9934 1250 unlink_rr_item(id);
1be1e851
JH
1251 rmdir(rerere_path(id, NULL));
1252 }
0f891e7d 1253 }
f932729c 1254 unlink_or_warn(git_path_merge_rr());
9dd330e6 1255 rollback_lock_file(&write_lock);
0f891e7d 1256}