Andrew's git - gitweb.git/blob

576361fb001e16e51f20cabd9900b56d03283acd
   1#include "cache.h"
   2#include "lockfile.h"
   3#include "string-list.h"
   4#include "rerere.h"
   5#include "xdiff-interface.h"
   6#include "dir.h"
   7#include "resolve-undo.h"
   8#include "ll-merge.h"
   9#include "attr.h"
  10#include "pathspec.h"
  11
  12#define RESOLVED 0
  13#define PUNTED 1
  14#define THREE_STAGED 2
  15void *RERERE_RESOLVED = &RERERE_RESOLVED;
  16
  17/* if rerere_enabled == -1, fall back to detection of .git/rr-cache */
  18static int rerere_enabled = -1;
  19
  20/* automatically update cleanly resolved paths to the index */
  21static int rerere_autoupdate;
  22
  23static char *merge_rr_path;
  24
  25const char *rerere_path(const char *hex, const char *file)
  26{
  27        return git_path("rr-cache/%s/%s", hex, file);
  28}
  29
  30static int has_rerere_resolution(const char *hex)
  31{
  32        struct stat st;
  33        return !stat(rerere_path(hex, "postimage"), &st);
  34}
  35
  36static void read_rr(struct string_list *rr)
  37{
  38        struct strbuf buf = STRBUF_INIT;
  39        FILE *in = fopen(merge_rr_path, "r");
  40
  41        if (!in)
  42                return;
  43        while (!strbuf_getwholeline(&buf, in, '\0')) {
  44                char *path;
  45                unsigned char sha1[20];
  46
  47                /* There has to be the hash, tab, path and then NUL */
  48                if (buf.len < 42 || get_sha1_hex(buf.buf, sha1))
  49                        die("corrupt MERGE_RR");
  50
  51                if (buf.buf[40] != '\t')
  52                        die("corrupt MERGE_RR");
  53                buf.buf[40] = '\0';
  54                path = buf.buf + 41;
  55
  56                string_list_insert(rr, path)->util = xstrdup(buf.buf);
  57        }
  58        strbuf_release(&buf);
  59        fclose(in);
  60}
  61
  62static struct lock_file write_lock;
  63
  64static int write_rr(struct string_list *rr, int out_fd)
  65{
  66        int i;
  67        for (i = 0; i < rr->nr; i++) {
  68                const char *path;
  69                int length;
  70                if (!rr->items[i].util)
  71                        continue;
  72                path = rr->items[i].string;
  73                length = strlen(path) + 1;
  74                if (write_in_full(out_fd, rr->items[i].util, 40) != 40 ||
  75                    write_str_in_full(out_fd, "\t") != 1 ||
  76                    write_in_full(out_fd, path, length) != length)
  77                        die("unable to write rerere record");
  78        }
  79        if (commit_lock_file(&write_lock) != 0)
  80                die("unable to write rerere record");
  81        return 0;
  82}
  83
  84static void ferr_write(const void *p, size_t count, FILE *fp, int *err)
  85{
  86        if (!count || *err)
  87                return;
  88        if (fwrite(p, count, 1, fp) != 1)
  89                *err = errno;
  90}
  91
  92static inline void ferr_puts(const char *s, FILE *fp, int *err)
  93{
  94        ferr_write(s, strlen(s), fp, err);
  95}
  96
  97struct rerere_io {
  98        int (*getline)(struct strbuf *, struct rerere_io *);
  99        FILE *output;
 100        int wrerror;
 101        /* some more stuff */
 102};
 103
 104static void rerere_io_putstr(const char *str, struct rerere_io *io)
 105{
 106        if (io->output)
 107                ferr_puts(str, io->output, &io->wrerror);
 108}
 109
 110static void rerere_io_putconflict(int ch, int size, struct rerere_io *io)
 111{
 112        char buf[64];
 113
 114        while (size) {
 115                if (size < sizeof(buf) - 2) {
 116                        memset(buf, ch, size);
 117                        buf[size] = '\n';
 118                        buf[size + 1] = '\0';
 119                        size = 0;
 120                } else {
 121                        int sz = sizeof(buf) - 1;
 122                        if (size <= sz)
 123                                sz -= (sz - size) + 1;
 124                        memset(buf, ch, sz);
 125                        buf[sz] = '\0';
 126                        size -= sz;
 127                }
 128                rerere_io_putstr(buf, io);
 129        }
 130}
 131
 132static void rerere_io_putmem(const char *mem, size_t sz, struct rerere_io *io)
 133{
 134        if (io->output)
 135                ferr_write(mem, sz, io->output, &io->wrerror);
 136}
 137
 138struct rerere_io_file {
 139        struct rerere_io io;
 140        FILE *input;
 141};
 142
 143static int rerere_file_getline(struct strbuf *sb, struct rerere_io *io_)
 144{
 145        struct rerere_io_file *io = (struct rerere_io_file *)io_;
 146        return strbuf_getwholeline(sb, io->input, '\n');
 147}
 148
 149static int is_cmarker(char *buf, int marker_char, int marker_size, int want_sp)
 150{
 151        while (marker_size--)
 152                if (*buf++ != marker_char)
 153                        return 0;
 154        if (want_sp && *buf != ' ')
 155                return 0;
 156        return isspace(*buf);
 157}
 158
 159static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_size)
 160{
 161        git_SHA_CTX ctx;
 162        int hunk_no = 0;
 163        enum {
 164                RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL
 165        } hunk = RR_CONTEXT;
 166        struct strbuf one = STRBUF_INIT, two = STRBUF_INIT;
 167        struct strbuf buf = STRBUF_INIT;
 168
 169        if (sha1)
 170                git_SHA1_Init(&ctx);
 171
 172        while (!io->getline(&buf, io)) {
 173                if (is_cmarker(buf.buf, '<', marker_size, 1)) {
 174                        if (hunk != RR_CONTEXT)
 175                                goto bad;
 176                        hunk = RR_SIDE_1;
 177                } else if (is_cmarker(buf.buf, '|', marker_size, 0)) {
 178                        if (hunk != RR_SIDE_1)
 179                                goto bad;
 180                        hunk = RR_ORIGINAL;
 181                } else if (is_cmarker(buf.buf, '=', marker_size, 0)) {
 182                        if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL)
 183                                goto bad;
 184                        hunk = RR_SIDE_2;
 185                } else if (is_cmarker(buf.buf, '>', marker_size, 1)) {
 186                        if (hunk != RR_SIDE_2)
 187                                goto bad;
 188                        if (strbuf_cmp(&one, &two) > 0)
 189                                strbuf_swap(&one, &two);
 190                        hunk_no++;
 191                        hunk = RR_CONTEXT;
 192                        rerere_io_putconflict('<', marker_size, io);
 193                        rerere_io_putmem(one.buf, one.len, io);
 194                        rerere_io_putconflict('=', marker_size, io);
 195                        rerere_io_putmem(two.buf, two.len, io);
 196                        rerere_io_putconflict('>', marker_size, io);
 197                        if (sha1) {
 198                                git_SHA1_Update(&ctx, one.buf ? one.buf : "",
 199                                            one.len + 1);
 200                                git_SHA1_Update(&ctx, two.buf ? two.buf : "",
 201                                            two.len + 1);
 202                        }
 203                        strbuf_reset(&one);
 204                        strbuf_reset(&two);
 205                } else if (hunk == RR_SIDE_1)
 206                        strbuf_addbuf(&one, &buf);
 207                else if (hunk == RR_ORIGINAL)
 208                        ; /* discard */
 209                else if (hunk == RR_SIDE_2)
 210                        strbuf_addbuf(&two, &buf);
 211                else
 212                        rerere_io_putstr(buf.buf, io);
 213                continue;
 214        bad:
 215                hunk = 99; /* force error exit */
 216                break;
 217        }
 218        strbuf_release(&one);
 219        strbuf_release(&two);
 220        strbuf_release(&buf);
 221
 222        if (sha1)
 223                git_SHA1_Final(sha1, &ctx);
 224        if (hunk != RR_CONTEXT)
 225                return -1;
 226        return hunk_no;
 227}
 228
 229static int handle_file(const char *path, unsigned char *sha1, const char *output)
 230{
 231        int hunk_no = 0;
 232        struct rerere_io_file io;
 233        int marker_size = ll_merge_marker_size(path);
 234
 235        memset(&io, 0, sizeof(io));
 236        io.io.getline = rerere_file_getline;
 237        io.input = fopen(path, "r");
 238        io.io.wrerror = 0;
 239        if (!io.input)
 240                return error("Could not open %s", path);
 241
 242        if (output) {
 243                io.io.output = fopen(output, "w");
 244                if (!io.io.output) {
 245                        fclose(io.input);
 246                        return error("Could not write %s", output);
 247                }
 248        }
 249
 250        hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size);
 251
 252        fclose(io.input);
 253        if (io.io.wrerror)
 254                error("There were errors while writing %s (%s)",
 255                      path, strerror(io.io.wrerror));
 256        if (io.io.output && fclose(io.io.output))
 257                io.io.wrerror = error("Failed to flush %s: %s",
 258                                      path, strerror(errno));
 259
 260        if (hunk_no < 0) {
 261                if (output)
 262                        unlink_or_warn(output);
 263                return error("Could not parse conflict hunks in %s", path);
 264        }
 265        if (io.io.wrerror)
 266                return -1;
 267        return hunk_no;
 268}
 269
 270struct rerere_io_mem {
 271        struct rerere_io io;
 272        struct strbuf input;
 273};
 274
 275static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_)
 276{
 277        struct rerere_io_mem *io = (struct rerere_io_mem *)io_;
 278        char *ep;
 279        size_t len;
 280
 281        strbuf_release(sb);
 282        if (!io->input.len)
 283                return -1;
 284        ep = memchr(io->input.buf, '\n', io->input.len);
 285        if (!ep)
 286                ep = io->input.buf + io->input.len;
 287        else if (*ep == '\n')
 288                ep++;
 289        len = ep - io->input.buf;
 290        strbuf_add(sb, io->input.buf, len);
 291        strbuf_remove(&io->input, 0, len);
 292        return 0;
 293}
 294
 295static int handle_cache(const char *path, unsigned char *sha1, const char *output)
 296{
 297        mmfile_t mmfile[3] = {{NULL}};
 298        mmbuffer_t result = {NULL, 0};
 299        const struct cache_entry *ce;
 300        int pos, len, i, hunk_no;
 301        struct rerere_io_mem io;
 302        int marker_size = ll_merge_marker_size(path);
 303
 304        /*
 305         * Reproduce the conflicted merge in-core
 306         */
 307        len = strlen(path);
 308        pos = cache_name_pos(path, len);
 309        if (0 <= pos)
 310                return -1;
 311        pos = -pos - 1;
 312
 313        for (i = 0; i < 3; i++) {
 314                enum object_type type;
 315                unsigned long size;
 316                int j;
 317
 318                if (active_nr <= pos)
 319                        break;
 320                ce = active_cache[pos++];
 321                if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
 322                        continue;
 323                j = ce_stage(ce) - 1;
 324                mmfile[j].ptr = read_sha1_file(ce->sha1, &type, &size);
 325                mmfile[j].size = size;
 326        }
 327        for (i = 0; i < 3; i++) {
 328                if (!mmfile[i].ptr && !mmfile[i].size)
 329                        mmfile[i].ptr = xstrdup("");
 330        }
 331        /*
 332         * NEEDSWORK: handle conflicts from merges with
 333         * merge.renormalize set, too
 334         */
 335        ll_merge(&result, path, &mmfile[0], NULL,
 336                 &mmfile[1], "ours",
 337                 &mmfile[2], "theirs", NULL);
 338        for (i = 0; i < 3; i++)
 339                free(mmfile[i].ptr);
 340
 341        memset(&io, 0, sizeof(io));
 342        io.io.getline = rerere_mem_getline;
 343        if (output)
 344                io.io.output = fopen(output, "w");
 345        else
 346                io.io.output = NULL;
 347        strbuf_init(&io.input, 0);
 348        strbuf_attach(&io.input, result.ptr, result.size, result.size);
 349
 350        hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size);
 351        strbuf_release(&io.input);
 352        if (io.io.output)
 353                fclose(io.io.output);
 354        return hunk_no;
 355}
 356
 357static int check_one_conflict(int i, int *type)
 358{
 359        const struct cache_entry *e = active_cache[i];
 360
 361        if (!ce_stage(e)) {
 362                *type = RESOLVED;
 363                return i + 1;
 364        }
 365
 366        *type = PUNTED;
 367        while (ce_stage(active_cache[i]) == 1)
 368                i++;
 369
 370        /* Only handle regular files with both stages #2 and #3 */
 371        if (i + 1 < active_nr) {
 372                const struct cache_entry *e2 = active_cache[i];
 373                const struct cache_entry *e3 = active_cache[i + 1];
 374                if (ce_stage(e2) == 2 &&
 375                    ce_stage(e3) == 3 &&
 376                    ce_same_name(e, e3) &&
 377                    S_ISREG(e2->ce_mode) &&
 378                    S_ISREG(e3->ce_mode))
 379                        *type = THREE_STAGED;
 380        }
 381
 382        /* Skip the entries with the same name */
 383        while (i < active_nr && ce_same_name(e, active_cache[i]))
 384                i++;
 385        return i;
 386}
 387
 388static int find_conflict(struct string_list *conflict)
 389{
 390        int i;
 391        if (read_cache() < 0)
 392                return error("Could not read index");
 393
 394        for (i = 0; i < active_nr;) {
 395                int conflict_type;
 396                const struct cache_entry *e = active_cache[i];
 397                i = check_one_conflict(i, &conflict_type);
 398                if (conflict_type == THREE_STAGED)
 399                        string_list_insert(conflict, (const char *)e->name);
 400        }
 401        return 0;
 402}
 403
 404int rerere_remaining(struct string_list *merge_rr)
 405{
 406        int i;
 407        if (read_cache() < 0)
 408                return error("Could not read index");
 409
 410        for (i = 0; i < active_nr;) {
 411                int conflict_type;
 412                const struct cache_entry *e = active_cache[i];
 413                i = check_one_conflict(i, &conflict_type);
 414                if (conflict_type == PUNTED)
 415                        string_list_insert(merge_rr, (const char *)e->name);
 416                else if (conflict_type == RESOLVED) {
 417                        struct string_list_item *it;
 418                        it = string_list_lookup(merge_rr, (const char *)e->name);
 419                        if (it != NULL) {
 420                                free(it->util);
 421                                it->util = RERERE_RESOLVED;
 422                        }
 423                }
 424        }
 425        return 0;
 426}
 427
 428static int merge(const char *name, const char *path)
 429{
 430        int ret;
 431        mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
 432        mmbuffer_t result = {NULL, 0};
 433
 434        if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
 435                return 1;
 436
 437        if (read_mmfile(&cur, rerere_path(name, "thisimage")) ||
 438                        read_mmfile(&base, rerere_path(name, "preimage")) ||
 439                        read_mmfile(&other, rerere_path(name, "postimage"))) {
 440                ret = 1;
 441                goto out;
 442        }
 443        ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", NULL);
 444        if (!ret) {
 445                FILE *f;
 446
 447                if (utime(rerere_path(name, "postimage"), NULL) < 0)
 448                        warning("failed utime() on %s: %s",
 449                                        rerere_path(name, "postimage"),
 450                                        strerror(errno));
 451                f = fopen(path, "w");
 452                if (!f)
 453                        return error("Could not open %s: %s", path,
 454                                     strerror(errno));
 455                if (fwrite(result.ptr, result.size, 1, f) != 1)
 456                        error("Could not write %s: %s", path, strerror(errno));
 457                if (fclose(f))
 458                        return error("Writing %s failed: %s", path,
 459                                     strerror(errno));
 460        }
 461
 462out:
 463        free(cur.ptr);
 464        free(base.ptr);
 465        free(other.ptr);
 466        free(result.ptr);
 467
 468        return ret;
 469}
 470
 471static struct lock_file index_lock;
 472
 473static void update_paths(struct string_list *update)
 474{
 475        int i;
 476
 477        hold_locked_index(&index_lock, 1);
 478
 479        for (i = 0; i < update->nr; i++) {
 480                struct string_list_item *item = &update->items[i];
 481                if (add_file_to_cache(item->string, 0))
 482                        exit(128);
 483        }
 484
 485        if (active_cache_changed) {
 486                if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
 487                        die("Unable to write new index file");
 488        } else
 489                rollback_lock_file(&index_lock);
 490}
 491
 492static int do_plain_rerere(struct string_list *rr, int fd)
 493{
 494        struct string_list conflict = STRING_LIST_INIT_DUP;
 495        struct string_list update = STRING_LIST_INIT_DUP;
 496        int i;
 497
 498        find_conflict(&conflict);
 499
 500        /*
 501         * MERGE_RR records paths with conflicts immediately after merge
 502         * failed.  Some of the conflicted paths might have been hand resolved
 503         * in the working tree since then, but the initial run would catch all
 504         * and register their preimages.
 505         */
 506
 507        for (i = 0; i < conflict.nr; i++) {
 508                const char *path = conflict.items[i].string;
 509                if (!string_list_has_string(rr, path)) {
 510                        unsigned char sha1[20];
 511                        char *hex;
 512                        int ret;
 513                        ret = handle_file(path, sha1, NULL);
 514                        if (ret < 1)
 515                                continue;
 516                        hex = xstrdup(sha1_to_hex(sha1));
 517                        string_list_insert(rr, path)->util = hex;
 518                        if (mkdir_in_gitdir(git_path("rr-cache/%s", hex)))
 519                                continue;
 520                        handle_file(path, NULL, rerere_path(hex, "preimage"));
 521                        fprintf(stderr, "Recorded preimage for '%s'\n", path);
 522                }
 523        }
 524
 525        /*
 526         * Now some of the paths that had conflicts earlier might have been
 527         * hand resolved.  Others may be similar to a conflict already that
 528         * was resolved before.
 529         */
 530
 531        for (i = 0; i < rr->nr; i++) {
 532                int ret;
 533                const char *path = rr->items[i].string;
 534                const char *name = (const char *)rr->items[i].util;
 535
 536                if (has_rerere_resolution(name)) {
 537                        if (!merge(name, path)) {
 538                                const char *msg;
 539                                if (rerere_autoupdate) {
 540                                        string_list_insert(&update, path);
 541                                        msg = "Staged '%s' using previous resolution.\n";
 542                                } else
 543                                        msg = "Resolved '%s' using previous resolution.\n";
 544                                fprintf(stderr, msg, path);
 545                                goto mark_resolved;
 546                        }
 547                }
 548
 549                /* Let's see if we have resolved it. */
 550                ret = handle_file(path, NULL, NULL);
 551                if (ret)
 552                        continue;
 553
 554                fprintf(stderr, "Recorded resolution for '%s'.\n", path);
 555                copy_file(rerere_path(name, "postimage"), path, 0666);
 556        mark_resolved:
 557                free(rr->items[i].util);
 558                rr->items[i].util = NULL;
 559        }
 560
 561        if (update.nr)
 562                update_paths(&update);
 563
 564        return write_rr(rr, fd);
 565}
 566
 567static void git_rerere_config(void)
 568{
 569        git_config_get_bool("rerere.enabled", &rerere_enabled);
 570        git_config_get_bool("rerere.autoupdate", &rerere_autoupdate);
 571        git_config(git_default_config, NULL);
 572}
 573
 574static int is_rerere_enabled(void)
 575{
 576        const char *rr_cache;
 577        int rr_cache_exists;
 578
 579        if (!rerere_enabled)
 580                return 0;
 581
 582        rr_cache = git_path("rr-cache");
 583        rr_cache_exists = is_directory(rr_cache);
 584        if (rerere_enabled < 0)
 585                return rr_cache_exists;
 586
 587        if (!rr_cache_exists && mkdir_in_gitdir(rr_cache))
 588                die("Could not create directory %s", rr_cache);
 589        return 1;
 590}
 591
 592int setup_rerere(struct string_list *merge_rr, int flags)
 593{
 594        int fd;
 595
 596        git_rerere_config();
 597        if (!is_rerere_enabled())
 598                return -1;
 599
 600        if (flags & (RERERE_AUTOUPDATE|RERERE_NOAUTOUPDATE))
 601                rerere_autoupdate = !!(flags & RERERE_AUTOUPDATE);
 602        merge_rr_path = git_pathdup("MERGE_RR");
 603        fd = hold_lock_file_for_update(&write_lock, merge_rr_path,
 604                                       LOCK_DIE_ON_ERROR);
 605        read_rr(merge_rr);
 606        return fd;
 607}
 608
 609int rerere(int flags)
 610{
 611        struct string_list merge_rr = STRING_LIST_INIT_DUP;
 612        int fd;
 613
 614        fd = setup_rerere(&merge_rr, flags);
 615        if (fd < 0)
 616                return 0;
 617        return do_plain_rerere(&merge_rr, fd);
 618}
 619
 620static int rerere_forget_one_path(const char *path, struct string_list *rr)
 621{
 622        const char *filename;
 623        char *hex;
 624        unsigned char sha1[20];
 625        int ret;
 626        struct string_list_item *item;
 627
 628        ret = handle_cache(path, sha1, NULL);
 629        if (ret < 1)
 630                return error("Could not parse conflict hunks in '%s'", path);
 631        hex = xstrdup(sha1_to_hex(sha1));
 632        filename = rerere_path(hex, "postimage");
 633        if (unlink(filename))
 634                return (errno == ENOENT
 635                        ? error("no remembered resolution for %s", path)
 636                        : error("cannot unlink %s: %s", filename, strerror(errno)));
 637
 638        handle_cache(path, sha1, rerere_path(hex, "preimage"));
 639        fprintf(stderr, "Updated preimage for '%s'\n", path);
 640
 641        item = string_list_insert(rr, path);
 642        free(item->util);
 643        item->util = hex;
 644        fprintf(stderr, "Forgot resolution for %s\n", path);
 645        return 0;
 646}
 647
 648int rerere_forget(struct pathspec *pathspec)
 649{
 650        int i, fd;
 651        struct string_list conflict = STRING_LIST_INIT_DUP;
 652        struct string_list merge_rr = STRING_LIST_INIT_DUP;
 653
 654        if (read_cache() < 0)
 655                return error("Could not read index");
 656
 657        fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
 658
 659        unmerge_cache(pathspec);
 660        find_conflict(&conflict);
 661        for (i = 0; i < conflict.nr; i++) {
 662                struct string_list_item *it = &conflict.items[i];
 663                if (!match_pathspec(pathspec, it->string,
 664                                    strlen(it->string), 0, NULL, 0))
 665                        continue;
 666                rerere_forget_one_path(it->string, &merge_rr);
 667        }
 668        return write_rr(&merge_rr, fd);
 669}
 670
 671static time_t rerere_created_at(const char *name)
 672{
 673        struct stat st;
 674        return stat(rerere_path(name, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
 675}
 676
 677static time_t rerere_last_used_at(const char *name)
 678{
 679        struct stat st;
 680        return stat(rerere_path(name, "postimage"), &st) ? (time_t) 0 : st.st_mtime;
 681}
 682
 683static void unlink_rr_item(const char *name)
 684{
 685        unlink(rerere_path(name, "thisimage"));
 686        unlink(rerere_path(name, "preimage"));
 687        unlink(rerere_path(name, "postimage"));
 688        rmdir(git_path("rr-cache/%s", name));
 689}
 690
 691void rerere_gc(struct string_list *rr)
 692{
 693        struct string_list to_remove = STRING_LIST_INIT_DUP;
 694        DIR *dir;
 695        struct dirent *e;
 696        int i, cutoff;
 697        time_t now = time(NULL), then;
 698        int cutoff_noresolve = 15;
 699        int cutoff_resolve = 60;
 700
 701        git_config_get_int("gc.rerereresolved", &cutoff_resolve);
 702        git_config_get_int("gc.rerereunresolved", &cutoff_noresolve);
 703        git_config(git_default_config, NULL);
 704        dir = opendir(git_path("rr-cache"));
 705        if (!dir)
 706                die_errno("unable to open rr-cache directory");
 707        while ((e = readdir(dir))) {
 708                if (is_dot_or_dotdot(e->d_name))
 709                        continue;
 710
 711                then = rerere_last_used_at(e->d_name);
 712                if (then) {
 713                        cutoff = cutoff_resolve;
 714                } else {
 715                        then = rerere_created_at(e->d_name);
 716                        if (!then)
 717                                continue;
 718                        cutoff = cutoff_noresolve;
 719                }
 720                if (then < now - cutoff * 86400)
 721                        string_list_append(&to_remove, e->d_name);
 722        }
 723        closedir(dir);
 724        for (i = 0; i < to_remove.nr; i++)
 725                unlink_rr_item(to_remove.items[i].string);
 726        string_list_clear(&to_remove, 0);
 727}
 728
 729void rerere_clear(struct string_list *merge_rr)
 730{
 731        int i;
 732
 733        for (i = 0; i < merge_rr->nr; i++) {
 734                const char *name = (const char *)merge_rr->items[i].util;
 735                if (!has_rerere_resolution(name))
 736                        unlink_rr_item(name);
 737        }
 738        unlink_or_warn(git_path("MERGE_RR"));
 739}