unpack-trees.con commit submodule: remove gitmodules_config (557a599)
   1#define NO_THE_INDEX_COMPATIBILITY_MACROS
   2#include "cache.h"
   3#include "repository.h"
   4#include "config.h"
   5#include "dir.h"
   6#include "tree.h"
   7#include "tree-walk.h"
   8#include "cache-tree.h"
   9#include "unpack-trees.h"
  10#include "progress.h"
  11#include "refs.h"
  12#include "attr.h"
  13#include "split-index.h"
  14#include "dir.h"
  15#include "submodule.h"
  16#include "submodule-config.h"
  17
  18/*
  19 * Error messages expected by scripts out of plumbing commands such as
  20 * read-tree.  Non-scripted Porcelain is not required to use these messages
  21 * and in fact are encouraged to reword them to better suit their particular
  22 * situation better.  See how "git checkout" and "git merge" replaces
  23 * them using setup_unpack_trees_porcelain(), for example.
  24 */
  25static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
  26        /* ERROR_WOULD_OVERWRITE */
  27        "Entry '%s' would be overwritten by merge. Cannot merge.",
  28
  29        /* ERROR_NOT_UPTODATE_FILE */
  30        "Entry '%s' not uptodate. Cannot merge.",
  31
  32        /* ERROR_NOT_UPTODATE_DIR */
  33        "Updating '%s' would lose untracked files in it",
  34
  35        /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
  36        "Untracked working tree file '%s' would be overwritten by merge.",
  37
  38        /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
  39        "Untracked working tree file '%s' would be removed by merge.",
  40
  41        /* ERROR_BIND_OVERLAP */
  42        "Entry '%s' overlaps with '%s'.  Cannot bind.",
  43
  44        /* ERROR_SPARSE_NOT_UPTODATE_FILE */
  45        "Entry '%s' not uptodate. Cannot update sparse checkout.",
  46
  47        /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
  48        "Working tree file '%s' would be overwritten by sparse checkout update.",
  49
  50        /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
  51        "Working tree file '%s' would be removed by sparse checkout update.",
  52
  53        /* ERROR_WOULD_LOSE_SUBMODULE */
  54        "Submodule '%s' cannot checkout new HEAD.",
  55};
  56
  57#define ERRORMSG(o,type) \
  58        ( ((o) && (o)->msgs[(type)]) \
  59          ? ((o)->msgs[(type)])      \
  60          : (unpack_plumbing_errors[(type)]) )
  61
  62static const char *super_prefixed(const char *path)
  63{
  64        /*
  65         * It is necessary and sufficient to have two static buffers
  66         * here, as the return value of this function is fed to
  67         * error() using the unpack_*_errors[] templates we see above.
  68         */
  69        static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT};
  70        static int super_prefix_len = -1;
  71        static unsigned idx = ARRAY_SIZE(buf) - 1;
  72
  73        if (super_prefix_len < 0) {
  74                const char *super_prefix = get_super_prefix();
  75                if (!super_prefix) {
  76                        super_prefix_len = 0;
  77                } else {
  78                        int i;
  79                        for (i = 0; i < ARRAY_SIZE(buf); i++)
  80                                strbuf_addstr(&buf[i], super_prefix);
  81                        super_prefix_len = buf[0].len;
  82                }
  83        }
  84
  85        if (!super_prefix_len)
  86                return path;
  87
  88        if (++idx >= ARRAY_SIZE(buf))
  89                idx = 0;
  90
  91        strbuf_setlen(&buf[idx], super_prefix_len);
  92        strbuf_addstr(&buf[idx], path);
  93
  94        return buf[idx].buf;
  95}
  96
  97void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
  98                                  const char *cmd)
  99{
 100        int i;
 101        const char **msgs = opts->msgs;
 102        const char *msg;
 103
 104        if (!strcmp(cmd, "checkout"))
 105                msg = advice_commit_before_merge
 106                      ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
 107                          "Please commit your changes or stash them before you switch branches.")
 108                      : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
 109        else if (!strcmp(cmd, "merge"))
 110                msg = advice_commit_before_merge
 111                      ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
 112                          "Please commit your changes or stash them before you merge.")
 113                      : _("Your local changes to the following files would be overwritten by merge:\n%%s");
 114        else
 115                msg = advice_commit_before_merge
 116                      ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
 117                          "Please commit your changes or stash them before you %s.")
 118                      : _("Your local changes to the following files would be overwritten by %s:\n%%s");
 119        msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
 120                xstrfmt(msg, cmd, cmd);
 121
 122        msgs[ERROR_NOT_UPTODATE_DIR] =
 123                _("Updating the following directories would lose untracked files in them:\n%s");
 124
 125        if (!strcmp(cmd, "checkout"))
 126                msg = advice_commit_before_merge
 127                      ? _("The following untracked working tree files would be removed by checkout:\n%%s"
 128                          "Please move or remove them before you switch branches.")
 129                      : _("The following untracked working tree files would be removed by checkout:\n%%s");
 130        else if (!strcmp(cmd, "merge"))
 131                msg = advice_commit_before_merge
 132                      ? _("The following untracked working tree files would be removed by merge:\n%%s"
 133                          "Please move or remove them before you merge.")
 134                      : _("The following untracked working tree files would be removed by merge:\n%%s");
 135        else
 136                msg = advice_commit_before_merge
 137                      ? _("The following untracked working tree files would be removed by %s:\n%%s"
 138                          "Please move or remove them before you %s.")
 139                      : _("The following untracked working tree files would be removed by %s:\n%%s");
 140        msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
 141
 142        if (!strcmp(cmd, "checkout"))
 143                msg = advice_commit_before_merge
 144                      ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
 145                          "Please move or remove them before you switch branches.")
 146                      : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
 147        else if (!strcmp(cmd, "merge"))
 148                msg = advice_commit_before_merge
 149                      ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
 150                          "Please move or remove them before you merge.")
 151                      : _("The following untracked working tree files would be overwritten by merge:\n%%s");
 152        else
 153                msg = advice_commit_before_merge
 154                      ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
 155                          "Please move or remove them before you %s.")
 156                      : _("The following untracked working tree files would be overwritten by %s:\n%%s");
 157        msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
 158
 159        /*
 160         * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
 161         * cannot easily display it as a list.
 162         */
 163        msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'.  Cannot bind.");
 164
 165        msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
 166                _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
 167        msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
 168                _("The following working tree files would be overwritten by sparse checkout update:\n%s");
 169        msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
 170                _("The following working tree files would be removed by sparse checkout update:\n%s");
 171        msgs[ERROR_WOULD_LOSE_SUBMODULE] =
 172                _("Cannot update submodule:\n%s");
 173
 174        opts->show_all_errors = 1;
 175        /* rejected paths may not have a static buffer */
 176        for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++)
 177                opts->unpack_rejects[i].strdup_strings = 1;
 178}
 179
 180static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
 181                         unsigned int set, unsigned int clear)
 182{
 183        clear |= CE_HASHED;
 184
 185        if (set & CE_REMOVE)
 186                set |= CE_WT_REMOVE;
 187
 188        ce->ce_flags = (ce->ce_flags & ~clear) | set;
 189        return add_index_entry(&o->result, ce,
 190                               ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
 191}
 192
 193static struct cache_entry *dup_entry(const struct cache_entry *ce)
 194{
 195        unsigned int size = ce_size(ce);
 196        struct cache_entry *new = xmalloc(size);
 197
 198        memcpy(new, ce, size);
 199        return new;
 200}
 201
 202static void add_entry(struct unpack_trees_options *o,
 203                      const struct cache_entry *ce,
 204                      unsigned int set, unsigned int clear)
 205{
 206        do_add_entry(o, dup_entry(ce), set, clear);
 207}
 208
 209/*
 210 * add error messages on path <path>
 211 * corresponding to the type <e> with the message <msg>
 212 * indicating if it should be display in porcelain or not
 213 */
 214static int add_rejected_path(struct unpack_trees_options *o,
 215                             enum unpack_trees_error_types e,
 216                             const char *path)
 217{
 218        if (!o->show_all_errors)
 219                return error(ERRORMSG(o, e), super_prefixed(path));
 220
 221        /*
 222         * Otherwise, insert in a list for future display by
 223         * display_error_msgs()
 224         */
 225        string_list_append(&o->unpack_rejects[e], path);
 226        return -1;
 227}
 228
 229/*
 230 * display all the error messages stored in a nice way
 231 */
 232static void display_error_msgs(struct unpack_trees_options *o)
 233{
 234        int e, i;
 235        int something_displayed = 0;
 236        for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
 237                struct string_list *rejects = &o->unpack_rejects[e];
 238                if (rejects->nr > 0) {
 239                        struct strbuf path = STRBUF_INIT;
 240                        something_displayed = 1;
 241                        for (i = 0; i < rejects->nr; i++)
 242                                strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
 243                        error(ERRORMSG(o, e), super_prefixed(path.buf));
 244                        strbuf_release(&path);
 245                }
 246                string_list_clear(rejects, 0);
 247        }
 248        if (something_displayed)
 249                fprintf(stderr, _("Aborting\n"));
 250}
 251
 252static int check_submodule_move_head(const struct cache_entry *ce,
 253                                     const char *old_id,
 254                                     const char *new_id,
 255                                     struct unpack_trees_options *o)
 256{
 257        unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN;
 258        const struct submodule *sub = submodule_from_ce(ce);
 259
 260        if (!sub)
 261                return 0;
 262
 263        if (o->reset)
 264                flags |= SUBMODULE_MOVE_HEAD_FORCE;
 265
 266        if (submodule_move_head(ce->name, old_id, new_id, flags))
 267                return o->gently ? -1 :
 268                                   add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
 269        return 0;
 270}
 271
 272/*
 273 * Preform the loading of the repository's gitmodules file.  This function is
 274 * used by 'check_update()' to perform loading of the gitmodules file in two
 275 * differnt situations:
 276 * (1) before removing entries from the working tree if the gitmodules file has
 277 *     been marked for removal.  This situation is specified by 'state' == NULL.
 278 * (2) before checking out entries to the working tree if the gitmodules file
 279 *     has been marked for update.  This situation is specified by 'state' != NULL.
 280 */
 281static void load_gitmodules_file(struct index_state *index,
 282                                 struct checkout *state)
 283{
 284        int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE));
 285
 286        if (pos >= 0) {
 287                struct cache_entry *ce = index->cache[pos];
 288                if (!state && ce->ce_flags & CE_WT_REMOVE) {
 289                        repo_read_gitmodules(the_repository);
 290                } else if (state && (ce->ce_flags & CE_UPDATE)) {
 291                        submodule_free();
 292                        checkout_entry(ce, state, NULL);
 293                        repo_read_gitmodules(the_repository);
 294                }
 295        }
 296}
 297
 298/*
 299 * Unlink the last component and schedule the leading directories for
 300 * removal, such that empty directories get removed.
 301 */
 302static void unlink_entry(const struct cache_entry *ce)
 303{
 304        const struct submodule *sub = submodule_from_ce(ce);
 305        if (sub) {
 306                /* state.force is set at the caller. */
 307                submodule_move_head(ce->name, "HEAD", NULL,
 308                                    SUBMODULE_MOVE_HEAD_FORCE);
 309        }
 310        if (!check_leading_path(ce->name, ce_namelen(ce)))
 311                return;
 312        if (remove_or_warn(ce->ce_mode, ce->name))
 313                return;
 314        schedule_dir_for_removal(ce->name, ce_namelen(ce));
 315}
 316
 317static struct progress *get_progress(struct unpack_trees_options *o)
 318{
 319        unsigned cnt = 0, total = 0;
 320        struct index_state *index = &o->result;
 321
 322        if (!o->update || !o->verbose_update)
 323                return NULL;
 324
 325        for (; cnt < index->cache_nr; cnt++) {
 326                const struct cache_entry *ce = index->cache[cnt];
 327                if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
 328                        total++;
 329        }
 330
 331        return start_progress_delay(_("Checking out files"),
 332                                    total, 50, 1);
 333}
 334
 335static int check_updates(struct unpack_trees_options *o)
 336{
 337        unsigned cnt = 0;
 338        int errs = 0;
 339        struct progress *progress = NULL;
 340        struct index_state *index = &o->result;
 341        struct checkout state = CHECKOUT_INIT;
 342        int i;
 343
 344        state.force = 1;
 345        state.quiet = 1;
 346        state.refresh_cache = 1;
 347        state.istate = index;
 348
 349        progress = get_progress(o);
 350
 351        if (o->update)
 352                git_attr_set_direction(GIT_ATTR_CHECKOUT, index);
 353
 354        if (should_update_submodules() && o->update && !o->dry_run)
 355                load_gitmodules_file(index, NULL);
 356
 357        for (i = 0; i < index->cache_nr; i++) {
 358                const struct cache_entry *ce = index->cache[i];
 359
 360                if (ce->ce_flags & CE_WT_REMOVE) {
 361                        display_progress(progress, ++cnt);
 362                        if (o->update && !o->dry_run)
 363                                unlink_entry(ce);
 364                }
 365        }
 366        remove_marked_cache_entries(index);
 367        remove_scheduled_dirs();
 368
 369        if (should_update_submodules() && o->update && !o->dry_run)
 370                load_gitmodules_file(index, &state);
 371
 372        for (i = 0; i < index->cache_nr; i++) {
 373                struct cache_entry *ce = index->cache[i];
 374
 375                if (ce->ce_flags & CE_UPDATE) {
 376                        if (ce->ce_flags & CE_WT_REMOVE)
 377                                die("BUG: both update and delete flags are set on %s",
 378                                    ce->name);
 379                        display_progress(progress, ++cnt);
 380                        ce->ce_flags &= ~CE_UPDATE;
 381                        if (o->update && !o->dry_run) {
 382                                errs |= checkout_entry(ce, &state, NULL);
 383                        }
 384                }
 385        }
 386        stop_progress(&progress);
 387        if (o->update)
 388                git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
 389        return errs != 0;
 390}
 391
 392static int verify_uptodate_sparse(const struct cache_entry *ce,
 393                                  struct unpack_trees_options *o);
 394static int verify_absent_sparse(const struct cache_entry *ce,
 395                                enum unpack_trees_error_types,
 396                                struct unpack_trees_options *o);
 397
 398static int apply_sparse_checkout(struct index_state *istate,
 399                                 struct cache_entry *ce,
 400                                 struct unpack_trees_options *o)
 401{
 402        int was_skip_worktree = ce_skip_worktree(ce);
 403
 404        if (ce->ce_flags & CE_NEW_SKIP_WORKTREE)
 405                ce->ce_flags |= CE_SKIP_WORKTREE;
 406        else
 407                ce->ce_flags &= ~CE_SKIP_WORKTREE;
 408        if (was_skip_worktree != ce_skip_worktree(ce)) {
 409                ce->ce_flags |= CE_UPDATE_IN_BASE;
 410                istate->cache_changed |= CE_ENTRY_CHANGED;
 411        }
 412
 413        /*
 414         * if (!was_skip_worktree && !ce_skip_worktree()) {
 415         *      This is perfectly normal. Move on;
 416         * }
 417         */
 418
 419        /*
 420         * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
 421         * area as a result of ce_skip_worktree() shortcuts in
 422         * verify_absent() and verify_uptodate().
 423         * Make sure they don't modify worktree if they are already
 424         * outside checkout area
 425         */
 426        if (was_skip_worktree && ce_skip_worktree(ce)) {
 427                ce->ce_flags &= ~CE_UPDATE;
 428
 429                /*
 430                 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
 431                 * on to get that file removed from both index and worktree.
 432                 * If that file is already outside worktree area, don't
 433                 * bother remove it.
 434                 */
 435                if (ce->ce_flags & CE_REMOVE)
 436                        ce->ce_flags &= ~CE_WT_REMOVE;
 437        }
 438
 439        if (!was_skip_worktree && ce_skip_worktree(ce)) {
 440                /*
 441                 * If CE_UPDATE is set, verify_uptodate() must be called already
 442                 * also stat info may have lost after merged_entry() so calling
 443                 * verify_uptodate() again may fail
 444                 */
 445                if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
 446                        return -1;
 447                ce->ce_flags |= CE_WT_REMOVE;
 448                ce->ce_flags &= ~CE_UPDATE;
 449        }
 450        if (was_skip_worktree && !ce_skip_worktree(ce)) {
 451                if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
 452                        return -1;
 453                ce->ce_flags |= CE_UPDATE;
 454        }
 455        return 0;
 456}
 457
 458static inline int call_unpack_fn(const struct cache_entry * const *src,
 459                                 struct unpack_trees_options *o)
 460{
 461        int ret = o->fn(src, o);
 462        if (ret > 0)
 463                ret = 0;
 464        return ret;
 465}
 466
 467static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
 468{
 469        ce->ce_flags |= CE_UNPACKED;
 470
 471        if (o->cache_bottom < o->src_index->cache_nr &&
 472            o->src_index->cache[o->cache_bottom] == ce) {
 473                int bottom = o->cache_bottom;
 474                while (bottom < o->src_index->cache_nr &&
 475                       o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
 476                        bottom++;
 477                o->cache_bottom = bottom;
 478        }
 479}
 480
 481static void mark_all_ce_unused(struct index_state *index)
 482{
 483        int i;
 484        for (i = 0; i < index->cache_nr; i++)
 485                index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE);
 486}
 487
 488static int locate_in_src_index(const struct cache_entry *ce,
 489                               struct unpack_trees_options *o)
 490{
 491        struct index_state *index = o->src_index;
 492        int len = ce_namelen(ce);
 493        int pos = index_name_pos(index, ce->name, len);
 494        if (pos < 0)
 495                pos = -1 - pos;
 496        return pos;
 497}
 498
 499/*
 500 * We call unpack_index_entry() with an unmerged cache entry
 501 * only in diff-index, and it wants a single callback.  Skip
 502 * the other unmerged entry with the same name.
 503 */
 504static void mark_ce_used_same_name(struct cache_entry *ce,
 505                                   struct unpack_trees_options *o)
 506{
 507        struct index_state *index = o->src_index;
 508        int len = ce_namelen(ce);
 509        int pos;
 510
 511        for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
 512                struct cache_entry *next = index->cache[pos];
 513                if (len != ce_namelen(next) ||
 514                    memcmp(ce->name, next->name, len))
 515                        break;
 516                mark_ce_used(next, o);
 517        }
 518}
 519
 520static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
 521{
 522        const struct index_state *index = o->src_index;
 523        int pos = o->cache_bottom;
 524
 525        while (pos < index->cache_nr) {
 526                struct cache_entry *ce = index->cache[pos];
 527                if (!(ce->ce_flags & CE_UNPACKED))
 528                        return ce;
 529                pos++;
 530        }
 531        return NULL;
 532}
 533
 534static void add_same_unmerged(const struct cache_entry *ce,
 535                              struct unpack_trees_options *o)
 536{
 537        struct index_state *index = o->src_index;
 538        int len = ce_namelen(ce);
 539        int pos = index_name_pos(index, ce->name, len);
 540
 541        if (0 <= pos)
 542                die("programming error in a caller of mark_ce_used_same_name");
 543        for (pos = -pos - 1; pos < index->cache_nr; pos++) {
 544                struct cache_entry *next = index->cache[pos];
 545                if (len != ce_namelen(next) ||
 546                    memcmp(ce->name, next->name, len))
 547                        break;
 548                add_entry(o, next, 0, 0);
 549                mark_ce_used(next, o);
 550        }
 551}
 552
 553static int unpack_index_entry(struct cache_entry *ce,
 554                              struct unpack_trees_options *o)
 555{
 556        const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
 557        int ret;
 558
 559        src[0] = ce;
 560
 561        mark_ce_used(ce, o);
 562        if (ce_stage(ce)) {
 563                if (o->skip_unmerged) {
 564                        add_entry(o, ce, 0, 0);
 565                        return 0;
 566                }
 567        }
 568        ret = call_unpack_fn(src, o);
 569        if (ce_stage(ce))
 570                mark_ce_used_same_name(ce, o);
 571        return ret;
 572}
 573
 574static int find_cache_pos(struct traverse_info *, const struct name_entry *);
 575
 576static void restore_cache_bottom(struct traverse_info *info, int bottom)
 577{
 578        struct unpack_trees_options *o = info->data;
 579
 580        if (o->diff_index_cached)
 581                return;
 582        o->cache_bottom = bottom;
 583}
 584
 585static int switch_cache_bottom(struct traverse_info *info)
 586{
 587        struct unpack_trees_options *o = info->data;
 588        int ret, pos;
 589
 590        if (o->diff_index_cached)
 591                return 0;
 592        ret = o->cache_bottom;
 593        pos = find_cache_pos(info->prev, &info->name);
 594
 595        if (pos < -1)
 596                o->cache_bottom = -2 - pos;
 597        else if (pos < 0)
 598                o->cache_bottom = o->src_index->cache_nr;
 599        return ret;
 600}
 601
 602static inline int are_same_oid(struct name_entry *name_j, struct name_entry *name_k)
 603{
 604        return name_j->oid && name_k->oid && !oidcmp(name_j->oid, name_k->oid);
 605}
 606
 607static int traverse_trees_recursive(int n, unsigned long dirmask,
 608                                    unsigned long df_conflicts,
 609                                    struct name_entry *names,
 610                                    struct traverse_info *info)
 611{
 612        int i, ret, bottom;
 613        int nr_buf = 0;
 614        struct tree_desc t[MAX_UNPACK_TREES];
 615        void *buf[MAX_UNPACK_TREES];
 616        struct traverse_info newinfo;
 617        struct name_entry *p;
 618
 619        p = names;
 620        while (!p->mode)
 621                p++;
 622
 623        newinfo = *info;
 624        newinfo.prev = info;
 625        newinfo.pathspec = info->pathspec;
 626        newinfo.name = *p;
 627        newinfo.pathlen += tree_entry_len(p) + 1;
 628        newinfo.df_conflicts |= df_conflicts;
 629
 630        /*
 631         * Fetch the tree from the ODB for each peer directory in the
 632         * n commits.
 633         *
 634         * For 2- and 3-way traversals, we try to avoid hitting the
 635         * ODB twice for the same OID.  This should yield a nice speed
 636         * up in checkouts and merges when the commits are similar.
 637         *
 638         * We don't bother doing the full O(n^2) search for larger n,
 639         * because wider traversals don't happen that often and we
 640         * avoid the search setup.
 641         *
 642         * When 2 peer OIDs are the same, we just copy the tree
 643         * descriptor data.  This implicitly borrows the buffer
 644         * data from the earlier cell.
 645         */
 646        for (i = 0; i < n; i++, dirmask >>= 1) {
 647                if (i > 0 && are_same_oid(&names[i], &names[i - 1]))
 648                        t[i] = t[i - 1];
 649                else if (i > 1 && are_same_oid(&names[i], &names[i - 2]))
 650                        t[i] = t[i - 2];
 651                else {
 652                        const unsigned char *sha1 = NULL;
 653                        if (dirmask & 1)
 654                                sha1 = names[i].oid->hash;
 655                        buf[nr_buf++] = fill_tree_descriptor(t+i, sha1);
 656                }
 657        }
 658
 659        bottom = switch_cache_bottom(&newinfo);
 660        ret = traverse_trees(n, t, &newinfo);
 661        restore_cache_bottom(&newinfo, bottom);
 662
 663        for (i = 0; i < nr_buf; i++)
 664                free(buf[i]);
 665
 666        return ret;
 667}
 668
 669/*
 670 * Compare the traverse-path to the cache entry without actually
 671 * having to generate the textual representation of the traverse
 672 * path.
 673 *
 674 * NOTE! This *only* compares up to the size of the traverse path
 675 * itself - the caller needs to do the final check for the cache
 676 * entry having more data at the end!
 677 */
 678static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
 679{
 680        int len, pathlen, ce_len;
 681        const char *ce_name;
 682
 683        if (info->prev) {
 684                int cmp = do_compare_entry_piecewise(ce, info->prev,
 685                                                     &info->name);
 686                if (cmp)
 687                        return cmp;
 688        }
 689        pathlen = info->pathlen;
 690        ce_len = ce_namelen(ce);
 691
 692        /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
 693        if (ce_len < pathlen)
 694                return -1;
 695
 696        ce_len -= pathlen;
 697        ce_name = ce->name + pathlen;
 698
 699        len = tree_entry_len(n);
 700        return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
 701}
 702
 703static int do_compare_entry(const struct cache_entry *ce,
 704                            const struct traverse_info *info,
 705                            const struct name_entry *n)
 706{
 707        int len, pathlen, ce_len;
 708        const char *ce_name;
 709        int cmp;
 710
 711        /*
 712         * If we have not precomputed the traverse path, it is quicker
 713         * to avoid doing so.  But if we have precomputed it,
 714         * it is quicker to use the precomputed version.
 715         */
 716        if (!info->traverse_path)
 717                return do_compare_entry_piecewise(ce, info, n);
 718
 719        cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
 720        if (cmp)
 721                return cmp;
 722
 723        pathlen = info->pathlen;
 724        ce_len = ce_namelen(ce);
 725
 726        if (ce_len < pathlen)
 727                return -1;
 728
 729        ce_len -= pathlen;
 730        ce_name = ce->name + pathlen;
 731
 732        len = tree_entry_len(n);
 733        return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
 734}
 735
 736static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
 737{
 738        int cmp = do_compare_entry(ce, info, n);
 739        if (cmp)
 740                return cmp;
 741
 742        /*
 743         * Even if the beginning compared identically, the ce should
 744         * compare as bigger than a directory leading up to it!
 745         */
 746        return ce_namelen(ce) > traverse_path_len(info, n);
 747}
 748
 749static int ce_in_traverse_path(const struct cache_entry *ce,
 750                               const struct traverse_info *info)
 751{
 752        if (!info->prev)
 753                return 1;
 754        if (do_compare_entry(ce, info->prev, &info->name))
 755                return 0;
 756        /*
 757         * If ce (blob) is the same name as the path (which is a tree
 758         * we will be descending into), it won't be inside it.
 759         */
 760        return (info->pathlen < ce_namelen(ce));
 761}
 762
 763static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
 764{
 765        int len = traverse_path_len(info, n);
 766        struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
 767
 768        ce->ce_mode = create_ce_mode(n->mode);
 769        ce->ce_flags = create_ce_flags(stage);
 770        ce->ce_namelen = len;
 771        oidcpy(&ce->oid, n->oid);
 772        make_traverse_path(ce->name, info, n);
 773
 774        return ce;
 775}
 776
 777static int unpack_nondirectories(int n, unsigned long mask,
 778                                 unsigned long dirmask,
 779                                 struct cache_entry **src,
 780                                 const struct name_entry *names,
 781                                 const struct traverse_info *info)
 782{
 783        int i;
 784        struct unpack_trees_options *o = info->data;
 785        unsigned long conflicts = info->df_conflicts | dirmask;
 786
 787        /* Do we have *only* directories? Nothing to do */
 788        if (mask == dirmask && !src[0])
 789                return 0;
 790
 791        /*
 792         * Ok, we've filled in up to any potential index entry in src[0],
 793         * now do the rest.
 794         */
 795        for (i = 0; i < n; i++) {
 796                int stage;
 797                unsigned int bit = 1ul << i;
 798                if (conflicts & bit) {
 799                        src[i + o->merge] = o->df_conflict_entry;
 800                        continue;
 801                }
 802                if (!(mask & bit))
 803                        continue;
 804                if (!o->merge)
 805                        stage = 0;
 806                else if (i + 1 < o->head_idx)
 807                        stage = 1;
 808                else if (i + 1 > o->head_idx)
 809                        stage = 3;
 810                else
 811                        stage = 2;
 812                src[i + o->merge] = create_ce_entry(info, names + i, stage);
 813        }
 814
 815        if (o->merge) {
 816                int rc = call_unpack_fn((const struct cache_entry * const *)src,
 817                                        o);
 818                for (i = 0; i < n; i++) {
 819                        struct cache_entry *ce = src[i + o->merge];
 820                        if (ce != o->df_conflict_entry)
 821                                free(ce);
 822                }
 823                return rc;
 824        }
 825
 826        for (i = 0; i < n; i++)
 827                if (src[i] && src[i] != o->df_conflict_entry)
 828                        if (do_add_entry(o, src[i], 0, 0))
 829                                return -1;
 830
 831        return 0;
 832}
 833
 834static int unpack_failed(struct unpack_trees_options *o, const char *message)
 835{
 836        discard_index(&o->result);
 837        if (!o->gently && !o->exiting_early) {
 838                if (message)
 839                        return error("%s", message);
 840                return -1;
 841        }
 842        return -1;
 843}
 844
 845/*
 846 * The tree traversal is looking at name p.  If we have a matching entry,
 847 * return it.  If name p is a directory in the index, do not return
 848 * anything, as we will want to match it when the traversal descends into
 849 * the directory.
 850 */
 851static int find_cache_pos(struct traverse_info *info,
 852                          const struct name_entry *p)
 853{
 854        int pos;
 855        struct unpack_trees_options *o = info->data;
 856        struct index_state *index = o->src_index;
 857        int pfxlen = info->pathlen;
 858        int p_len = tree_entry_len(p);
 859
 860        for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
 861                const struct cache_entry *ce = index->cache[pos];
 862                const char *ce_name, *ce_slash;
 863                int cmp, ce_len;
 864
 865                if (ce->ce_flags & CE_UNPACKED) {
 866                        /*
 867                         * cache_bottom entry is already unpacked, so
 868                         * we can never match it; don't check it
 869                         * again.
 870                         */
 871                        if (pos == o->cache_bottom)
 872                                ++o->cache_bottom;
 873                        continue;
 874                }
 875                if (!ce_in_traverse_path(ce, info)) {
 876                        /*
 877                         * Check if we can skip future cache checks
 878                         * (because we're already past all possible
 879                         * entries in the traverse path).
 880                         */
 881                        if (info->traverse_path) {
 882                                if (strncmp(ce->name, info->traverse_path,
 883                                            info->pathlen) > 0)
 884                                        break;
 885                        }
 886                        continue;
 887                }
 888                ce_name = ce->name + pfxlen;
 889                ce_slash = strchr(ce_name, '/');
 890                if (ce_slash)
 891                        ce_len = ce_slash - ce_name;
 892                else
 893                        ce_len = ce_namelen(ce) - pfxlen;
 894                cmp = name_compare(p->path, p_len, ce_name, ce_len);
 895                /*
 896                 * Exact match; if we have a directory we need to
 897                 * delay returning it.
 898                 */
 899                if (!cmp)
 900                        return ce_slash ? -2 - pos : pos;
 901                if (0 < cmp)
 902                        continue; /* keep looking */
 903                /*
 904                 * ce_name sorts after p->path; could it be that we
 905                 * have files under p->path directory in the index?
 906                 * E.g.  ce_name == "t-i", and p->path == "t"; we may
 907                 * have "t/a" in the index.
 908                 */
 909                if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
 910                    ce_name[p_len] < '/')
 911                        continue; /* keep looking */
 912                break;
 913        }
 914        return -1;
 915}
 916
 917static struct cache_entry *find_cache_entry(struct traverse_info *info,
 918                                            const struct name_entry *p)
 919{
 920        int pos = find_cache_pos(info, p);
 921        struct unpack_trees_options *o = info->data;
 922
 923        if (0 <= pos)
 924                return o->src_index->cache[pos];
 925        else
 926                return NULL;
 927}
 928
 929static void debug_path(struct traverse_info *info)
 930{
 931        if (info->prev) {
 932                debug_path(info->prev);
 933                if (*info->prev->name.path)
 934                        putchar('/');
 935        }
 936        printf("%s", info->name.path);
 937}
 938
 939static void debug_name_entry(int i, struct name_entry *n)
 940{
 941        printf("ent#%d %06o %s\n", i,
 942               n->path ? n->mode : 0,
 943               n->path ? n->path : "(missing)");
 944}
 945
 946static void debug_unpack_callback(int n,
 947                                  unsigned long mask,
 948                                  unsigned long dirmask,
 949                                  struct name_entry *names,
 950                                  struct traverse_info *info)
 951{
 952        int i;
 953        printf("* unpack mask %lu, dirmask %lu, cnt %d ",
 954               mask, dirmask, n);
 955        debug_path(info);
 956        putchar('\n');
 957        for (i = 0; i < n; i++)
 958                debug_name_entry(i, names + i);
 959}
 960
 961static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
 962{
 963        struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
 964        struct unpack_trees_options *o = info->data;
 965        const struct name_entry *p = names;
 966
 967        /* Find first entry with a real name (we could use "mask" too) */
 968        while (!p->mode)
 969                p++;
 970
 971        if (o->debug_unpack)
 972                debug_unpack_callback(n, mask, dirmask, names, info);
 973
 974        /* Are we supposed to look at the index too? */
 975        if (o->merge) {
 976                while (1) {
 977                        int cmp;
 978                        struct cache_entry *ce;
 979
 980                        if (o->diff_index_cached)
 981                                ce = next_cache_entry(o);
 982                        else
 983                                ce = find_cache_entry(info, p);
 984
 985                        if (!ce)
 986                                break;
 987                        cmp = compare_entry(ce, info, p);
 988                        if (cmp < 0) {
 989                                if (unpack_index_entry(ce, o) < 0)
 990                                        return unpack_failed(o, NULL);
 991                                continue;
 992                        }
 993                        if (!cmp) {
 994                                if (ce_stage(ce)) {
 995                                        /*
 996                                         * If we skip unmerged index
 997                                         * entries, we'll skip this
 998                                         * entry *and* the tree
 999                                         * entries associated with it!
1000                                         */
1001                                        if (o->skip_unmerged) {
1002                                                add_same_unmerged(ce, o);
1003                                                return mask;
1004                                        }
1005                                }
1006                                src[0] = ce;
1007                        }
1008                        break;
1009                }
1010        }
1011
1012        if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
1013                return -1;
1014
1015        if (o->merge && src[0]) {
1016                if (ce_stage(src[0]))
1017                        mark_ce_used_same_name(src[0], o);
1018                else
1019                        mark_ce_used(src[0], o);
1020        }
1021
1022        /* Now handle any directories.. */
1023        if (dirmask) {
1024                /* special case: "diff-index --cached" looking at a tree */
1025                if (o->diff_index_cached &&
1026                    n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
1027                        int matches;
1028                        matches = cache_tree_matches_traversal(o->src_index->cache_tree,
1029                                                               names, info);
1030                        /*
1031                         * Everything under the name matches; skip the
1032                         * entire hierarchy.  diff_index_cached codepath
1033                         * special cases D/F conflicts in such a way that
1034                         * it does not do any look-ahead, so this is safe.
1035                         */
1036                        if (matches) {
1037                                o->cache_bottom += matches;
1038                                return mask;
1039                        }
1040                }
1041
1042                if (traverse_trees_recursive(n, dirmask, mask & ~dirmask,
1043                                             names, info) < 0)
1044                        return -1;
1045                return mask;
1046        }
1047
1048        return mask;
1049}
1050
1051static int clear_ce_flags_1(struct cache_entry **cache, int nr,
1052                            struct strbuf *prefix,
1053                            int select_mask, int clear_mask,
1054                            struct exclude_list *el, int defval);
1055
1056/* Whole directory matching */
1057static int clear_ce_flags_dir(struct cache_entry **cache, int nr,
1058                              struct strbuf *prefix,
1059                              char *basename,
1060                              int select_mask, int clear_mask,
1061                              struct exclude_list *el, int defval)
1062{
1063        struct cache_entry **cache_end;
1064        int dtype = DT_DIR;
1065        int ret = is_excluded_from_list(prefix->buf, prefix->len,
1066                                        basename, &dtype, el, &the_index);
1067        int rc;
1068
1069        strbuf_addch(prefix, '/');
1070
1071        /* If undecided, use matching result of parent dir in defval */
1072        if (ret < 0)
1073                ret = defval;
1074
1075        for (cache_end = cache; cache_end != cache + nr; cache_end++) {
1076                struct cache_entry *ce = *cache_end;
1077                if (strncmp(ce->name, prefix->buf, prefix->len))
1078                        break;
1079        }
1080
1081        /*
1082         * TODO: check el, if there are no patterns that may conflict
1083         * with ret (iow, we know in advance the incl/excl
1084         * decision for the entire directory), clear flag here without
1085         * calling clear_ce_flags_1(). That function will call
1086         * the expensive is_excluded_from_list() on every entry.
1087         */
1088        rc = clear_ce_flags_1(cache, cache_end - cache,
1089                              prefix,
1090                              select_mask, clear_mask,
1091                              el, ret);
1092        strbuf_setlen(prefix, prefix->len - 1);
1093        return rc;
1094}
1095
1096/*
1097 * Traverse the index, find every entry that matches according to
1098 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1099 * number of traversed entries.
1100 *
1101 * If select_mask is non-zero, only entries whose ce_flags has on of
1102 * those bits enabled are traversed.
1103 *
1104 * cache        : pointer to an index entry
1105 * prefix_len   : an offset to its path
1106 *
1107 * The current path ("prefix") including the trailing '/' is
1108 *   cache[0]->name[0..(prefix_len-1)]
1109 * Top level path has prefix_len zero.
1110 */
1111static int clear_ce_flags_1(struct cache_entry **cache, int nr,
1112                            struct strbuf *prefix,
1113                            int select_mask, int clear_mask,
1114                            struct exclude_list *el, int defval)
1115{
1116        struct cache_entry **cache_end = cache + nr;
1117
1118        /*
1119         * Process all entries that have the given prefix and meet
1120         * select_mask condition
1121         */
1122        while(cache != cache_end) {
1123                struct cache_entry *ce = *cache;
1124                const char *name, *slash;
1125                int len, dtype, ret;
1126
1127                if (select_mask && !(ce->ce_flags & select_mask)) {
1128                        cache++;
1129                        continue;
1130                }
1131
1132                if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len))
1133                        break;
1134
1135                name = ce->name + prefix->len;
1136                slash = strchr(name, '/');
1137
1138                /* If it's a directory, try whole directory match first */
1139                if (slash) {
1140                        int processed;
1141
1142                        len = slash - name;
1143                        strbuf_add(prefix, name, len);
1144
1145                        processed = clear_ce_flags_dir(cache, cache_end - cache,
1146                                                       prefix,
1147                                                       prefix->buf + prefix->len - len,
1148                                                       select_mask, clear_mask,
1149                                                       el, defval);
1150
1151                        /* clear_c_f_dir eats a whole dir already? */
1152                        if (processed) {
1153                                cache += processed;
1154                                strbuf_setlen(prefix, prefix->len - len);
1155                                continue;
1156                        }
1157
1158                        strbuf_addch(prefix, '/');
1159                        cache += clear_ce_flags_1(cache, cache_end - cache,
1160                                                  prefix,
1161                                                  select_mask, clear_mask, el, defval);
1162                        strbuf_setlen(prefix, prefix->len - len - 1);
1163                        continue;
1164                }
1165
1166                /* Non-directory */
1167                dtype = ce_to_dtype(ce);
1168                ret = is_excluded_from_list(ce->name, ce_namelen(ce),
1169                                            name, &dtype, el, &the_index);
1170                if (ret < 0)
1171                        ret = defval;
1172                if (ret > 0)
1173                        ce->ce_flags &= ~clear_mask;
1174                cache++;
1175        }
1176        return nr - (cache_end - cache);
1177}
1178
1179static int clear_ce_flags(struct cache_entry **cache, int nr,
1180                            int select_mask, int clear_mask,
1181                            struct exclude_list *el)
1182{
1183        static struct strbuf prefix = STRBUF_INIT;
1184
1185        strbuf_reset(&prefix);
1186
1187        return clear_ce_flags_1(cache, nr,
1188                                &prefix,
1189                                select_mask, clear_mask,
1190                                el, 0);
1191}
1192
1193/*
1194 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1195 */
1196static void mark_new_skip_worktree(struct exclude_list *el,
1197                                   struct index_state *the_index,
1198                                   int select_flag, int skip_wt_flag)
1199{
1200        int i;
1201
1202        /*
1203         * 1. Pretend the narrowest worktree: only unmerged entries
1204         * are checked out
1205         */
1206        for (i = 0; i < the_index->cache_nr; i++) {
1207                struct cache_entry *ce = the_index->cache[i];
1208
1209                if (select_flag && !(ce->ce_flags & select_flag))
1210                        continue;
1211
1212                if (!ce_stage(ce))
1213                        ce->ce_flags |= skip_wt_flag;
1214                else
1215                        ce->ce_flags &= ~skip_wt_flag;
1216        }
1217
1218        /*
1219         * 2. Widen worktree according to sparse-checkout file.
1220         * Matched entries will have skip_wt_flag cleared (i.e. "in")
1221         */
1222        clear_ce_flags(the_index->cache, the_index->cache_nr,
1223                       select_flag, skip_wt_flag, el);
1224}
1225
1226static int verify_absent(const struct cache_entry *,
1227                         enum unpack_trees_error_types,
1228                         struct unpack_trees_options *);
1229/*
1230 * N-way merge "len" trees.  Returns 0 on success, -1 on failure to manipulate the
1231 * resulting index, -2 on failure to reflect the changes to the work tree.
1232 *
1233 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1234 */
1235int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
1236{
1237        int i, ret;
1238        static struct cache_entry *dfc;
1239        struct exclude_list el;
1240
1241        if (len > MAX_UNPACK_TREES)
1242                die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
1243
1244        memset(&el, 0, sizeof(el));
1245        if (!core_apply_sparse_checkout || !o->update)
1246                o->skip_sparse_checkout = 1;
1247        if (!o->skip_sparse_checkout) {
1248                char *sparse = git_pathdup("info/sparse-checkout");
1249                if (add_excludes_from_file_to_list(sparse, "", 0, &el, NULL) < 0)
1250                        o->skip_sparse_checkout = 1;
1251                else
1252                        o->el = &el;
1253                free(sparse);
1254        }
1255
1256        memset(&o->result, 0, sizeof(o->result));
1257        o->result.initialized = 1;
1258        o->result.timestamp.sec = o->src_index->timestamp.sec;
1259        o->result.timestamp.nsec = o->src_index->timestamp.nsec;
1260        o->result.version = o->src_index->version;
1261        o->result.split_index = o->src_index->split_index;
1262        if (o->result.split_index)
1263                o->result.split_index->refcount++;
1264        hashcpy(o->result.sha1, o->src_index->sha1);
1265        o->merge_size = len;
1266        mark_all_ce_unused(o->src_index);
1267
1268        /*
1269         * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1270         */
1271        if (!o->skip_sparse_checkout)
1272                mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
1273
1274        if (!dfc)
1275                dfc = xcalloc(1, cache_entry_size(0));
1276        o->df_conflict_entry = dfc;
1277
1278        if (len) {
1279                const char *prefix = o->prefix ? o->prefix : "";
1280                struct traverse_info info;
1281
1282                setup_traverse_info(&info, prefix);
1283                info.fn = unpack_callback;
1284                info.data = o;
1285                info.show_all_errors = o->show_all_errors;
1286                info.pathspec = o->pathspec;
1287
1288                if (o->prefix) {
1289                        /*
1290                         * Unpack existing index entries that sort before the
1291                         * prefix the tree is spliced into.  Note that o->merge
1292                         * is always true in this case.
1293                         */
1294                        while (1) {
1295                                struct cache_entry *ce = next_cache_entry(o);
1296                                if (!ce)
1297                                        break;
1298                                if (ce_in_traverse_path(ce, &info))
1299                                        break;
1300                                if (unpack_index_entry(ce, o) < 0)
1301                                        goto return_failed;
1302                        }
1303                }
1304
1305                if (traverse_trees(len, t, &info) < 0)
1306                        goto return_failed;
1307        }
1308
1309        /* Any left-over entries in the index? */
1310        if (o->merge) {
1311                while (1) {
1312                        struct cache_entry *ce = next_cache_entry(o);
1313                        if (!ce)
1314                                break;
1315                        if (unpack_index_entry(ce, o) < 0)
1316                                goto return_failed;
1317                }
1318        }
1319        mark_all_ce_unused(o->src_index);
1320
1321        if (o->trivial_merges_only && o->nontrivial_merge) {
1322                ret = unpack_failed(o, "Merge requires file-level merging");
1323                goto done;
1324        }
1325
1326        if (!o->skip_sparse_checkout) {
1327                int empty_worktree = 1;
1328
1329                /*
1330                 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1331                 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1332                 * so apply_sparse_checkout() won't attempt to remove it from worktree
1333                 */
1334                mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1335
1336                ret = 0;
1337                for (i = 0; i < o->result.cache_nr; i++) {
1338                        struct cache_entry *ce = o->result.cache[i];
1339
1340                        /*
1341                         * Entries marked with CE_ADDED in merged_entry() do not have
1342                         * verify_absent() check (the check is effectively disabled
1343                         * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1344                         *
1345                         * Do the real check now because we have had
1346                         * correct CE_NEW_SKIP_WORKTREE
1347                         */
1348                        if (ce->ce_flags & CE_ADDED &&
1349                            verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1350                                if (!o->show_all_errors)
1351                                        goto return_failed;
1352                                ret = -1;
1353                        }
1354
1355                        if (apply_sparse_checkout(&o->result, ce, o)) {
1356                                if (!o->show_all_errors)
1357                                        goto return_failed;
1358                                ret = -1;
1359                        }
1360                        if (!ce_skip_worktree(ce))
1361                                empty_worktree = 0;
1362
1363                }
1364                if (ret < 0)
1365                        goto return_failed;
1366                /*
1367                 * Sparse checkout is meant to narrow down checkout area
1368                 * but it does not make sense to narrow down to empty working
1369                 * tree. This is usually a mistake in sparse checkout rules.
1370                 * Do not allow users to do that.
1371                 */
1372                if (o->result.cache_nr && empty_worktree) {
1373                        ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
1374                        goto done;
1375                }
1376        }
1377
1378        o->src_index = NULL;
1379        ret = check_updates(o) ? (-2) : 0;
1380        if (o->dst_index) {
1381                if (!ret) {
1382                        if (!o->result.cache_tree)
1383                                o->result.cache_tree = cache_tree();
1384                        if (!cache_tree_fully_valid(o->result.cache_tree))
1385                                cache_tree_update(&o->result,
1386                                                  WRITE_TREE_SILENT |
1387                                                  WRITE_TREE_REPAIR);
1388                }
1389                move_index_extensions(&o->result, o->dst_index);
1390                discard_index(o->dst_index);
1391                *o->dst_index = o->result;
1392        } else {
1393                discard_index(&o->result);
1394        }
1395
1396done:
1397        clear_exclude_list(&el);
1398        return ret;
1399
1400return_failed:
1401        if (o->show_all_errors)
1402                display_error_msgs(o);
1403        mark_all_ce_unused(o->src_index);
1404        ret = unpack_failed(o, NULL);
1405        if (o->exiting_early)
1406                ret = 0;
1407        goto done;
1408}
1409
1410/* Here come the merge functions */
1411
1412static int reject_merge(const struct cache_entry *ce,
1413                        struct unpack_trees_options *o)
1414{
1415        return o->gently ? -1 :
1416                add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
1417}
1418
1419static int same(const struct cache_entry *a, const struct cache_entry *b)
1420{
1421        if (!!a != !!b)
1422                return 0;
1423        if (!a && !b)
1424                return 1;
1425        if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
1426                return 0;
1427        return a->ce_mode == b->ce_mode &&
1428               !oidcmp(&a->oid, &b->oid);
1429}
1430
1431
1432/*
1433 * When a CE gets turned into an unmerged entry, we
1434 * want it to be up-to-date
1435 */
1436static int verify_uptodate_1(const struct cache_entry *ce,
1437                             struct unpack_trees_options *o,
1438                             enum unpack_trees_error_types error_type)
1439{
1440        struct stat st;
1441
1442        if (o->index_only)
1443                return 0;
1444
1445        /*
1446         * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1447         * if this entry is truly up-to-date because this file may be
1448         * overwritten.
1449         */
1450        if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
1451                ; /* keep checking */
1452        else if (o->reset || ce_uptodate(ce))
1453                return 0;
1454
1455        if (!lstat(ce->name, &st)) {
1456                int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;
1457                unsigned changed = ie_match_stat(o->src_index, ce, &st, flags);
1458
1459                if (submodule_from_ce(ce)) {
1460                        int r = check_submodule_move_head(ce,
1461                                "HEAD", oid_to_hex(&ce->oid), o);
1462                        if (r)
1463                                return o->gently ? -1 :
1464                                        add_rejected_path(o, error_type, ce->name);
1465                        return 0;
1466                }
1467
1468                if (!changed)
1469                        return 0;
1470                /*
1471                 * Historic default policy was to allow submodule to be out
1472                 * of sync wrt the superproject index. If the submodule was
1473                 * not considered interesting above, we don't care here.
1474                 */
1475                if (S_ISGITLINK(ce->ce_mode))
1476                        return 0;
1477
1478                errno = 0;
1479        }
1480        if (errno == ENOENT)
1481                return 0;
1482        return o->gently ? -1 :
1483                add_rejected_path(o, error_type, ce->name);
1484}
1485
1486static int verify_uptodate(const struct cache_entry *ce,
1487                           struct unpack_trees_options *o)
1488{
1489        if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
1490                return 0;
1491        return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
1492}
1493
1494static int verify_uptodate_sparse(const struct cache_entry *ce,
1495                                  struct unpack_trees_options *o)
1496{
1497        return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
1498}
1499
1500static void invalidate_ce_path(const struct cache_entry *ce,
1501                               struct unpack_trees_options *o)
1502{
1503        if (!ce)
1504                return;
1505        cache_tree_invalidate_path(o->src_index, ce->name);
1506        untracked_cache_invalidate_path(o->src_index, ce->name);
1507}
1508
1509/*
1510 * Check that checking out ce->sha1 in subdir ce->name is not
1511 * going to overwrite any working files.
1512 *
1513 * Currently, git does not checkout subprojects during a superproject
1514 * checkout, so it is not going to overwrite anything.
1515 */
1516static int verify_clean_submodule(const char *old_sha1,
1517                                  const struct cache_entry *ce,
1518                                  enum unpack_trees_error_types error_type,
1519                                  struct unpack_trees_options *o)
1520{
1521        if (!submodule_from_ce(ce))
1522                return 0;
1523
1524        return check_submodule_move_head(ce, old_sha1,
1525                                         oid_to_hex(&ce->oid), o);
1526}
1527
1528static int verify_clean_subdirectory(const struct cache_entry *ce,
1529                                     enum unpack_trees_error_types error_type,
1530                                     struct unpack_trees_options *o)
1531{
1532        /*
1533         * we are about to extract "ce->name"; we would not want to lose
1534         * anything in the existing directory there.
1535         */
1536        int namelen;
1537        int i;
1538        struct dir_struct d;
1539        char *pathbuf;
1540        int cnt = 0;
1541
1542        if (S_ISGITLINK(ce->ce_mode)) {
1543                unsigned char sha1[20];
1544                int sub_head = resolve_gitlink_ref(ce->name, "HEAD", sha1);
1545                /*
1546                 * If we are not going to update the submodule, then
1547                 * we don't care.
1548                 */
1549                if (!sub_head && !hashcmp(sha1, ce->oid.hash))
1550                        return 0;
1551                return verify_clean_submodule(sub_head ? NULL : sha1_to_hex(sha1),
1552                                              ce, error_type, o);
1553        }
1554
1555        /*
1556         * First let's make sure we do not have a local modification
1557         * in that directory.
1558         */
1559        namelen = ce_namelen(ce);
1560        for (i = locate_in_src_index(ce, o);
1561             i < o->src_index->cache_nr;
1562             i++) {
1563                struct cache_entry *ce2 = o->src_index->cache[i];
1564                int len = ce_namelen(ce2);
1565                if (len < namelen ||
1566                    strncmp(ce->name, ce2->name, namelen) ||
1567                    ce2->name[namelen] != '/')
1568                        break;
1569                /*
1570                 * ce2->name is an entry in the subdirectory to be
1571                 * removed.
1572                 */
1573                if (!ce_stage(ce2)) {
1574                        if (verify_uptodate(ce2, o))
1575                                return -1;
1576                        add_entry(o, ce2, CE_REMOVE, 0);
1577                        mark_ce_used(ce2, o);
1578                }
1579                cnt++;
1580        }
1581
1582        /*
1583         * Then we need to make sure that we do not lose a locally
1584         * present file that is not ignored.
1585         */
1586        pathbuf = xstrfmt("%.*s/", namelen, ce->name);
1587
1588        memset(&d, 0, sizeof(d));
1589        if (o->dir)
1590                d.exclude_per_dir = o->dir->exclude_per_dir;
1591        i = read_directory(&d, &the_index, pathbuf, namelen+1, NULL);
1592        if (i)
1593                return o->gently ? -1 :
1594                        add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
1595        free(pathbuf);
1596        return cnt;
1597}
1598
1599/*
1600 * This gets called when there was no index entry for the tree entry 'dst',
1601 * but we found a file in the working tree that 'lstat()' said was fine,
1602 * and we're on a case-insensitive filesystem.
1603 *
1604 * See if we can find a case-insensitive match in the index that also
1605 * matches the stat information, and assume it's that other file!
1606 */
1607static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)
1608{
1609        const struct cache_entry *src;
1610
1611        src = index_file_exists(o->src_index, name, len, 1);
1612        return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
1613}
1614
1615static int check_ok_to_remove(const char *name, int len, int dtype,
1616                              const struct cache_entry *ce, struct stat *st,
1617                              enum unpack_trees_error_types error_type,
1618                              struct unpack_trees_options *o)
1619{
1620        const struct cache_entry *result;
1621
1622        /*
1623         * It may be that the 'lstat()' succeeded even though
1624         * target 'ce' was absent, because there is an old
1625         * entry that is different only in case..
1626         *
1627         * Ignore that lstat() if it matches.
1628         */
1629        if (ignore_case && icase_exists(o, name, len, st))
1630                return 0;
1631
1632        if (o->dir &&
1633            is_excluded(o->dir, &the_index, name, &dtype))
1634                /*
1635                 * ce->name is explicitly excluded, so it is Ok to
1636                 * overwrite it.
1637                 */
1638                return 0;
1639        if (S_ISDIR(st->st_mode)) {
1640                /*
1641                 * We are checking out path "foo" and
1642                 * found "foo/." in the working tree.
1643                 * This is tricky -- if we have modified
1644                 * files that are in "foo/" we would lose
1645                 * them.
1646                 */
1647                if (verify_clean_subdirectory(ce, error_type, o) < 0)
1648                        return -1;
1649                return 0;
1650        }
1651
1652        /*
1653         * The previous round may already have decided to
1654         * delete this path, which is in a subdirectory that
1655         * is being replaced with a blob.
1656         */
1657        result = index_file_exists(&o->result, name, len, 0);
1658        if (result) {
1659                if (result->ce_flags & CE_REMOVE)
1660                        return 0;
1661        }
1662
1663        return o->gently ? -1 :
1664                add_rejected_path(o, error_type, name);
1665}
1666
1667/*
1668 * We do not want to remove or overwrite a working tree file that
1669 * is not tracked, unless it is ignored.
1670 */
1671static int verify_absent_1(const struct cache_entry *ce,
1672                           enum unpack_trees_error_types error_type,
1673                           struct unpack_trees_options *o)
1674{
1675        int len;
1676        struct stat st;
1677
1678        if (o->index_only || o->reset || !o->update)
1679                return 0;
1680
1681        len = check_leading_path(ce->name, ce_namelen(ce));
1682        if (!len)
1683                return 0;
1684        else if (len > 0) {
1685                char *path;
1686                int ret;
1687
1688                path = xmemdupz(ce->name, len);
1689                if (lstat(path, &st))
1690                        ret = error_errno("cannot stat '%s'", path);
1691                else {
1692                        if (submodule_from_ce(ce))
1693                                ret = check_submodule_move_head(ce,
1694                                                                oid_to_hex(&ce->oid),
1695                                                                NULL, o);
1696                        else
1697                                ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
1698                                                         &st, error_type, o);
1699                }
1700                free(path);
1701                return ret;
1702        } else if (lstat(ce->name, &st)) {
1703                if (errno != ENOENT)
1704                        return error_errno("cannot stat '%s'", ce->name);
1705                return 0;
1706        } else {
1707                if (submodule_from_ce(ce))
1708                        return check_submodule_move_head(ce, oid_to_hex(&ce->oid),
1709                                                         NULL, o);
1710
1711                return check_ok_to_remove(ce->name, ce_namelen(ce),
1712                                          ce_to_dtype(ce), ce, &st,
1713                                          error_type, o);
1714        }
1715}
1716
1717static int verify_absent(const struct cache_entry *ce,
1718                         enum unpack_trees_error_types error_type,
1719                         struct unpack_trees_options *o)
1720{
1721        if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
1722                return 0;
1723        return verify_absent_1(ce, error_type, o);
1724}
1725
1726static int verify_absent_sparse(const struct cache_entry *ce,
1727                                enum unpack_trees_error_types error_type,
1728                                struct unpack_trees_options *o)
1729{
1730        enum unpack_trees_error_types orphaned_error = error_type;
1731        if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1732                orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1733
1734        return verify_absent_1(ce, orphaned_error, o);
1735}
1736
1737static int merged_entry(const struct cache_entry *ce,
1738                        const struct cache_entry *old,
1739                        struct unpack_trees_options *o)
1740{
1741        int update = CE_UPDATE;
1742        struct cache_entry *merge = dup_entry(ce);
1743
1744        if (!old) {
1745                /*
1746                 * New index entries. In sparse checkout, the following
1747                 * verify_absent() will be delayed until after
1748                 * traverse_trees() finishes in unpack_trees(), then:
1749                 *
1750                 *  - CE_NEW_SKIP_WORKTREE will be computed correctly
1751                 *  - verify_absent() be called again, this time with
1752                 *    correct CE_NEW_SKIP_WORKTREE
1753                 *
1754                 * verify_absent() call here does nothing in sparse
1755                 * checkout (i.e. o->skip_sparse_checkout == 0)
1756                 */
1757                update |= CE_ADDED;
1758                merge->ce_flags |= CE_NEW_SKIP_WORKTREE;
1759
1760                if (verify_absent(merge,
1761                                  ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1762                        free(merge);
1763                        return -1;
1764                }
1765                invalidate_ce_path(merge, o);
1766
1767                if (submodule_from_ce(ce)) {
1768                        int ret = check_submodule_move_head(ce, NULL,
1769                                                            oid_to_hex(&ce->oid),
1770                                                            o);
1771                        if (ret)
1772                                return ret;
1773                }
1774
1775        } else if (!(old->ce_flags & CE_CONFLICTED)) {
1776                /*
1777                 * See if we can re-use the old CE directly?
1778                 * That way we get the uptodate stat info.
1779                 *
1780                 * This also removes the UPDATE flag on a match; otherwise
1781                 * we will end up overwriting local changes in the work tree.
1782                 */
1783                if (same(old, merge)) {
1784                        copy_cache_entry(merge, old);
1785                        update = 0;
1786                } else {
1787                        if (verify_uptodate(old, o)) {
1788                                free(merge);
1789                                return -1;
1790                        }
1791                        /* Migrate old flags over */
1792                        update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1793                        invalidate_ce_path(old, o);
1794                }
1795
1796                if (submodule_from_ce(ce)) {
1797                        int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid),
1798                                                            oid_to_hex(&ce->oid),
1799                                                            o);
1800                        if (ret)
1801                                return ret;
1802                }
1803        } else {
1804                /*
1805                 * Previously unmerged entry left as an existence
1806                 * marker by read_index_unmerged();
1807                 */
1808                invalidate_ce_path(old, o);
1809        }
1810
1811        do_add_entry(o, merge, update, CE_STAGEMASK);
1812        return 1;
1813}
1814
1815static int deleted_entry(const struct cache_entry *ce,
1816                         const struct cache_entry *old,
1817                         struct unpack_trees_options *o)
1818{
1819        /* Did it exist in the index? */
1820        if (!old) {
1821                if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1822                        return -1;
1823                return 0;
1824        }
1825        if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
1826                return -1;
1827        add_entry(o, ce, CE_REMOVE, 0);
1828        invalidate_ce_path(ce, o);
1829        return 1;
1830}
1831
1832static int keep_entry(const struct cache_entry *ce,
1833                      struct unpack_trees_options *o)
1834{
1835        add_entry(o, ce, 0, 0);
1836        return 1;
1837}
1838
1839#if DBRT_DEBUG
1840static void show_stage_entry(FILE *o,
1841                             const char *label, const struct cache_entry *ce)
1842{
1843        if (!ce)
1844                fprintf(o, "%s (missing)\n", label);
1845        else
1846                fprintf(o, "%s%06o %s %d\t%s\n",
1847                        label,
1848                        ce->ce_mode,
1849                        oid_to_hex(&ce->oid),
1850                        ce_stage(ce),
1851                        ce->name);
1852}
1853#endif
1854
1855int threeway_merge(const struct cache_entry * const *stages,
1856                   struct unpack_trees_options *o)
1857{
1858        const struct cache_entry *index;
1859        const struct cache_entry *head;
1860        const struct cache_entry *remote = stages[o->head_idx + 1];
1861        int count;
1862        int head_match = 0;
1863        int remote_match = 0;
1864
1865        int df_conflict_head = 0;
1866        int df_conflict_remote = 0;
1867
1868        int any_anc_missing = 0;
1869        int no_anc_exists = 1;
1870        int i;
1871
1872        for (i = 1; i < o->head_idx; i++) {
1873                if (!stages[i] || stages[i] == o->df_conflict_entry)
1874                        any_anc_missing = 1;
1875                else
1876                        no_anc_exists = 0;
1877        }
1878
1879        index = stages[0];
1880        head = stages[o->head_idx];
1881
1882        if (head == o->df_conflict_entry) {
1883                df_conflict_head = 1;
1884                head = NULL;
1885        }
1886
1887        if (remote == o->df_conflict_entry) {
1888                df_conflict_remote = 1;
1889                remote = NULL;
1890        }
1891
1892        /*
1893         * First, if there's a #16 situation, note that to prevent #13
1894         * and #14.
1895         */
1896        if (!same(remote, head)) {
1897                for (i = 1; i < o->head_idx; i++) {
1898                        if (same(stages[i], head)) {
1899                                head_match = i;
1900                        }
1901                        if (same(stages[i], remote)) {
1902                                remote_match = i;
1903                        }
1904                }
1905        }
1906
1907        /*
1908         * We start with cases where the index is allowed to match
1909         * something other than the head: #14(ALT) and #2ALT, where it
1910         * is permitted to match the result instead.
1911         */
1912        /* #14, #14ALT, #2ALT */
1913        if (remote && !df_conflict_head && head_match && !remote_match) {
1914                if (index && !same(index, remote) && !same(index, head))
1915                        return reject_merge(index, o);
1916                return merged_entry(remote, index, o);
1917        }
1918        /*
1919         * If we have an entry in the index cache, then we want to
1920         * make sure that it matches head.
1921         */
1922        if (index && !same(index, head))
1923                return reject_merge(index, o);
1924
1925        if (head) {
1926                /* #5ALT, #15 */
1927                if (same(head, remote))
1928                        return merged_entry(head, index, o);
1929                /* #13, #3ALT */
1930                if (!df_conflict_remote && remote_match && !head_match)
1931                        return merged_entry(head, index, o);
1932        }
1933
1934        /* #1 */
1935        if (!head && !remote && any_anc_missing)
1936                return 0;
1937
1938        /*
1939         * Under the "aggressive" rule, we resolve mostly trivial
1940         * cases that we historically had git-merge-one-file resolve.
1941         */
1942        if (o->aggressive) {
1943                int head_deleted = !head;
1944                int remote_deleted = !remote;
1945                const struct cache_entry *ce = NULL;
1946
1947                if (index)
1948                        ce = index;
1949                else if (head)
1950                        ce = head;
1951                else if (remote)
1952                        ce = remote;
1953                else {
1954                        for (i = 1; i < o->head_idx; i++) {
1955                                if (stages[i] && stages[i] != o->df_conflict_entry) {
1956                                        ce = stages[i];
1957                                        break;
1958                                }
1959                        }
1960                }
1961
1962                /*
1963                 * Deleted in both.
1964                 * Deleted in one and unchanged in the other.
1965                 */
1966                if ((head_deleted && remote_deleted) ||
1967                    (head_deleted && remote && remote_match) ||
1968                    (remote_deleted && head && head_match)) {
1969                        if (index)
1970                                return deleted_entry(index, index, o);
1971                        if (ce && !head_deleted) {
1972                                if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1973                                        return -1;
1974                        }
1975                        return 0;
1976                }
1977                /*
1978                 * Added in both, identically.
1979                 */
1980                if (no_anc_exists && head && remote && same(head, remote))
1981                        return merged_entry(head, index, o);
1982
1983        }
1984
1985        /* Below are "no merge" cases, which require that the index be
1986         * up-to-date to avoid the files getting overwritten with
1987         * conflict resolution files.
1988         */
1989        if (index) {
1990                if (verify_uptodate(index, o))
1991                        return -1;
1992        }
1993
1994        o->nontrivial_merge = 1;
1995
1996        /* #2, #3, #4, #6, #7, #9, #10, #11. */
1997        count = 0;
1998        if (!head_match || !remote_match) {
1999                for (i = 1; i < o->head_idx; i++) {
2000                        if (stages[i] && stages[i] != o->df_conflict_entry) {
2001                                keep_entry(stages[i], o);
2002                                count++;
2003                                break;
2004                        }
2005                }
2006        }
2007#if DBRT_DEBUG
2008        else {
2009                fprintf(stderr, "read-tree: warning #16 detected\n");
2010                show_stage_entry(stderr, "head   ", stages[head_match]);
2011                show_stage_entry(stderr, "remote ", stages[remote_match]);
2012        }
2013#endif
2014        if (head) { count += keep_entry(head, o); }
2015        if (remote) { count += keep_entry(remote, o); }
2016        return count;
2017}
2018
2019/*
2020 * Two-way merge.
2021 *
2022 * The rule is to "carry forward" what is in the index without losing
2023 * information across a "fast-forward", favoring a successful merge
2024 * over a merge failure when it makes sense.  For details of the
2025 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2026 *
2027 */
2028int twoway_merge(const struct cache_entry * const *src,
2029                 struct unpack_trees_options *o)
2030{
2031        const struct cache_entry *current = src[0];
2032        const struct cache_entry *oldtree = src[1];
2033        const struct cache_entry *newtree = src[2];
2034
2035        if (o->merge_size != 2)
2036                return error("Cannot do a twoway merge of %d trees",
2037                             o->merge_size);
2038
2039        if (oldtree == o->df_conflict_entry)
2040                oldtree = NULL;
2041        if (newtree == o->df_conflict_entry)
2042                newtree = NULL;
2043
2044        if (current) {
2045                if (current->ce_flags & CE_CONFLICTED) {
2046                        if (same(oldtree, newtree) || o->reset) {
2047                                if (!newtree)
2048                                        return deleted_entry(current, current, o);
2049                                else
2050                                        return merged_entry(newtree, current, o);
2051                        }
2052                        return reject_merge(current, o);
2053                } else if ((!oldtree && !newtree) || /* 4 and 5 */
2054                         (!oldtree && newtree &&
2055                          same(current, newtree)) || /* 6 and 7 */
2056                         (oldtree && newtree &&
2057                          same(oldtree, newtree)) || /* 14 and 15 */
2058                         (oldtree && newtree &&
2059                          !same(oldtree, newtree) && /* 18 and 19 */
2060                          same(current, newtree))) {
2061                        return keep_entry(current, o);
2062                } else if (oldtree && !newtree && same(current, oldtree)) {
2063                        /* 10 or 11 */
2064                        return deleted_entry(oldtree, current, o);
2065                } else if (oldtree && newtree &&
2066                         same(current, oldtree) && !same(current, newtree)) {
2067                        /* 20 or 21 */
2068                        return merged_entry(newtree, current, o);
2069                } else
2070                        return reject_merge(current, o);
2071        }
2072        else if (newtree) {
2073                if (oldtree && !o->initial_checkout) {
2074                        /*
2075                         * deletion of the path was staged;
2076                         */
2077                        if (same(oldtree, newtree))
2078                                return 1;
2079                        return reject_merge(oldtree, o);
2080                }
2081                return merged_entry(newtree, current, o);
2082        }
2083        return deleted_entry(oldtree, current, o);
2084}
2085
2086/*
2087 * Bind merge.
2088 *
2089 * Keep the index entries at stage0, collapse stage1 but make sure
2090 * stage0 does not have anything there.
2091 */
2092int bind_merge(const struct cache_entry * const *src,
2093               struct unpack_trees_options *o)
2094{
2095        const struct cache_entry *old = src[0];
2096        const struct cache_entry *a = src[1];
2097
2098        if (o->merge_size != 1)
2099                return error("Cannot do a bind merge of %d trees",
2100                             o->merge_size);
2101        if (a && old)
2102                return o->gently ? -1 :
2103                        error(ERRORMSG(o, ERROR_BIND_OVERLAP),
2104                              super_prefixed(a->name),
2105                              super_prefixed(old->name));
2106        if (!a)
2107                return keep_entry(old, o);
2108        else
2109                return merged_entry(a, NULL, o);
2110}
2111
2112/*
2113 * One-way merge.
2114 *
2115 * The rule is:
2116 * - take the stat information from stage0, take the data from stage1
2117 */
2118int oneway_merge(const struct cache_entry * const *src,
2119                 struct unpack_trees_options *o)
2120{
2121        const struct cache_entry *old = src[0];
2122        const struct cache_entry *a = src[1];
2123
2124        if (o->merge_size != 1)
2125                return error("Cannot do a oneway merge of %d trees",
2126                             o->merge_size);
2127
2128        if (!a || a == o->df_conflict_entry)
2129                return deleted_entry(old, old, o);
2130
2131        if (old && same(old, a)) {
2132                int update = 0;
2133                if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
2134                        struct stat st;
2135                        if (lstat(old->name, &st) ||
2136                            ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
2137                                update |= CE_UPDATE;
2138                }
2139                add_entry(o, old, update, 0);
2140                return 0;
2141        }
2142        return merged_entry(a, old, o);
2143}