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