unpack-trees.con commit git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition (fcf3a21)
   1#define NO_THE_INDEX_COMPATIBILITY_MACROS
   2#include "cache.h"
   3#include "dir.h"
   4#include "tree.h"
   5#include "tree-walk.h"
   6#include "cache-tree.h"
   7#include "unpack-trees.h"
   8#include "progress.h"
   9#include "refs.h"
  10#include "attr.h"
  11
  12/*
  13 * Error messages expected by scripts out of plumbing commands such as
  14 * read-tree.  Non-scripted Porcelain is not required to use these messages
  15 * and in fact are encouraged to reword them to better suit their particular
  16 * situation better.  See how "git checkout" replaces not_uptodate_file to
  17 * explain why it does not allow switching between branches when you have
  18 * local changes, for example.
  19 */
  20static struct unpack_trees_error_msgs unpack_plumbing_errors = {
  21        /* would_overwrite */
  22        "Entry '%s' would be overwritten by merge. Cannot merge.",
  23
  24        /* not_uptodate_file */
  25        "Entry '%s' not uptodate. Cannot merge.",
  26
  27        /* not_uptodate_dir */
  28        "Updating '%s' would lose untracked files in it",
  29
  30        /* would_lose_untracked */
  31        "Untracked working tree file '%s' would be %s by merge.",
  32
  33        /* bind_overlap */
  34        "Entry '%s' overlaps with '%s'.  Cannot bind.",
  35
  36        /* sparse_not_uptodate_file */
  37        "Entry '%s' not uptodate. Cannot update sparse checkout.",
  38
  39        /* would_lose_orphaned */
  40        "Working tree file '%s' would be %s by sparse checkout update.",
  41};
  42
  43#define ERRORMSG(o,fld) \
  44        ( ((o) && (o)->msgs.fld) \
  45        ? ((o)->msgs.fld) \
  46        : (unpack_plumbing_errors.fld) )
  47
  48static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
  49        unsigned int set, unsigned int clear)
  50{
  51        unsigned int size = ce_size(ce);
  52        struct cache_entry *new = xmalloc(size);
  53
  54        clear |= CE_HASHED | CE_UNHASHED;
  55
  56        memcpy(new, ce, size);
  57        new->next = NULL;
  58        new->ce_flags = (new->ce_flags & ~clear) | set;
  59        add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
  60}
  61
  62/*
  63 * Unlink the last component and schedule the leading directories for
  64 * removal, such that empty directories get removed.
  65 */
  66static void unlink_entry(struct cache_entry *ce)
  67{
  68        if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
  69                return;
  70        if (S_ISGITLINK(ce->ce_mode)) {
  71                if (rmdir(ce->name)) {
  72                        warning("unable to rmdir %s: %s",
  73                                ce->name, strerror(errno));
  74                        return;
  75                }
  76        }
  77        else
  78                if (unlink_or_warn(ce->name))
  79                        return;
  80        schedule_dir_for_removal(ce->name, ce_namelen(ce));
  81}
  82
  83static struct checkout state;
  84static int check_updates(struct unpack_trees_options *o)
  85{
  86        unsigned cnt = 0, total = 0;
  87        struct progress *progress = NULL;
  88        struct index_state *index = &o->result;
  89        int i;
  90        int errs = 0;
  91
  92        if (o->update && o->verbose_update) {
  93                for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
  94                        struct cache_entry *ce = index->cache[cnt];
  95                        if (ce->ce_flags & (CE_UPDATE | CE_REMOVE | CE_WT_REMOVE))
  96                                total++;
  97                }
  98
  99                progress = start_progress_delay("Checking out files",
 100                                                total, 50, 1);
 101                cnt = 0;
 102        }
 103
 104        if (o->update)
 105                git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
 106        for (i = 0; i < index->cache_nr; i++) {
 107                struct cache_entry *ce = index->cache[i];
 108
 109                if (ce->ce_flags & CE_WT_REMOVE) {
 110                        display_progress(progress, ++cnt);
 111                        if (o->update)
 112                                unlink_entry(ce);
 113                        continue;
 114                }
 115
 116                if (ce->ce_flags & CE_REMOVE) {
 117                        display_progress(progress, ++cnt);
 118                        if (o->update)
 119                                unlink_entry(ce);
 120                }
 121        }
 122        remove_marked_cache_entries(&o->result);
 123        remove_scheduled_dirs();
 124
 125        for (i = 0; i < index->cache_nr; i++) {
 126                struct cache_entry *ce = index->cache[i];
 127
 128                if (ce->ce_flags & CE_UPDATE) {
 129                        display_progress(progress, ++cnt);
 130                        ce->ce_flags &= ~CE_UPDATE;
 131                        if (o->update) {
 132                                errs |= checkout_entry(ce, &state, NULL);
 133                        }
 134                }
 135        }
 136        stop_progress(&progress);
 137        if (o->update)
 138                git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
 139        return errs != 0;
 140}
 141
 142static int verify_uptodate_sparse(struct cache_entry *ce, struct unpack_trees_options *o);
 143static int verify_absent_sparse(struct cache_entry *ce, const char *action, struct unpack_trees_options *o);
 144
 145static int will_have_skip_worktree(const struct cache_entry *ce, struct unpack_trees_options *o)
 146{
 147        const char *basename;
 148
 149        if (ce_stage(ce))
 150                return 0;
 151
 152        basename = strrchr(ce->name, '/');
 153        basename = basename ? basename+1 : ce->name;
 154        return excluded_from_list(ce->name, ce_namelen(ce), basename, NULL, o->el) <= 0;
 155}
 156
 157static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o)
 158{
 159        int was_skip_worktree = ce_skip_worktree(ce);
 160
 161        if (will_have_skip_worktree(ce, o))
 162                ce->ce_flags |= CE_SKIP_WORKTREE;
 163        else
 164                ce->ce_flags &= ~CE_SKIP_WORKTREE;
 165
 166        /*
 167         * We only care about files getting into the checkout area
 168         * If merge strategies want to remove some, go ahead, this
 169         * flag will be removed eventually in unpack_trees() if it's
 170         * outside checkout area.
 171         */
 172        if (ce->ce_flags & CE_REMOVE)
 173                return 0;
 174
 175        if (!was_skip_worktree && ce_skip_worktree(ce)) {
 176                /*
 177                 * If CE_UPDATE is set, verify_uptodate() must be called already
 178                 * also stat info may have lost after merged_entry() so calling
 179                 * verify_uptodate() again may fail
 180                 */
 181                if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
 182                        return -1;
 183                ce->ce_flags |= CE_WT_REMOVE;
 184        }
 185        if (was_skip_worktree && !ce_skip_worktree(ce)) {
 186                if (verify_absent_sparse(ce, "overwritten", o))
 187                        return -1;
 188                ce->ce_flags |= CE_UPDATE;
 189        }
 190        return 0;
 191}
 192
 193static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)
 194{
 195        int ret = o->fn(src, o);
 196        if (ret > 0)
 197                ret = 0;
 198        return ret;
 199}
 200
 201static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
 202{
 203        ce->ce_flags |= CE_UNPACKED;
 204
 205        if (o->cache_bottom < o->src_index->cache_nr &&
 206            o->src_index->cache[o->cache_bottom] == ce) {
 207                int bottom = o->cache_bottom;
 208                while (bottom < o->src_index->cache_nr &&
 209                       o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
 210                        bottom++;
 211                o->cache_bottom = bottom;
 212        }
 213}
 214
 215static void mark_all_ce_unused(struct index_state *index)
 216{
 217        int i;
 218        for (i = 0; i < index->cache_nr; i++)
 219                index->cache[i]->ce_flags &= ~CE_UNPACKED;
 220}
 221
 222static int locate_in_src_index(struct cache_entry *ce,
 223                               struct unpack_trees_options *o)
 224{
 225        struct index_state *index = o->src_index;
 226        int len = ce_namelen(ce);
 227        int pos = index_name_pos(index, ce->name, len);
 228        if (pos < 0)
 229                pos = -1 - pos;
 230        return pos;
 231}
 232
 233/*
 234 * We call unpack_index_entry() with an unmerged cache entry
 235 * only in diff-index, and it wants a single callback.  Skip
 236 * the other unmerged entry with the same name.
 237 */
 238static void mark_ce_used_same_name(struct cache_entry *ce,
 239                                   struct unpack_trees_options *o)
 240{
 241        struct index_state *index = o->src_index;
 242        int len = ce_namelen(ce);
 243        int pos;
 244
 245        for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
 246                struct cache_entry *next = index->cache[pos];
 247                if (len != ce_namelen(next) ||
 248                    memcmp(ce->name, next->name, len))
 249                        break;
 250                mark_ce_used(next, o);
 251        }
 252}
 253
 254static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
 255{
 256        const struct index_state *index = o->src_index;
 257        int pos = o->cache_bottom;
 258
 259        while (pos < index->cache_nr) {
 260                struct cache_entry *ce = index->cache[pos];
 261                if (!(ce->ce_flags & CE_UNPACKED))
 262                        return ce;
 263                pos++;
 264        }
 265        return NULL;
 266}
 267
 268static void add_same_unmerged(struct cache_entry *ce,
 269                              struct unpack_trees_options *o)
 270{
 271        struct index_state *index = o->src_index;
 272        int len = ce_namelen(ce);
 273        int pos = index_name_pos(index, ce->name, len);
 274
 275        if (0 <= pos)
 276                die("programming error in a caller of mark_ce_used_same_name");
 277        for (pos = -pos - 1; pos < index->cache_nr; pos++) {
 278                struct cache_entry *next = index->cache[pos];
 279                if (len != ce_namelen(next) ||
 280                    memcmp(ce->name, next->name, len))
 281                        break;
 282                add_entry(o, next, 0, 0);
 283                mark_ce_used(next, o);
 284        }
 285}
 286
 287static int unpack_index_entry(struct cache_entry *ce,
 288                              struct unpack_trees_options *o)
 289{
 290        struct cache_entry *src[5] = { NULL };
 291        int ret;
 292
 293        src[0] = ce;
 294
 295        mark_ce_used(ce, o);
 296        if (ce_stage(ce)) {
 297                if (o->skip_unmerged) {
 298                        add_entry(o, ce, 0, 0);
 299                        return 0;
 300                }
 301        }
 302        ret = call_unpack_fn(src, o);
 303        if (ce_stage(ce))
 304                mark_ce_used_same_name(ce, o);
 305        return ret;
 306}
 307
 308static int find_cache_pos(struct traverse_info *, const struct name_entry *);
 309
 310static void restore_cache_bottom(struct traverse_info *info, int bottom)
 311{
 312        struct unpack_trees_options *o = info->data;
 313
 314        if (o->diff_index_cached)
 315                return;
 316        o->cache_bottom = bottom;
 317}
 318
 319static int switch_cache_bottom(struct traverse_info *info)
 320{
 321        struct unpack_trees_options *o = info->data;
 322        int ret, pos;
 323
 324        if (o->diff_index_cached)
 325                return 0;
 326        ret = o->cache_bottom;
 327        pos = find_cache_pos(info->prev, &info->name);
 328
 329        if (pos < -1)
 330                o->cache_bottom = -2 - pos;
 331        else if (pos < 0)
 332                o->cache_bottom = o->src_index->cache_nr;
 333        return ret;
 334}
 335
 336static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conflicts, struct name_entry *names, struct traverse_info *info)
 337{
 338        int i, ret, bottom;
 339        struct tree_desc t[MAX_UNPACK_TREES];
 340        struct traverse_info newinfo;
 341        struct name_entry *p;
 342
 343        p = names;
 344        while (!p->mode)
 345                p++;
 346
 347        newinfo = *info;
 348        newinfo.prev = info;
 349        newinfo.name = *p;
 350        newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1;
 351        newinfo.conflicts |= df_conflicts;
 352
 353        for (i = 0; i < n; i++, dirmask >>= 1) {
 354                const unsigned char *sha1 = NULL;
 355                if (dirmask & 1)
 356                        sha1 = names[i].sha1;
 357                fill_tree_descriptor(t+i, sha1);
 358        }
 359
 360        bottom = switch_cache_bottom(&newinfo);
 361        ret = traverse_trees(n, t, &newinfo);
 362        restore_cache_bottom(&newinfo, bottom);
 363        return ret;
 364}
 365
 366/*
 367 * Compare the traverse-path to the cache entry without actually
 368 * having to generate the textual representation of the traverse
 369 * path.
 370 *
 371 * NOTE! This *only* compares up to the size of the traverse path
 372 * itself - the caller needs to do the final check for the cache
 373 * entry having more data at the end!
 374 */
 375static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
 376{
 377        int len, pathlen, ce_len;
 378        const char *ce_name;
 379
 380        if (info->prev) {
 381                int cmp = do_compare_entry(ce, info->prev, &info->name);
 382                if (cmp)
 383                        return cmp;
 384        }
 385        pathlen = info->pathlen;
 386        ce_len = ce_namelen(ce);
 387
 388        /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
 389        if (ce_len < pathlen)
 390                return -1;
 391
 392        ce_len -= pathlen;
 393        ce_name = ce->name + pathlen;
 394
 395        len = tree_entry_len(n->path, n->sha1);
 396        return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
 397}
 398
 399static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
 400{
 401        int cmp = do_compare_entry(ce, info, n);
 402        if (cmp)
 403                return cmp;
 404
 405        /*
 406         * Even if the beginning compared identically, the ce should
 407         * compare as bigger than a directory leading up to it!
 408         */
 409        return ce_namelen(ce) > traverse_path_len(info, n);
 410}
 411
 412static int ce_in_traverse_path(const struct cache_entry *ce,
 413                               const struct traverse_info *info)
 414{
 415        if (!info->prev)
 416                return 1;
 417        if (do_compare_entry(ce, info->prev, &info->name))
 418                return 0;
 419        /*
 420         * If ce (blob) is the same name as the path (which is a tree
 421         * we will be descending into), it won't be inside it.
 422         */
 423        return (info->pathlen < ce_namelen(ce));
 424}
 425
 426static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
 427{
 428        int len = traverse_path_len(info, n);
 429        struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
 430
 431        ce->ce_mode = create_ce_mode(n->mode);
 432        ce->ce_flags = create_ce_flags(len, stage);
 433        hashcpy(ce->sha1, n->sha1);
 434        make_traverse_path(ce->name, info, n);
 435
 436        return ce;
 437}
 438
 439static int unpack_nondirectories(int n, unsigned long mask,
 440                                 unsigned long dirmask,
 441                                 struct cache_entry **src,
 442                                 const struct name_entry *names,
 443                                 const struct traverse_info *info)
 444{
 445        int i;
 446        struct unpack_trees_options *o = info->data;
 447        unsigned long conflicts;
 448
 449        /* Do we have *only* directories? Nothing to do */
 450        if (mask == dirmask && !src[0])
 451                return 0;
 452
 453        conflicts = info->conflicts;
 454        if (o->merge)
 455                conflicts >>= 1;
 456        conflicts |= dirmask;
 457
 458        /*
 459         * Ok, we've filled in up to any potential index entry in src[0],
 460         * now do the rest.
 461         */
 462        for (i = 0; i < n; i++) {
 463                int stage;
 464                unsigned int bit = 1ul << i;
 465                if (conflicts & bit) {
 466                        src[i + o->merge] = o->df_conflict_entry;
 467                        continue;
 468                }
 469                if (!(mask & bit))
 470                        continue;
 471                if (!o->merge)
 472                        stage = 0;
 473                else if (i + 1 < o->head_idx)
 474                        stage = 1;
 475                else if (i + 1 > o->head_idx)
 476                        stage = 3;
 477                else
 478                        stage = 2;
 479                src[i + o->merge] = create_ce_entry(info, names + i, stage);
 480        }
 481
 482        if (o->merge)
 483                return call_unpack_fn(src, o);
 484
 485        for (i = 0; i < n; i++)
 486                if (src[i] && src[i] != o->df_conflict_entry)
 487                        add_entry(o, src[i], 0, 0);
 488        return 0;
 489}
 490
 491static int unpack_failed(struct unpack_trees_options *o, const char *message)
 492{
 493        discard_index(&o->result);
 494        if (!o->gently) {
 495                if (message)
 496                        return error("%s", message);
 497                return -1;
 498        }
 499        return -1;
 500}
 501
 502/* NEEDSWORK: give this a better name and share with tree-walk.c */
 503static int name_compare(const char *a, int a_len,
 504                        const char *b, int b_len)
 505{
 506        int len = (a_len < b_len) ? a_len : b_len;
 507        int cmp = memcmp(a, b, len);
 508        if (cmp)
 509                return cmp;
 510        return (a_len - b_len);
 511}
 512
 513/*
 514 * The tree traversal is looking at name p.  If we have a matching entry,
 515 * return it.  If name p is a directory in the index, do not return
 516 * anything, as we will want to match it when the traversal descends into
 517 * the directory.
 518 */
 519static int find_cache_pos(struct traverse_info *info,
 520                          const struct name_entry *p)
 521{
 522        int pos;
 523        struct unpack_trees_options *o = info->data;
 524        struct index_state *index = o->src_index;
 525        int pfxlen = info->pathlen;
 526        int p_len = tree_entry_len(p->path, p->sha1);
 527
 528        for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
 529                struct cache_entry *ce = index->cache[pos];
 530                const char *ce_name, *ce_slash;
 531                int cmp, ce_len;
 532
 533                if (!ce_in_traverse_path(ce, info))
 534                        continue;
 535                if (ce->ce_flags & CE_UNPACKED)
 536                        continue;
 537                ce_name = ce->name + pfxlen;
 538                ce_slash = strchr(ce_name, '/');
 539                if (ce_slash)
 540                        ce_len = ce_slash - ce_name;
 541                else
 542                        ce_len = ce_namelen(ce) - pfxlen;
 543                cmp = name_compare(p->path, p_len, ce_name, ce_len);
 544                /*
 545                 * Exact match; if we have a directory we need to
 546                 * delay returning it.
 547                 */
 548                if (!cmp)
 549                        return ce_slash ? -2 - pos : pos;
 550                if (0 < cmp)
 551                        continue; /* keep looking */
 552                /*
 553                 * ce_name sorts after p->path; could it be that we
 554                 * have files under p->path directory in the index?
 555                 * E.g.  ce_name == "t-i", and p->path == "t"; we may
 556                 * have "t/a" in the index.
 557                 */
 558                if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
 559                    ce_name[p_len] < '/')
 560                        continue; /* keep looking */
 561                break;
 562        }
 563        return -1;
 564}
 565
 566static struct cache_entry *find_cache_entry(struct traverse_info *info,
 567                                            const struct name_entry *p)
 568{
 569        int pos = find_cache_pos(info, p);
 570        struct unpack_trees_options *o = info->data;
 571
 572        if (0 <= pos)
 573                return o->src_index->cache[pos];
 574        else
 575                return NULL;
 576}
 577
 578static void debug_path(struct traverse_info *info)
 579{
 580        if (info->prev) {
 581                debug_path(info->prev);
 582                if (*info->prev->name.path)
 583                        putchar('/');
 584        }
 585        printf("%s", info->name.path);
 586}
 587
 588static void debug_name_entry(int i, struct name_entry *n)
 589{
 590        printf("ent#%d %06o %s\n", i,
 591               n->path ? n->mode : 0,
 592               n->path ? n->path : "(missing)");
 593}
 594
 595static void debug_unpack_callback(int n,
 596                                  unsigned long mask,
 597                                  unsigned long dirmask,
 598                                  struct name_entry *names,
 599                                  struct traverse_info *info)
 600{
 601        int i;
 602        printf("* unpack mask %lu, dirmask %lu, cnt %d ",
 603               mask, dirmask, n);
 604        debug_path(info);
 605        putchar('\n');
 606        for (i = 0; i < n; i++)
 607                debug_name_entry(i, names + i);
 608}
 609
 610static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
 611{
 612        struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
 613        struct unpack_trees_options *o = info->data;
 614        const struct name_entry *p = names;
 615
 616        /* Find first entry with a real name (we could use "mask" too) */
 617        while (!p->mode)
 618                p++;
 619
 620        if (o->debug_unpack)
 621                debug_unpack_callback(n, mask, dirmask, names, info);
 622
 623        /* Are we supposed to look at the index too? */
 624        if (o->merge) {
 625                while (1) {
 626                        int cmp;
 627                        struct cache_entry *ce;
 628
 629                        if (o->diff_index_cached)
 630                                ce = next_cache_entry(o);
 631                        else
 632                                ce = find_cache_entry(info, p);
 633
 634                        if (!ce)
 635                                break;
 636                        cmp = compare_entry(ce, info, p);
 637                        if (cmp < 0) {
 638                                if (unpack_index_entry(ce, o) < 0)
 639                                        return unpack_failed(o, NULL);
 640                                continue;
 641                        }
 642                        if (!cmp) {
 643                                if (ce_stage(ce)) {
 644                                        /*
 645                                         * If we skip unmerged index
 646                                         * entries, we'll skip this
 647                                         * entry *and* the tree
 648                                         * entries associated with it!
 649                                         */
 650                                        if (o->skip_unmerged) {
 651                                                add_same_unmerged(ce, o);
 652                                                return mask;
 653                                        }
 654                                }
 655                                src[0] = ce;
 656                        }
 657                        break;
 658                }
 659        }
 660
 661        if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
 662                return -1;
 663
 664        if (src[0]) {
 665                if (ce_stage(src[0]))
 666                        mark_ce_used_same_name(src[0], o);
 667                else
 668                        mark_ce_used(src[0], o);
 669        }
 670
 671        /* Now handle any directories.. */
 672        if (dirmask) {
 673                unsigned long conflicts = mask & ~dirmask;
 674                if (o->merge) {
 675                        conflicts <<= 1;
 676                        if (src[0])
 677                                conflicts |= 1;
 678                }
 679
 680                /* special case: "diff-index --cached" looking at a tree */
 681                if (o->diff_index_cached &&
 682                    n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
 683                        int matches;
 684                        matches = cache_tree_matches_traversal(o->src_index->cache_tree,
 685                                                               names, info);
 686                        /*
 687                         * Everything under the name matches; skip the
 688                         * entire hierarchy.  diff_index_cached codepath
 689                         * special cases D/F conflicts in such a way that
 690                         * it does not do any look-ahead, so this is safe.
 691                         */
 692                        if (matches) {
 693                                o->cache_bottom += matches;
 694                                return mask;
 695                        }
 696                }
 697
 698                if (traverse_trees_recursive(n, dirmask, conflicts,
 699                                             names, info) < 0)
 700                        return -1;
 701                return mask;
 702        }
 703
 704        return mask;
 705}
 706
 707/*
 708 * N-way merge "len" trees.  Returns 0 on success, -1 on failure to manipulate the
 709 * resulting index, -2 on failure to reflect the changes to the work tree.
 710 */
 711int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
 712{
 713        int i, ret;
 714        static struct cache_entry *dfc;
 715        struct exclude_list el;
 716
 717        if (len > MAX_UNPACK_TREES)
 718                die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
 719        memset(&state, 0, sizeof(state));
 720        state.base_dir = "";
 721        state.force = 1;
 722        state.quiet = 1;
 723        state.refresh_cache = 1;
 724
 725        memset(&el, 0, sizeof(el));
 726        if (!core_apply_sparse_checkout || !o->update)
 727                o->skip_sparse_checkout = 1;
 728        if (!o->skip_sparse_checkout) {
 729                if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL, &el, 0) < 0)
 730                        o->skip_sparse_checkout = 1;
 731                else
 732                        o->el = &el;
 733        }
 734
 735        memset(&o->result, 0, sizeof(o->result));
 736        o->result.initialized = 1;
 737        o->result.timestamp.sec = o->src_index->timestamp.sec;
 738        o->result.timestamp.nsec = o->src_index->timestamp.nsec;
 739        o->merge_size = len;
 740        mark_all_ce_unused(o->src_index);
 741
 742        if (!dfc)
 743                dfc = xcalloc(1, cache_entry_size(0));
 744        o->df_conflict_entry = dfc;
 745
 746        if (len) {
 747                const char *prefix = o->prefix ? o->prefix : "";
 748                struct traverse_info info;
 749
 750                setup_traverse_info(&info, prefix);
 751                info.fn = unpack_callback;
 752                info.data = o;
 753
 754                if (o->prefix) {
 755                        /*
 756                         * Unpack existing index entries that sort before the
 757                         * prefix the tree is spliced into.  Note that o->merge
 758                         * is always true in this case.
 759                         */
 760                        while (1) {
 761                                struct cache_entry *ce = next_cache_entry(o);
 762                                if (!ce)
 763                                        break;
 764                                if (ce_in_traverse_path(ce, &info))
 765                                        break;
 766                                if (unpack_index_entry(ce, o) < 0)
 767                                        goto return_failed;
 768                        }
 769                }
 770
 771                if (traverse_trees(len, t, &info) < 0)
 772                        goto return_failed;
 773        }
 774
 775        /* Any left-over entries in the index? */
 776        if (o->merge) {
 777                while (1) {
 778                        struct cache_entry *ce = next_cache_entry(o);
 779                        if (!ce)
 780                                break;
 781                        if (unpack_index_entry(ce, o) < 0)
 782                                goto return_failed;
 783                }
 784        }
 785        mark_all_ce_unused(o->src_index);
 786
 787        if (o->trivial_merges_only && o->nontrivial_merge) {
 788                ret = unpack_failed(o, "Merge requires file-level merging");
 789                goto done;
 790        }
 791
 792        if (!o->skip_sparse_checkout) {
 793                int empty_worktree = 1;
 794                for (i = 0;i < o->result.cache_nr;i++) {
 795                        struct cache_entry *ce = o->result.cache[i];
 796
 797                        if (apply_sparse_checkout(ce, o)) {
 798                                ret = -1;
 799                                goto done;
 800                        }
 801                        /*
 802                         * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
 803                         * area as a result of ce_skip_worktree() shortcuts in
 804                         * verify_absent() and verify_uptodate(). Clear them.
 805                         */
 806                        if (ce_skip_worktree(ce))
 807                                ce->ce_flags &= ~(CE_UPDATE | CE_REMOVE);
 808                        else
 809                                empty_worktree = 0;
 810
 811                }
 812                if (o->result.cache_nr && empty_worktree) {
 813                        ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
 814                        goto done;
 815                }
 816        }
 817
 818        o->src_index = NULL;
 819        ret = check_updates(o) ? (-2) : 0;
 820        if (o->dst_index)
 821                *o->dst_index = o->result;
 822
 823done:
 824        for (i = 0;i < el.nr;i++)
 825                free(el.excludes[i]);
 826        if (el.excludes)
 827                free(el.excludes);
 828
 829        return ret;
 830
 831return_failed:
 832        mark_all_ce_unused(o->src_index);
 833        ret = unpack_failed(o, NULL);
 834        goto done;
 835}
 836
 837/* Here come the merge functions */
 838
 839static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)
 840{
 841        return error(ERRORMSG(o, would_overwrite), ce->name);
 842}
 843
 844static int same(struct cache_entry *a, struct cache_entry *b)
 845{
 846        if (!!a != !!b)
 847                return 0;
 848        if (!a && !b)
 849                return 1;
 850        if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
 851                return 0;
 852        return a->ce_mode == b->ce_mode &&
 853               !hashcmp(a->sha1, b->sha1);
 854}
 855
 856
 857/*
 858 * When a CE gets turned into an unmerged entry, we
 859 * want it to be up-to-date
 860 */
 861static int verify_uptodate_1(struct cache_entry *ce,
 862                                   struct unpack_trees_options *o,
 863                                   const char *error_msg)
 864{
 865        struct stat st;
 866
 867        if (o->index_only || (!ce_skip_worktree(ce) && (o->reset || ce_uptodate(ce))))
 868                return 0;
 869
 870        if (!lstat(ce->name, &st)) {
 871                unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
 872                if (!changed)
 873                        return 0;
 874                /*
 875                 * NEEDSWORK: the current default policy is to allow
 876                 * submodule to be out of sync wrt the supermodule
 877                 * index.  This needs to be tightened later for
 878                 * submodules that are marked to be automatically
 879                 * checked out.
 880                 */
 881                if (S_ISGITLINK(ce->ce_mode))
 882                        return 0;
 883                errno = 0;
 884        }
 885        if (errno == ENOENT)
 886                return 0;
 887        return o->gently ? -1 :
 888                error(error_msg, ce->name);
 889}
 890
 891static int verify_uptodate(struct cache_entry *ce,
 892                           struct unpack_trees_options *o)
 893{
 894        if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
 895                return 0;
 896        return verify_uptodate_1(ce, o, ERRORMSG(o, not_uptodate_file));
 897}
 898
 899static int verify_uptodate_sparse(struct cache_entry *ce,
 900                                  struct unpack_trees_options *o)
 901{
 902        return verify_uptodate_1(ce, o, ERRORMSG(o, sparse_not_uptodate_file));
 903}
 904
 905static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)
 906{
 907        if (ce)
 908                cache_tree_invalidate_path(o->src_index->cache_tree, ce->name);
 909}
 910
 911/*
 912 * Check that checking out ce->sha1 in subdir ce->name is not
 913 * going to overwrite any working files.
 914 *
 915 * Currently, git does not checkout subprojects during a superproject
 916 * checkout, so it is not going to overwrite anything.
 917 */
 918static int verify_clean_submodule(struct cache_entry *ce, const char *action,
 919                                      struct unpack_trees_options *o)
 920{
 921        return 0;
 922}
 923
 924static int verify_clean_subdirectory(struct cache_entry *ce, const char *action,
 925                                      struct unpack_trees_options *o)
 926{
 927        /*
 928         * we are about to extract "ce->name"; we would not want to lose
 929         * anything in the existing directory there.
 930         */
 931        int namelen;
 932        int i;
 933        struct dir_struct d;
 934        char *pathbuf;
 935        int cnt = 0;
 936        unsigned char sha1[20];
 937
 938        if (S_ISGITLINK(ce->ce_mode) &&
 939            resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
 940                /* If we are not going to update the submodule, then
 941                 * we don't care.
 942                 */
 943                if (!hashcmp(sha1, ce->sha1))
 944                        return 0;
 945                return verify_clean_submodule(ce, action, o);
 946        }
 947
 948        /*
 949         * First let's make sure we do not have a local modification
 950         * in that directory.
 951         */
 952        namelen = strlen(ce->name);
 953        for (i = locate_in_src_index(ce, o);
 954             i < o->src_index->cache_nr;
 955             i++) {
 956                struct cache_entry *ce2 = o->src_index->cache[i];
 957                int len = ce_namelen(ce2);
 958                if (len < namelen ||
 959                    strncmp(ce->name, ce2->name, namelen) ||
 960                    ce2->name[namelen] != '/')
 961                        break;
 962                /*
 963                 * ce2->name is an entry in the subdirectory to be
 964                 * removed.
 965                 */
 966                if (!ce_stage(ce2)) {
 967                        if (verify_uptodate(ce2, o))
 968                                return -1;
 969                        add_entry(o, ce2, CE_REMOVE, 0);
 970                        mark_ce_used(ce2, o);
 971                }
 972                cnt++;
 973        }
 974
 975        /*
 976         * Then we need to make sure that we do not lose a locally
 977         * present file that is not ignored.
 978         */
 979        pathbuf = xmalloc(namelen + 2);
 980        memcpy(pathbuf, ce->name, namelen);
 981        strcpy(pathbuf+namelen, "/");
 982
 983        memset(&d, 0, sizeof(d));
 984        if (o->dir)
 985                d.exclude_per_dir = o->dir->exclude_per_dir;
 986        i = read_directory(&d, pathbuf, namelen+1, NULL);
 987        if (i)
 988                return o->gently ? -1 :
 989                        error(ERRORMSG(o, not_uptodate_dir), ce->name);
 990        free(pathbuf);
 991        return cnt;
 992}
 993
 994/*
 995 * This gets called when there was no index entry for the tree entry 'dst',
 996 * but we found a file in the working tree that 'lstat()' said was fine,
 997 * and we're on a case-insensitive filesystem.
 998 *
 999 * See if we can find a case-insensitive match in the index that also
1000 * matches the stat information, and assume it's that other file!
1001 */
1002static int icase_exists(struct unpack_trees_options *o, struct cache_entry *dst, struct stat *st)
1003{
1004        struct cache_entry *src;
1005
1006        src = index_name_exists(o->src_index, dst->name, ce_namelen(dst), 1);
1007        return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
1008}
1009
1010/*
1011 * We do not want to remove or overwrite a working tree file that
1012 * is not tracked, unless it is ignored.
1013 */
1014static int verify_absent_1(struct cache_entry *ce, const char *action,
1015                                 struct unpack_trees_options *o,
1016                                 const char *error_msg)
1017{
1018        struct stat st;
1019
1020        if (o->index_only || o->reset || !o->update)
1021                return 0;
1022
1023        if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
1024                return 0;
1025
1026        if (!lstat(ce->name, &st)) {
1027                int dtype = ce_to_dtype(ce);
1028                struct cache_entry *result;
1029
1030                /*
1031                 * It may be that the 'lstat()' succeeded even though
1032                 * target 'ce' was absent, because there is an old
1033                 * entry that is different only in case..
1034                 *
1035                 * Ignore that lstat() if it matches.
1036                 */
1037                if (ignore_case && icase_exists(o, ce, &st))
1038                        return 0;
1039
1040                if (o->dir && excluded(o->dir, ce->name, &dtype))
1041                        /*
1042                         * ce->name is explicitly excluded, so it is Ok to
1043                         * overwrite it.
1044                         */
1045                        return 0;
1046                if (S_ISDIR(st.st_mode)) {
1047                        /*
1048                         * We are checking out path "foo" and
1049                         * found "foo/." in the working tree.
1050                         * This is tricky -- if we have modified
1051                         * files that are in "foo/" we would lose
1052                         * them.
1053                         */
1054                        if (verify_clean_subdirectory(ce, action, o) < 0)
1055                                return -1;
1056                        return 0;
1057                }
1058
1059                /*
1060                 * The previous round may already have decided to
1061                 * delete this path, which is in a subdirectory that
1062                 * is being replaced with a blob.
1063                 */
1064                result = index_name_exists(&o->result, ce->name, ce_namelen(ce), 0);
1065                if (result) {
1066                        if (result->ce_flags & CE_REMOVE)
1067                                return 0;
1068                }
1069
1070                return o->gently ? -1 :
1071                        error(ERRORMSG(o, would_lose_untracked), ce->name, action);
1072        }
1073        return 0;
1074}
1075static int verify_absent(struct cache_entry *ce, const char *action,
1076                         struct unpack_trees_options *o)
1077{
1078        if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
1079                return 0;
1080        return verify_absent_1(ce, action, o, ERRORMSG(o, would_lose_untracked));
1081}
1082
1083static int verify_absent_sparse(struct cache_entry *ce, const char *action,
1084                         struct unpack_trees_options *o)
1085{
1086        return verify_absent_1(ce, action, o, ERRORMSG(o, would_lose_orphaned));
1087}
1088
1089static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
1090                struct unpack_trees_options *o)
1091{
1092        int update = CE_UPDATE;
1093
1094        if (!old) {
1095                if (verify_absent(merge, "overwritten", o))
1096                        return -1;
1097                invalidate_ce_path(merge, o);
1098        } else if (!(old->ce_flags & CE_CONFLICTED)) {
1099                /*
1100                 * See if we can re-use the old CE directly?
1101                 * That way we get the uptodate stat info.
1102                 *
1103                 * This also removes the UPDATE flag on a match; otherwise
1104                 * we will end up overwriting local changes in the work tree.
1105                 */
1106                if (same(old, merge)) {
1107                        copy_cache_entry(merge, old);
1108                        update = 0;
1109                } else {
1110                        if (verify_uptodate(old, o))
1111                                return -1;
1112                        if (ce_skip_worktree(old))
1113                                update |= CE_SKIP_WORKTREE;
1114                        invalidate_ce_path(old, o);
1115                }
1116        } else {
1117                /*
1118                 * Previously unmerged entry left as an existence
1119                 * marker by read_index_unmerged();
1120                 */
1121                invalidate_ce_path(old, o);
1122        }
1123
1124        add_entry(o, merge, update, CE_STAGEMASK);
1125        return 1;
1126}
1127
1128static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,
1129                struct unpack_trees_options *o)
1130{
1131        /* Did it exist in the index? */
1132        if (!old) {
1133                if (verify_absent(ce, "removed", o))
1134                        return -1;
1135                return 0;
1136        }
1137        if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
1138                return -1;
1139        add_entry(o, ce, CE_REMOVE, 0);
1140        invalidate_ce_path(ce, o);
1141        return 1;
1142}
1143
1144static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)
1145{
1146        add_entry(o, ce, 0, 0);
1147        return 1;
1148}
1149
1150#if DBRT_DEBUG
1151static void show_stage_entry(FILE *o,
1152                             const char *label, const struct cache_entry *ce)
1153{
1154        if (!ce)
1155                fprintf(o, "%s (missing)\n", label);
1156        else
1157                fprintf(o, "%s%06o %s %d\t%s\n",
1158                        label,
1159                        ce->ce_mode,
1160                        sha1_to_hex(ce->sha1),
1161                        ce_stage(ce),
1162                        ce->name);
1163}
1164#endif
1165
1166int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
1167{
1168        struct cache_entry *index;
1169        struct cache_entry *head;
1170        struct cache_entry *remote = stages[o->head_idx + 1];
1171        int count;
1172        int head_match = 0;
1173        int remote_match = 0;
1174
1175        int df_conflict_head = 0;
1176        int df_conflict_remote = 0;
1177
1178        int any_anc_missing = 0;
1179        int no_anc_exists = 1;
1180        int i;
1181
1182        for (i = 1; i < o->head_idx; i++) {
1183                if (!stages[i] || stages[i] == o->df_conflict_entry)
1184                        any_anc_missing = 1;
1185                else
1186                        no_anc_exists = 0;
1187        }
1188
1189        index = stages[0];
1190        head = stages[o->head_idx];
1191
1192        if (head == o->df_conflict_entry) {
1193                df_conflict_head = 1;
1194                head = NULL;
1195        }
1196
1197        if (remote == o->df_conflict_entry) {
1198                df_conflict_remote = 1;
1199                remote = NULL;
1200        }
1201
1202        /*
1203         * First, if there's a #16 situation, note that to prevent #13
1204         * and #14.
1205         */
1206        if (!same(remote, head)) {
1207                for (i = 1; i < o->head_idx; i++) {
1208                        if (same(stages[i], head)) {
1209                                head_match = i;
1210                        }
1211                        if (same(stages[i], remote)) {
1212                                remote_match = i;
1213                        }
1214                }
1215        }
1216
1217        /*
1218         * We start with cases where the index is allowed to match
1219         * something other than the head: #14(ALT) and #2ALT, where it
1220         * is permitted to match the result instead.
1221         */
1222        /* #14, #14ALT, #2ALT */
1223        if (remote && !df_conflict_head && head_match && !remote_match) {
1224                if (index && !same(index, remote) && !same(index, head))
1225                        return o->gently ? -1 : reject_merge(index, o);
1226                return merged_entry(remote, index, o);
1227        }
1228        /*
1229         * If we have an entry in the index cache, then we want to
1230         * make sure that it matches head.
1231         */
1232        if (index && !same(index, head))
1233                return o->gently ? -1 : reject_merge(index, o);
1234
1235        if (head) {
1236                /* #5ALT, #15 */
1237                if (same(head, remote))
1238                        return merged_entry(head, index, o);
1239                /* #13, #3ALT */
1240                if (!df_conflict_remote && remote_match && !head_match)
1241                        return merged_entry(head, index, o);
1242        }
1243
1244        /* #1 */
1245        if (!head && !remote && any_anc_missing)
1246                return 0;
1247
1248        /*
1249         * Under the "aggressive" rule, we resolve mostly trivial
1250         * cases that we historically had git-merge-one-file resolve.
1251         */
1252        if (o->aggressive) {
1253                int head_deleted = !head;
1254                int remote_deleted = !remote;
1255                struct cache_entry *ce = NULL;
1256
1257                if (index)
1258                        ce = index;
1259                else if (head)
1260                        ce = head;
1261                else if (remote)
1262                        ce = remote;
1263                else {
1264                        for (i = 1; i < o->head_idx; i++) {
1265                                if (stages[i] && stages[i] != o->df_conflict_entry) {
1266                                        ce = stages[i];
1267                                        break;
1268                                }
1269                        }
1270                }
1271
1272                /*
1273                 * Deleted in both.
1274                 * Deleted in one and unchanged in the other.
1275                 */
1276                if ((head_deleted && remote_deleted) ||
1277                    (head_deleted && remote && remote_match) ||
1278                    (remote_deleted && head && head_match)) {
1279                        if (index)
1280                                return deleted_entry(index, index, o);
1281                        if (ce && !head_deleted) {
1282                                if (verify_absent(ce, "removed", o))
1283                                        return -1;
1284                        }
1285                        return 0;
1286                }
1287                /*
1288                 * Added in both, identically.
1289                 */
1290                if (no_anc_exists && head && remote && same(head, remote))
1291                        return merged_entry(head, index, o);
1292
1293        }
1294
1295        /* Below are "no merge" cases, which require that the index be
1296         * up-to-date to avoid the files getting overwritten with
1297         * conflict resolution files.
1298         */
1299        if (index) {
1300                if (verify_uptodate(index, o))
1301                        return -1;
1302        }
1303
1304        o->nontrivial_merge = 1;
1305
1306        /* #2, #3, #4, #6, #7, #9, #10, #11. */
1307        count = 0;
1308        if (!head_match || !remote_match) {
1309                for (i = 1; i < o->head_idx; i++) {
1310                        if (stages[i] && stages[i] != o->df_conflict_entry) {
1311                                keep_entry(stages[i], o);
1312                                count++;
1313                                break;
1314                        }
1315                }
1316        }
1317#if DBRT_DEBUG
1318        else {
1319                fprintf(stderr, "read-tree: warning #16 detected\n");
1320                show_stage_entry(stderr, "head   ", stages[head_match]);
1321                show_stage_entry(stderr, "remote ", stages[remote_match]);
1322        }
1323#endif
1324        if (head) { count += keep_entry(head, o); }
1325        if (remote) { count += keep_entry(remote, o); }
1326        return count;
1327}
1328
1329/*
1330 * Two-way merge.
1331 *
1332 * The rule is to "carry forward" what is in the index without losing
1333 * information across a "fast-forward", favoring a successful merge
1334 * over a merge failure when it makes sense.  For details of the
1335 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1336 *
1337 */
1338int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1339{
1340        struct cache_entry *current = src[0];
1341        struct cache_entry *oldtree = src[1];
1342        struct cache_entry *newtree = src[2];
1343
1344        if (o->merge_size != 2)
1345                return error("Cannot do a twoway merge of %d trees",
1346                             o->merge_size);
1347
1348        if (oldtree == o->df_conflict_entry)
1349                oldtree = NULL;
1350        if (newtree == o->df_conflict_entry)
1351                newtree = NULL;
1352
1353        if (current) {
1354                if ((!oldtree && !newtree) || /* 4 and 5 */
1355                    (!oldtree && newtree &&
1356                     same(current, newtree)) || /* 6 and 7 */
1357                    (oldtree && newtree &&
1358                     same(oldtree, newtree)) || /* 14 and 15 */
1359                    (oldtree && newtree &&
1360                     !same(oldtree, newtree) && /* 18 and 19 */
1361                     same(current, newtree))) {
1362                        return keep_entry(current, o);
1363                }
1364                else if (oldtree && !newtree && same(current, oldtree)) {
1365                        /* 10 or 11 */
1366                        return deleted_entry(oldtree, current, o);
1367                }
1368                else if (oldtree && newtree &&
1369                         same(current, oldtree) && !same(current, newtree)) {
1370                        /* 20 or 21 */
1371                        return merged_entry(newtree, current, o);
1372                }
1373                else {
1374                        /* all other failures */
1375                        if (oldtree)
1376                                return o->gently ? -1 : reject_merge(oldtree, o);
1377                        if (current)
1378                                return o->gently ? -1 : reject_merge(current, o);
1379                        if (newtree)
1380                                return o->gently ? -1 : reject_merge(newtree, o);
1381                        return -1;
1382                }
1383        }
1384        else if (newtree) {
1385                if (oldtree && !o->initial_checkout) {
1386                        /*
1387                         * deletion of the path was staged;
1388                         */
1389                        if (same(oldtree, newtree))
1390                                return 1;
1391                        return reject_merge(oldtree, o);
1392                }
1393                return merged_entry(newtree, current, o);
1394        }
1395        return deleted_entry(oldtree, current, o);
1396}
1397
1398/*
1399 * Bind merge.
1400 *
1401 * Keep the index entries at stage0, collapse stage1 but make sure
1402 * stage0 does not have anything there.
1403 */
1404int bind_merge(struct cache_entry **src,
1405                struct unpack_trees_options *o)
1406{
1407        struct cache_entry *old = src[0];
1408        struct cache_entry *a = src[1];
1409
1410        if (o->merge_size != 1)
1411                return error("Cannot do a bind merge of %d trees\n",
1412                             o->merge_size);
1413        if (a && old)
1414                return o->gently ? -1 :
1415                        error(ERRORMSG(o, bind_overlap), a->name, old->name);
1416        if (!a)
1417                return keep_entry(old, o);
1418        else
1419                return merged_entry(a, NULL, o);
1420}
1421
1422/*
1423 * One-way merge.
1424 *
1425 * The rule is:
1426 * - take the stat information from stage0, take the data from stage1
1427 */
1428int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1429{
1430        struct cache_entry *old = src[0];
1431        struct cache_entry *a = src[1];
1432
1433        if (o->merge_size != 1)
1434                return error("Cannot do a oneway merge of %d trees",
1435                             o->merge_size);
1436
1437        if (!a || a == o->df_conflict_entry)
1438                return deleted_entry(old, old, o);
1439
1440        if (old && same(old, a)) {
1441                int update = 0;
1442                if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
1443                        struct stat st;
1444                        if (lstat(old->name, &st) ||
1445                            ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
1446                                update |= CE_UPDATE;
1447                }
1448                add_entry(o, old, update, 0);
1449                return 0;
1450        }
1451        return merged_entry(a, old, o);
1452}