read-cache.con commit upload-pack: generalize commit date cutoff (118be57)
   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6#define NO_THE_INDEX_COMPATIBILITY_MACROS
   7#include "cache.h"
   8#include "config.h"
   9#include "tempfile.h"
  10#include "lockfile.h"
  11#include "cache-tree.h"
  12#include "refs.h"
  13#include "dir.h"
  14#include "object-store.h"
  15#include "tree.h"
  16#include "commit.h"
  17#include "blob.h"
  18#include "resolve-undo.h"
  19#include "strbuf.h"
  20#include "varint.h"
  21#include "split-index.h"
  22#include "utf8.h"
  23#include "fsmonitor.h"
  24
  25/* Mask for the name length in ce_flags in the on-disk index */
  26
  27#define CE_NAMEMASK  (0x0fff)
  28
  29/* Index extensions.
  30 *
  31 * The first letter should be 'A'..'Z' for extensions that are not
  32 * necessary for a correct operation (i.e. optimization data).
  33 * When new extensions are added that _needs_ to be understood in
  34 * order to correctly interpret the index file, pick character that
  35 * is outside the range, to cause the reader to abort.
  36 */
  37
  38#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
  39#define CACHE_EXT_TREE 0x54524545       /* "TREE" */
  40#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
  41#define CACHE_EXT_LINK 0x6c696e6b         /* "link" */
  42#define CACHE_EXT_UNTRACKED 0x554E5452    /* "UNTR" */
  43#define CACHE_EXT_FSMONITOR 0x46534D4E    /* "FSMN" */
  44
  45/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
  46#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
  47                 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
  48                 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
  49
  50struct index_state the_index;
  51static const char *alternate_index_output;
  52
  53static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
  54{
  55        istate->cache[nr] = ce;
  56        add_name_hash(istate, ce);
  57}
  58
  59static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
  60{
  61        struct cache_entry *old = istate->cache[nr];
  62
  63        replace_index_entry_in_base(istate, old, ce);
  64        remove_name_hash(istate, old);
  65        free(old);
  66        ce->ce_flags &= ~CE_HASHED;
  67        set_index_entry(istate, nr, ce);
  68        ce->ce_flags |= CE_UPDATE_IN_BASE;
  69        mark_fsmonitor_invalid(istate, ce);
  70        istate->cache_changed |= CE_ENTRY_CHANGED;
  71}
  72
  73void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
  74{
  75        struct cache_entry *old_entry = istate->cache[nr], *new_entry;
  76        int namelen = strlen(new_name);
  77
  78        new_entry = xmalloc(cache_entry_size(namelen));
  79        copy_cache_entry(new_entry, old_entry);
  80        new_entry->ce_flags &= ~CE_HASHED;
  81        new_entry->ce_namelen = namelen;
  82        new_entry->index = 0;
  83        memcpy(new_entry->name, new_name, namelen + 1);
  84
  85        cache_tree_invalidate_path(istate, old_entry->name);
  86        untracked_cache_remove_from_index(istate, old_entry->name);
  87        remove_index_entry_at(istate, nr);
  88        add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
  89}
  90
  91void fill_stat_data(struct stat_data *sd, struct stat *st)
  92{
  93        sd->sd_ctime.sec = (unsigned int)st->st_ctime;
  94        sd->sd_mtime.sec = (unsigned int)st->st_mtime;
  95        sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
  96        sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
  97        sd->sd_dev = st->st_dev;
  98        sd->sd_ino = st->st_ino;
  99        sd->sd_uid = st->st_uid;
 100        sd->sd_gid = st->st_gid;
 101        sd->sd_size = st->st_size;
 102}
 103
 104int match_stat_data(const struct stat_data *sd, struct stat *st)
 105{
 106        int changed = 0;
 107
 108        if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
 109                changed |= MTIME_CHANGED;
 110        if (trust_ctime && check_stat &&
 111            sd->sd_ctime.sec != (unsigned int)st->st_ctime)
 112                changed |= CTIME_CHANGED;
 113
 114#ifdef USE_NSEC
 115        if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
 116                changed |= MTIME_CHANGED;
 117        if (trust_ctime && check_stat &&
 118            sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
 119                changed |= CTIME_CHANGED;
 120#endif
 121
 122        if (check_stat) {
 123                if (sd->sd_uid != (unsigned int) st->st_uid ||
 124                        sd->sd_gid != (unsigned int) st->st_gid)
 125                        changed |= OWNER_CHANGED;
 126                if (sd->sd_ino != (unsigned int) st->st_ino)
 127                        changed |= INODE_CHANGED;
 128        }
 129
 130#ifdef USE_STDEV
 131        /*
 132         * st_dev breaks on network filesystems where different
 133         * clients will have different views of what "device"
 134         * the filesystem is on
 135         */
 136        if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
 137                        changed |= INODE_CHANGED;
 138#endif
 139
 140        if (sd->sd_size != (unsigned int) st->st_size)
 141                changed |= DATA_CHANGED;
 142
 143        return changed;
 144}
 145
 146/*
 147 * This only updates the "non-critical" parts of the directory
 148 * cache, ie the parts that aren't tracked by GIT, and only used
 149 * to validate the cache.
 150 */
 151void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
 152{
 153        fill_stat_data(&ce->ce_stat_data, st);
 154
 155        if (assume_unchanged)
 156                ce->ce_flags |= CE_VALID;
 157
 158        if (S_ISREG(st->st_mode)) {
 159                ce_mark_uptodate(ce);
 160                mark_fsmonitor_valid(ce);
 161        }
 162}
 163
 164static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
 165{
 166        int match = -1;
 167        int fd = git_open_cloexec(ce->name, O_RDONLY);
 168
 169        if (fd >= 0) {
 170                struct object_id oid;
 171                if (!index_fd(&oid, fd, st, OBJ_BLOB, ce->name, 0))
 172                        match = oidcmp(&oid, &ce->oid);
 173                /* index_fd() closed the file descriptor already */
 174        }
 175        return match;
 176}
 177
 178static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
 179{
 180        int match = -1;
 181        void *buffer;
 182        unsigned long size;
 183        enum object_type type;
 184        struct strbuf sb = STRBUF_INIT;
 185
 186        if (strbuf_readlink(&sb, ce->name, expected_size))
 187                return -1;
 188
 189        buffer = read_object_file(&ce->oid, &type, &size);
 190        if (buffer) {
 191                if (size == sb.len)
 192                        match = memcmp(buffer, sb.buf, size);
 193                free(buffer);
 194        }
 195        strbuf_release(&sb);
 196        return match;
 197}
 198
 199static int ce_compare_gitlink(const struct cache_entry *ce)
 200{
 201        struct object_id oid;
 202
 203        /*
 204         * We don't actually require that the .git directory
 205         * under GITLINK directory be a valid git directory. It
 206         * might even be missing (in case nobody populated that
 207         * sub-project).
 208         *
 209         * If so, we consider it always to match.
 210         */
 211        if (resolve_gitlink_ref(ce->name, "HEAD", &oid) < 0)
 212                return 0;
 213        return oidcmp(&oid, &ce->oid);
 214}
 215
 216static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
 217{
 218        switch (st->st_mode & S_IFMT) {
 219        case S_IFREG:
 220                if (ce_compare_data(ce, st))
 221                        return DATA_CHANGED;
 222                break;
 223        case S_IFLNK:
 224                if (ce_compare_link(ce, xsize_t(st->st_size)))
 225                        return DATA_CHANGED;
 226                break;
 227        case S_IFDIR:
 228                if (S_ISGITLINK(ce->ce_mode))
 229                        return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
 230                /* else fallthrough */
 231        default:
 232                return TYPE_CHANGED;
 233        }
 234        return 0;
 235}
 236
 237static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
 238{
 239        unsigned int changed = 0;
 240
 241        if (ce->ce_flags & CE_REMOVE)
 242                return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
 243
 244        switch (ce->ce_mode & S_IFMT) {
 245        case S_IFREG:
 246                changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
 247                /* We consider only the owner x bit to be relevant for
 248                 * "mode changes"
 249                 */
 250                if (trust_executable_bit &&
 251                    (0100 & (ce->ce_mode ^ st->st_mode)))
 252                        changed |= MODE_CHANGED;
 253                break;
 254        case S_IFLNK:
 255                if (!S_ISLNK(st->st_mode) &&
 256                    (has_symlinks || !S_ISREG(st->st_mode)))
 257                        changed |= TYPE_CHANGED;
 258                break;
 259        case S_IFGITLINK:
 260                /* We ignore most of the st_xxx fields for gitlinks */
 261                if (!S_ISDIR(st->st_mode))
 262                        changed |= TYPE_CHANGED;
 263                else if (ce_compare_gitlink(ce))
 264                        changed |= DATA_CHANGED;
 265                return changed;
 266        default:
 267                die("internal error: ce_mode is %o", ce->ce_mode);
 268        }
 269
 270        changed |= match_stat_data(&ce->ce_stat_data, st);
 271
 272        /* Racily smudged entry? */
 273        if (!ce->ce_stat_data.sd_size) {
 274                if (!is_empty_blob_sha1(ce->oid.hash))
 275                        changed |= DATA_CHANGED;
 276        }
 277
 278        return changed;
 279}
 280
 281static int is_racy_stat(const struct index_state *istate,
 282                        const struct stat_data *sd)
 283{
 284        return (istate->timestamp.sec &&
 285#ifdef USE_NSEC
 286                 /* nanosecond timestamped files can also be racy! */
 287                (istate->timestamp.sec < sd->sd_mtime.sec ||
 288                 (istate->timestamp.sec == sd->sd_mtime.sec &&
 289                  istate->timestamp.nsec <= sd->sd_mtime.nsec))
 290#else
 291                istate->timestamp.sec <= sd->sd_mtime.sec
 292#endif
 293                );
 294}
 295
 296static int is_racy_timestamp(const struct index_state *istate,
 297                             const struct cache_entry *ce)
 298{
 299        return (!S_ISGITLINK(ce->ce_mode) &&
 300                is_racy_stat(istate, &ce->ce_stat_data));
 301}
 302
 303int match_stat_data_racy(const struct index_state *istate,
 304                         const struct stat_data *sd, struct stat *st)
 305{
 306        if (is_racy_stat(istate, sd))
 307                return MTIME_CHANGED;
 308        return match_stat_data(sd, st);
 309}
 310
 311int ie_match_stat(struct index_state *istate,
 312                  const struct cache_entry *ce, struct stat *st,
 313                  unsigned int options)
 314{
 315        unsigned int changed;
 316        int ignore_valid = options & CE_MATCH_IGNORE_VALID;
 317        int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
 318        int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
 319        int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
 320
 321        if (!ignore_fsmonitor)
 322                refresh_fsmonitor(istate);
 323        /*
 324         * If it's marked as always valid in the index, it's
 325         * valid whatever the checked-out copy says.
 326         *
 327         * skip-worktree has the same effect with higher precedence
 328         */
 329        if (!ignore_skip_worktree && ce_skip_worktree(ce))
 330                return 0;
 331        if (!ignore_valid && (ce->ce_flags & CE_VALID))
 332                return 0;
 333        if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID))
 334                return 0;
 335
 336        /*
 337         * Intent-to-add entries have not been added, so the index entry
 338         * by definition never matches what is in the work tree until it
 339         * actually gets added.
 340         */
 341        if (ce_intent_to_add(ce))
 342                return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
 343
 344        changed = ce_match_stat_basic(ce, st);
 345
 346        /*
 347         * Within 1 second of this sequence:
 348         *      echo xyzzy >file && git-update-index --add file
 349         * running this command:
 350         *      echo frotz >file
 351         * would give a falsely clean cache entry.  The mtime and
 352         * length match the cache, and other stat fields do not change.
 353         *
 354         * We could detect this at update-index time (the cache entry
 355         * being registered/updated records the same time as "now")
 356         * and delay the return from git-update-index, but that would
 357         * effectively mean we can make at most one commit per second,
 358         * which is not acceptable.  Instead, we check cache entries
 359         * whose mtime are the same as the index file timestamp more
 360         * carefully than others.
 361         */
 362        if (!changed && is_racy_timestamp(istate, ce)) {
 363                if (assume_racy_is_modified)
 364                        changed |= DATA_CHANGED;
 365                else
 366                        changed |= ce_modified_check_fs(ce, st);
 367        }
 368
 369        return changed;
 370}
 371
 372int ie_modified(struct index_state *istate,
 373                const struct cache_entry *ce,
 374                struct stat *st, unsigned int options)
 375{
 376        int changed, changed_fs;
 377
 378        changed = ie_match_stat(istate, ce, st, options);
 379        if (!changed)
 380                return 0;
 381        /*
 382         * If the mode or type has changed, there's no point in trying
 383         * to refresh the entry - it's not going to match
 384         */
 385        if (changed & (MODE_CHANGED | TYPE_CHANGED))
 386                return changed;
 387
 388        /*
 389         * Immediately after read-tree or update-index --cacheinfo,
 390         * the length field is zero, as we have never even read the
 391         * lstat(2) information once, and we cannot trust DATA_CHANGED
 392         * returned by ie_match_stat() which in turn was returned by
 393         * ce_match_stat_basic() to signal that the filesize of the
 394         * blob changed.  We have to actually go to the filesystem to
 395         * see if the contents match, and if so, should answer "unchanged".
 396         *
 397         * The logic does not apply to gitlinks, as ce_match_stat_basic()
 398         * already has checked the actual HEAD from the filesystem in the
 399         * subproject.  If ie_match_stat() already said it is different,
 400         * then we know it is.
 401         */
 402        if ((changed & DATA_CHANGED) &&
 403            (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
 404                return changed;
 405
 406        changed_fs = ce_modified_check_fs(ce, st);
 407        if (changed_fs)
 408                return changed | changed_fs;
 409        return 0;
 410}
 411
 412int base_name_compare(const char *name1, int len1, int mode1,
 413                      const char *name2, int len2, int mode2)
 414{
 415        unsigned char c1, c2;
 416        int len = len1 < len2 ? len1 : len2;
 417        int cmp;
 418
 419        cmp = memcmp(name1, name2, len);
 420        if (cmp)
 421                return cmp;
 422        c1 = name1[len];
 423        c2 = name2[len];
 424        if (!c1 && S_ISDIR(mode1))
 425                c1 = '/';
 426        if (!c2 && S_ISDIR(mode2))
 427                c2 = '/';
 428        return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
 429}
 430
 431/*
 432 * df_name_compare() is identical to base_name_compare(), except it
 433 * compares conflicting directory/file entries as equal. Note that
 434 * while a directory name compares as equal to a regular file, they
 435 * then individually compare _differently_ to a filename that has
 436 * a dot after the basename (because '\0' < '.' < '/').
 437 *
 438 * This is used by routines that want to traverse the git namespace
 439 * but then handle conflicting entries together when possible.
 440 */
 441int df_name_compare(const char *name1, int len1, int mode1,
 442                    const char *name2, int len2, int mode2)
 443{
 444        int len = len1 < len2 ? len1 : len2, cmp;
 445        unsigned char c1, c2;
 446
 447        cmp = memcmp(name1, name2, len);
 448        if (cmp)
 449                return cmp;
 450        /* Directories and files compare equal (same length, same name) */
 451        if (len1 == len2)
 452                return 0;
 453        c1 = name1[len];
 454        if (!c1 && S_ISDIR(mode1))
 455                c1 = '/';
 456        c2 = name2[len];
 457        if (!c2 && S_ISDIR(mode2))
 458                c2 = '/';
 459        if (c1 == '/' && !c2)
 460                return 0;
 461        if (c2 == '/' && !c1)
 462                return 0;
 463        return c1 - c2;
 464}
 465
 466int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
 467{
 468        size_t min_len = (len1 < len2) ? len1 : len2;
 469        int cmp = memcmp(name1, name2, min_len);
 470        if (cmp)
 471                return cmp;
 472        if (len1 < len2)
 473                return -1;
 474        if (len1 > len2)
 475                return 1;
 476        return 0;
 477}
 478
 479int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
 480{
 481        int cmp;
 482
 483        cmp = name_compare(name1, len1, name2, len2);
 484        if (cmp)
 485                return cmp;
 486
 487        if (stage1 < stage2)
 488                return -1;
 489        if (stage1 > stage2)
 490                return 1;
 491        return 0;
 492}
 493
 494static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
 495{
 496        int first, last;
 497
 498        first = 0;
 499        last = istate->cache_nr;
 500        while (last > first) {
 501                int next = (last + first) >> 1;
 502                struct cache_entry *ce = istate->cache[next];
 503                int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
 504                if (!cmp)
 505                        return next;
 506                if (cmp < 0) {
 507                        last = next;
 508                        continue;
 509                }
 510                first = next+1;
 511        }
 512        return -first-1;
 513}
 514
 515int index_name_pos(const struct index_state *istate, const char *name, int namelen)
 516{
 517        return index_name_stage_pos(istate, name, namelen, 0);
 518}
 519
 520int remove_index_entry_at(struct index_state *istate, int pos)
 521{
 522        struct cache_entry *ce = istate->cache[pos];
 523
 524        record_resolve_undo(istate, ce);
 525        remove_name_hash(istate, ce);
 526        save_or_free_index_entry(istate, ce);
 527        istate->cache_changed |= CE_ENTRY_REMOVED;
 528        istate->cache_nr--;
 529        if (pos >= istate->cache_nr)
 530                return 0;
 531        MOVE_ARRAY(istate->cache + pos, istate->cache + pos + 1,
 532                   istate->cache_nr - pos);
 533        return 1;
 534}
 535
 536/*
 537 * Remove all cache entries marked for removal, that is where
 538 * CE_REMOVE is set in ce_flags.  This is much more effective than
 539 * calling remove_index_entry_at() for each entry to be removed.
 540 */
 541void remove_marked_cache_entries(struct index_state *istate)
 542{
 543        struct cache_entry **ce_array = istate->cache;
 544        unsigned int i, j;
 545
 546        for (i = j = 0; i < istate->cache_nr; i++) {
 547                if (ce_array[i]->ce_flags & CE_REMOVE) {
 548                        remove_name_hash(istate, ce_array[i]);
 549                        save_or_free_index_entry(istate, ce_array[i]);
 550                }
 551                else
 552                        ce_array[j++] = ce_array[i];
 553        }
 554        if (j == istate->cache_nr)
 555                return;
 556        istate->cache_changed |= CE_ENTRY_REMOVED;
 557        istate->cache_nr = j;
 558}
 559
 560int remove_file_from_index(struct index_state *istate, const char *path)
 561{
 562        int pos = index_name_pos(istate, path, strlen(path));
 563        if (pos < 0)
 564                pos = -pos-1;
 565        cache_tree_invalidate_path(istate, path);
 566        untracked_cache_remove_from_index(istate, path);
 567        while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
 568                remove_index_entry_at(istate, pos);
 569        return 0;
 570}
 571
 572static int compare_name(struct cache_entry *ce, const char *path, int namelen)
 573{
 574        return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
 575}
 576
 577static int index_name_pos_also_unmerged(struct index_state *istate,
 578        const char *path, int namelen)
 579{
 580        int pos = index_name_pos(istate, path, namelen);
 581        struct cache_entry *ce;
 582
 583        if (pos >= 0)
 584                return pos;
 585
 586        /* maybe unmerged? */
 587        pos = -1 - pos;
 588        if (pos >= istate->cache_nr ||
 589                        compare_name((ce = istate->cache[pos]), path, namelen))
 590                return -1;
 591
 592        /* order of preference: stage 2, 1, 3 */
 593        if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
 594                        ce_stage((ce = istate->cache[pos + 1])) == 2 &&
 595                        !compare_name(ce, path, namelen))
 596                pos++;
 597        return pos;
 598}
 599
 600static int different_name(struct cache_entry *ce, struct cache_entry *alias)
 601{
 602        int len = ce_namelen(ce);
 603        return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
 604}
 605
 606/*
 607 * If we add a filename that aliases in the cache, we will use the
 608 * name that we already have - but we don't want to update the same
 609 * alias twice, because that implies that there were actually two
 610 * different files with aliasing names!
 611 *
 612 * So we use the CE_ADDED flag to verify that the alias was an old
 613 * one before we accept it as
 614 */
 615static struct cache_entry *create_alias_ce(struct index_state *istate,
 616                                           struct cache_entry *ce,
 617                                           struct cache_entry *alias)
 618{
 619        int len;
 620        struct cache_entry *new_entry;
 621
 622        if (alias->ce_flags & CE_ADDED)
 623                die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
 624
 625        /* Ok, create the new entry using the name of the existing alias */
 626        len = ce_namelen(alias);
 627        new_entry = xcalloc(1, cache_entry_size(len));
 628        memcpy(new_entry->name, alias->name, len);
 629        copy_cache_entry(new_entry, ce);
 630        save_or_free_index_entry(istate, ce);
 631        return new_entry;
 632}
 633
 634void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
 635{
 636        struct object_id oid;
 637        if (write_object_file("", 0, blob_type, &oid))
 638                die("cannot create an empty blob in the object database");
 639        oidcpy(&ce->oid, &oid);
 640}
 641
 642int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
 643{
 644        int size, namelen, was_same;
 645        mode_t st_mode = st->st_mode;
 646        struct cache_entry *ce, *alias = NULL;
 647        unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
 648        int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
 649        int pretend = flags & ADD_CACHE_PRETEND;
 650        int intent_only = flags & ADD_CACHE_INTENT;
 651        int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
 652                          (intent_only ? ADD_CACHE_NEW_ONLY : 0));
 653        int newflags = HASH_WRITE_OBJECT;
 654
 655        if (flags & HASH_RENORMALIZE)
 656                newflags |= HASH_RENORMALIZE;
 657
 658        if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
 659                return error("%s: can only add regular files, symbolic links or git-directories", path);
 660
 661        namelen = strlen(path);
 662        if (S_ISDIR(st_mode)) {
 663                while (namelen && path[namelen-1] == '/')
 664                        namelen--;
 665        }
 666        size = cache_entry_size(namelen);
 667        ce = xcalloc(1, size);
 668        memcpy(ce->name, path, namelen);
 669        ce->ce_namelen = namelen;
 670        if (!intent_only)
 671                fill_stat_cache_info(ce, st);
 672        else
 673                ce->ce_flags |= CE_INTENT_TO_ADD;
 674
 675
 676        if (trust_executable_bit && has_symlinks) {
 677                ce->ce_mode = create_ce_mode(st_mode);
 678        } else {
 679                /* If there is an existing entry, pick the mode bits and type
 680                 * from it, otherwise assume unexecutable regular file.
 681                 */
 682                struct cache_entry *ent;
 683                int pos = index_name_pos_also_unmerged(istate, path, namelen);
 684
 685                ent = (0 <= pos) ? istate->cache[pos] : NULL;
 686                ce->ce_mode = ce_mode_from_stat(ent, st_mode);
 687        }
 688
 689        /* When core.ignorecase=true, determine if a directory of the same name but differing
 690         * case already exists within the Git repository.  If it does, ensure the directory
 691         * case of the file being added to the repository matches (is folded into) the existing
 692         * entry's directory case.
 693         */
 694        if (ignore_case) {
 695                adjust_dirname_case(istate, ce->name);
 696        }
 697        if (!(flags & HASH_RENORMALIZE)) {
 698                alias = index_file_exists(istate, ce->name,
 699                                          ce_namelen(ce), ignore_case);
 700                if (alias &&
 701                    !ce_stage(alias) &&
 702                    !ie_match_stat(istate, alias, st, ce_option)) {
 703                        /* Nothing changed, really */
 704                        if (!S_ISGITLINK(alias->ce_mode))
 705                                ce_mark_uptodate(alias);
 706                        alias->ce_flags |= CE_ADDED;
 707
 708                        free(ce);
 709                        return 0;
 710                }
 711        }
 712        if (!intent_only) {
 713                if (index_path(&ce->oid, path, st, newflags)) {
 714                        free(ce);
 715                        return error("unable to index file %s", path);
 716                }
 717        } else
 718                set_object_name_for_intent_to_add_entry(ce);
 719
 720        if (ignore_case && alias && different_name(ce, alias))
 721                ce = create_alias_ce(istate, ce, alias);
 722        ce->ce_flags |= CE_ADDED;
 723
 724        /* It was suspected to be racily clean, but it turns out to be Ok */
 725        was_same = (alias &&
 726                    !ce_stage(alias) &&
 727                    !oidcmp(&alias->oid, &ce->oid) &&
 728                    ce->ce_mode == alias->ce_mode);
 729
 730        if (pretend)
 731                free(ce);
 732        else if (add_index_entry(istate, ce, add_option)) {
 733                free(ce);
 734                return error("unable to add %s to index", path);
 735        }
 736        if (verbose && !was_same)
 737                printf("add '%s'\n", path);
 738        return 0;
 739}
 740
 741int add_file_to_index(struct index_state *istate, const char *path, int flags)
 742{
 743        struct stat st;
 744        if (lstat(path, &st))
 745                die_errno("unable to stat '%s'", path);
 746        return add_to_index(istate, path, &st, flags);
 747}
 748
 749struct cache_entry *make_cache_entry(unsigned int mode,
 750                const unsigned char *sha1, const char *path, int stage,
 751                unsigned int refresh_options)
 752{
 753        int size, len;
 754        struct cache_entry *ce, *ret;
 755
 756        if (!verify_path(path, mode)) {
 757                error("Invalid path '%s'", path);
 758                return NULL;
 759        }
 760
 761        len = strlen(path);
 762        size = cache_entry_size(len);
 763        ce = xcalloc(1, size);
 764
 765        hashcpy(ce->oid.hash, sha1);
 766        memcpy(ce->name, path, len);
 767        ce->ce_flags = create_ce_flags(stage);
 768        ce->ce_namelen = len;
 769        ce->ce_mode = create_ce_mode(mode);
 770
 771        ret = refresh_cache_entry(ce, refresh_options);
 772        if (ret != ce)
 773                free(ce);
 774        return ret;
 775}
 776
 777/*
 778 * Chmod an index entry with either +x or -x.
 779 *
 780 * Returns -1 if the chmod for the particular cache entry failed (if it's
 781 * not a regular file), -2 if an invalid flip argument is passed in, 0
 782 * otherwise.
 783 */
 784int chmod_index_entry(struct index_state *istate, struct cache_entry *ce,
 785                      char flip)
 786{
 787        if (!S_ISREG(ce->ce_mode))
 788                return -1;
 789        switch (flip) {
 790        case '+':
 791                ce->ce_mode |= 0111;
 792                break;
 793        case '-':
 794                ce->ce_mode &= ~0111;
 795                break;
 796        default:
 797                return -2;
 798        }
 799        cache_tree_invalidate_path(istate, ce->name);
 800        ce->ce_flags |= CE_UPDATE_IN_BASE;
 801        mark_fsmonitor_invalid(istate, ce);
 802        istate->cache_changed |= CE_ENTRY_CHANGED;
 803
 804        return 0;
 805}
 806
 807int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
 808{
 809        int len = ce_namelen(a);
 810        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 811}
 812
 813/*
 814 * We fundamentally don't like some paths: we don't want
 815 * dot or dot-dot anywhere, and for obvious reasons don't
 816 * want to recurse into ".git" either.
 817 *
 818 * Also, we don't want double slashes or slashes at the
 819 * end that can make pathnames ambiguous.
 820 */
 821static int verify_dotfile(const char *rest, unsigned mode)
 822{
 823        /*
 824         * The first character was '.', but that
 825         * has already been discarded, we now test
 826         * the rest.
 827         */
 828
 829        /* "." is not allowed */
 830        if (*rest == '\0' || is_dir_sep(*rest))
 831                return 0;
 832
 833        switch (*rest) {
 834        /*
 835         * ".git" followed by NUL or slash is bad. Note that we match
 836         * case-insensitively here, even if ignore_case is not set.
 837         * This outlaws ".GIT" everywhere out of an abundance of caution,
 838         * since there's really no good reason to allow it.
 839         *
 840         * Once we've seen ".git", we can also find ".gitmodules", etc (also
 841         * case-insensitively).
 842         */
 843        case 'g':
 844        case 'G':
 845                if (rest[1] != 'i' && rest[1] != 'I')
 846                        break;
 847                if (rest[2] != 't' && rest[2] != 'T')
 848                        break;
 849                if (rest[3] == '\0' || is_dir_sep(rest[3]))
 850                        return 0;
 851                if (S_ISLNK(mode)) {
 852                        rest += 3;
 853                        if (skip_iprefix(rest, "modules", &rest) &&
 854                            (*rest == '\0' || is_dir_sep(*rest)))
 855                                return 0;
 856                }
 857                break;
 858        case '.':
 859                if (rest[1] == '\0' || is_dir_sep(rest[1]))
 860                        return 0;
 861        }
 862        return 1;
 863}
 864
 865int verify_path(const char *path, unsigned mode)
 866{
 867        char c;
 868
 869        if (has_dos_drive_prefix(path))
 870                return 0;
 871
 872        goto inside;
 873        for (;;) {
 874                if (!c)
 875                        return 1;
 876                if (is_dir_sep(c)) {
 877inside:
 878                        if (protect_hfs) {
 879                                if (is_hfs_dotgit(path))
 880                                        return 0;
 881                                if (S_ISLNK(mode)) {
 882                                        if (is_hfs_dotgitmodules(path))
 883                                                return 0;
 884                                }
 885                        }
 886                        if (protect_ntfs) {
 887                                if (is_ntfs_dotgit(path))
 888                                        return 0;
 889                                if (S_ISLNK(mode)) {
 890                                        if (is_ntfs_dotgitmodules(path))
 891                                                return 0;
 892                                }
 893                        }
 894
 895                        c = *path++;
 896                        if ((c == '.' && !verify_dotfile(path, mode)) ||
 897                            is_dir_sep(c) || c == '\0')
 898                                return 0;
 899                }
 900                c = *path++;
 901        }
 902}
 903
 904/*
 905 * Do we have another file that has the beginning components being a
 906 * proper superset of the name we're trying to add?
 907 */
 908static int has_file_name(struct index_state *istate,
 909                         const struct cache_entry *ce, int pos, int ok_to_replace)
 910{
 911        int retval = 0;
 912        int len = ce_namelen(ce);
 913        int stage = ce_stage(ce);
 914        const char *name = ce->name;
 915
 916        while (pos < istate->cache_nr) {
 917                struct cache_entry *p = istate->cache[pos++];
 918
 919                if (len >= ce_namelen(p))
 920                        break;
 921                if (memcmp(name, p->name, len))
 922                        break;
 923                if (ce_stage(p) != stage)
 924                        continue;
 925                if (p->name[len] != '/')
 926                        continue;
 927                if (p->ce_flags & CE_REMOVE)
 928                        continue;
 929                retval = -1;
 930                if (!ok_to_replace)
 931                        break;
 932                remove_index_entry_at(istate, --pos);
 933        }
 934        return retval;
 935}
 936
 937
 938/*
 939 * Like strcmp(), but also return the offset of the first change.
 940 * If strings are equal, return the length.
 941 */
 942int strcmp_offset(const char *s1, const char *s2, size_t *first_change)
 943{
 944        size_t k;
 945
 946        if (!first_change)
 947                return strcmp(s1, s2);
 948
 949        for (k = 0; s1[k] == s2[k]; k++)
 950                if (s1[k] == '\0')
 951                        break;
 952
 953        *first_change = k;
 954        return (unsigned char)s1[k] - (unsigned char)s2[k];
 955}
 956
 957/*
 958 * Do we have another file with a pathname that is a proper
 959 * subset of the name we're trying to add?
 960 *
 961 * That is, is there another file in the index with a path
 962 * that matches a sub-directory in the given entry?
 963 */
 964static int has_dir_name(struct index_state *istate,
 965                        const struct cache_entry *ce, int pos, int ok_to_replace)
 966{
 967        int retval = 0;
 968        int stage = ce_stage(ce);
 969        const char *name = ce->name;
 970        const char *slash = name + ce_namelen(ce);
 971        size_t len_eq_last;
 972        int cmp_last = 0;
 973
 974        /*
 975         * We are frequently called during an iteration on a sorted
 976         * list of pathnames and while building a new index.  Therefore,
 977         * there is a high probability that this entry will eventually
 978         * be appended to the index, rather than inserted in the middle.
 979         * If we can confirm that, we can avoid binary searches on the
 980         * components of the pathname.
 981         *
 982         * Compare the entry's full path with the last path in the index.
 983         */
 984        if (istate->cache_nr > 0) {
 985                cmp_last = strcmp_offset(name,
 986                        istate->cache[istate->cache_nr - 1]->name,
 987                        &len_eq_last);
 988                if (cmp_last > 0) {
 989                        if (len_eq_last == 0) {
 990                                /*
 991                                 * The entry sorts AFTER the last one in the
 992                                 * index and their paths have no common prefix,
 993                                 * so there cannot be a F/D conflict.
 994                                 */
 995                                return retval;
 996                        } else {
 997                                /*
 998                                 * The entry sorts AFTER the last one in the
 999                                 * index, but has a common prefix.  Fall through
1000                                 * to the loop below to disect the entry's path
1001                                 * and see where the difference is.
1002                                 */
1003                        }
1004                } else if (cmp_last == 0) {
1005                        /*
1006                         * The entry exactly matches the last one in the
1007                         * index, but because of multiple stage and CE_REMOVE
1008                         * items, we fall through and let the regular search
1009                         * code handle it.
1010                         */
1011                }
1012        }
1013
1014        for (;;) {
1015                size_t len;
1016
1017                for (;;) {
1018                        if (*--slash == '/')
1019                                break;
1020                        if (slash <= ce->name)
1021                                return retval;
1022                }
1023                len = slash - name;
1024
1025                if (cmp_last > 0) {
1026                        /*
1027                         * (len + 1) is a directory boundary (including
1028                         * the trailing slash).  And since the loop is
1029                         * decrementing "slash", the first iteration is
1030                         * the longest directory prefix; subsequent
1031                         * iterations consider parent directories.
1032                         */
1033
1034                        if (len + 1 <= len_eq_last) {
1035                                /*
1036                                 * The directory prefix (including the trailing
1037                                 * slash) also appears as a prefix in the last
1038                                 * entry, so the remainder cannot collide (because
1039                                 * strcmp said the whole path was greater).
1040                                 *
1041                                 * EQ: last: xxx/A
1042                                 *     this: xxx/B
1043                                 *
1044                                 * LT: last: xxx/file_A
1045                                 *     this: xxx/file_B
1046                                 */
1047                                return retval;
1048                        }
1049
1050                        if (len > len_eq_last) {
1051                                /*
1052                                 * This part of the directory prefix (excluding
1053                                 * the trailing slash) is longer than the known
1054                                 * equal portions, so this sub-directory cannot
1055                                 * collide with a file.
1056                                 *
1057                                 * GT: last: xxxA
1058                                 *     this: xxxB/file
1059                                 */
1060                                return retval;
1061                        }
1062
1063                        if (istate->cache_nr > 0 &&
1064                                ce_namelen(istate->cache[istate->cache_nr - 1]) > len) {
1065                                /*
1066                                 * The directory prefix lines up with part of
1067                                 * a longer file or directory name, but sorts
1068                                 * after it, so this sub-directory cannot
1069                                 * collide with a file.
1070                                 *
1071                                 * last: xxx/yy-file (because '-' sorts before '/')
1072                                 * this: xxx/yy/abc
1073                                 */
1074                                return retval;
1075                        }
1076
1077                        /*
1078                         * This is a possible collision. Fall through and
1079                         * let the regular search code handle it.
1080                         *
1081                         * last: xxx
1082                         * this: xxx/file
1083                         */
1084                }
1085
1086                pos = index_name_stage_pos(istate, name, len, stage);
1087                if (pos >= 0) {
1088                        /*
1089                         * Found one, but not so fast.  This could
1090                         * be a marker that says "I was here, but
1091                         * I am being removed".  Such an entry is
1092                         * not a part of the resulting tree, and
1093                         * it is Ok to have a directory at the same
1094                         * path.
1095                         */
1096                        if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
1097                                retval = -1;
1098                                if (!ok_to_replace)
1099                                        break;
1100                                remove_index_entry_at(istate, pos);
1101                                continue;
1102                        }
1103                }
1104                else
1105                        pos = -pos-1;
1106
1107                /*
1108                 * Trivial optimization: if we find an entry that
1109                 * already matches the sub-directory, then we know
1110                 * we're ok, and we can exit.
1111                 */
1112                while (pos < istate->cache_nr) {
1113                        struct cache_entry *p = istate->cache[pos];
1114                        if ((ce_namelen(p) <= len) ||
1115                            (p->name[len] != '/') ||
1116                            memcmp(p->name, name, len))
1117                                break; /* not our subdirectory */
1118                        if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
1119                                /*
1120                                 * p is at the same stage as our entry, and
1121                                 * is a subdirectory of what we are looking
1122                                 * at, so we cannot have conflicts at our
1123                                 * level or anything shorter.
1124                                 */
1125                                return retval;
1126                        pos++;
1127                }
1128        }
1129        return retval;
1130}
1131
1132/* We may be in a situation where we already have path/file and path
1133 * is being added, or we already have path and path/file is being
1134 * added.  Either one would result in a nonsense tree that has path
1135 * twice when git-write-tree tries to write it out.  Prevent it.
1136 *
1137 * If ok-to-replace is specified, we remove the conflicting entries
1138 * from the cache so the caller should recompute the insert position.
1139 * When this happens, we return non-zero.
1140 */
1141static int check_file_directory_conflict(struct index_state *istate,
1142                                         const struct cache_entry *ce,
1143                                         int pos, int ok_to_replace)
1144{
1145        int retval;
1146
1147        /*
1148         * When ce is an "I am going away" entry, we allow it to be added
1149         */
1150        if (ce->ce_flags & CE_REMOVE)
1151                return 0;
1152
1153        /*
1154         * We check if the path is a sub-path of a subsequent pathname
1155         * first, since removing those will not change the position
1156         * in the array.
1157         */
1158        retval = has_file_name(istate, ce, pos, ok_to_replace);
1159
1160        /*
1161         * Then check if the path might have a clashing sub-directory
1162         * before it.
1163         */
1164        return retval + has_dir_name(istate, ce, pos, ok_to_replace);
1165}
1166
1167static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
1168{
1169        int pos;
1170        int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
1171        int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
1172        int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
1173        int new_only = option & ADD_CACHE_NEW_ONLY;
1174
1175        if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1176                cache_tree_invalidate_path(istate, ce->name);
1177
1178        /*
1179         * If this entry's path sorts after the last entry in the index,
1180         * we can avoid searching for it.
1181         */
1182        if (istate->cache_nr > 0 &&
1183                strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
1184                pos = -istate->cache_nr - 1;
1185        else
1186                pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
1187
1188        /* existing match? Just replace it. */
1189        if (pos >= 0) {
1190                if (!new_only)
1191                        replace_index_entry(istate, pos, ce);
1192                return 0;
1193        }
1194        pos = -pos-1;
1195
1196        if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1197                untracked_cache_add_to_index(istate, ce->name);
1198
1199        /*
1200         * Inserting a merged entry ("stage 0") into the index
1201         * will always replace all non-merged entries..
1202         */
1203        if (pos < istate->cache_nr && ce_stage(ce) == 0) {
1204                while (ce_same_name(istate->cache[pos], ce)) {
1205                        ok_to_add = 1;
1206                        if (!remove_index_entry_at(istate, pos))
1207                                break;
1208                }
1209        }
1210
1211        if (!ok_to_add)
1212                return -1;
1213        if (!verify_path(ce->name, ce->ce_mode))
1214                return error("Invalid path '%s'", ce->name);
1215
1216        if (!skip_df_check &&
1217            check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
1218                if (!ok_to_replace)
1219                        return error("'%s' appears as both a file and as a directory",
1220                                     ce->name);
1221                pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
1222                pos = -pos-1;
1223        }
1224        return pos + 1;
1225}
1226
1227int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1228{
1229        int pos;
1230
1231        if (option & ADD_CACHE_JUST_APPEND)
1232                pos = istate->cache_nr;
1233        else {
1234                int ret;
1235                ret = add_index_entry_with_check(istate, ce, option);
1236                if (ret <= 0)
1237                        return ret;
1238                pos = ret - 1;
1239        }
1240
1241        /* Make sure the array is big enough .. */
1242        ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1243
1244        /* Add it in.. */
1245        istate->cache_nr++;
1246        if (istate->cache_nr > pos + 1)
1247                MOVE_ARRAY(istate->cache + pos + 1, istate->cache + pos,
1248                           istate->cache_nr - pos - 1);
1249        set_index_entry(istate, pos, ce);
1250        istate->cache_changed |= CE_ENTRY_ADDED;
1251        return 0;
1252}
1253
1254/*
1255 * "refresh" does not calculate a new sha1 file or bring the
1256 * cache up-to-date for mode/content changes. But what it
1257 * _does_ do is to "re-match" the stat information of a file
1258 * with the cache, so that you can refresh the cache for a
1259 * file that hasn't been changed but where the stat entry is
1260 * out of date.
1261 *
1262 * For example, you'd want to do this after doing a "git-read-tree",
1263 * to link up the stat cache details with the proper files.
1264 */
1265static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1266                                             struct cache_entry *ce,
1267                                             unsigned int options, int *err,
1268                                             int *changed_ret)
1269{
1270        struct stat st;
1271        struct cache_entry *updated;
1272        int changed, size;
1273        int refresh = options & CE_MATCH_REFRESH;
1274        int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1275        int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1276        int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
1277        int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
1278
1279        if (!refresh || ce_uptodate(ce))
1280                return ce;
1281
1282        if (!ignore_fsmonitor)
1283                refresh_fsmonitor(istate);
1284        /*
1285         * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1286         * that the change to the work tree does not matter and told
1287         * us not to worry.
1288         */
1289        if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1290                ce_mark_uptodate(ce);
1291                return ce;
1292        }
1293        if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1294                ce_mark_uptodate(ce);
1295                return ce;
1296        }
1297        if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) {
1298                ce_mark_uptodate(ce);
1299                return ce;
1300        }
1301
1302        if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1303                if (ignore_missing)
1304                        return ce;
1305                if (err)
1306                        *err = ENOENT;
1307                return NULL;
1308        }
1309
1310        if (lstat(ce->name, &st) < 0) {
1311                if (ignore_missing && errno == ENOENT)
1312                        return ce;
1313                if (err)
1314                        *err = errno;
1315                return NULL;
1316        }
1317
1318        changed = ie_match_stat(istate, ce, &st, options);
1319        if (changed_ret)
1320                *changed_ret = changed;
1321        if (!changed) {
1322                /*
1323                 * The path is unchanged.  If we were told to ignore
1324                 * valid bit, then we did the actual stat check and
1325                 * found that the entry is unmodified.  If the entry
1326                 * is not marked VALID, this is the place to mark it
1327                 * valid again, under "assume unchanged" mode.
1328                 */
1329                if (ignore_valid && assume_unchanged &&
1330                    !(ce->ce_flags & CE_VALID))
1331                        ; /* mark this one VALID again */
1332                else {
1333                        /*
1334                         * We do not mark the index itself "modified"
1335                         * because CE_UPTODATE flag is in-core only;
1336                         * we are not going to write this change out.
1337                         */
1338                        if (!S_ISGITLINK(ce->ce_mode)) {
1339                                ce_mark_uptodate(ce);
1340                                mark_fsmonitor_valid(ce);
1341                        }
1342                        return ce;
1343                }
1344        }
1345
1346        if (ie_modified(istate, ce, &st, options)) {
1347                if (err)
1348                        *err = EINVAL;
1349                return NULL;
1350        }
1351
1352        size = ce_size(ce);
1353        updated = xmalloc(size);
1354        copy_cache_entry(updated, ce);
1355        memcpy(updated->name, ce->name, ce->ce_namelen + 1);
1356        fill_stat_cache_info(updated, &st);
1357        /*
1358         * If ignore_valid is not set, we should leave CE_VALID bit
1359         * alone.  Otherwise, paths marked with --no-assume-unchanged
1360         * (i.e. things to be edited) will reacquire CE_VALID bit
1361         * automatically, which is not really what we want.
1362         */
1363        if (!ignore_valid && assume_unchanged &&
1364            !(ce->ce_flags & CE_VALID))
1365                updated->ce_flags &= ~CE_VALID;
1366
1367        /* istate->cache_changed is updated in the caller */
1368        return updated;
1369}
1370
1371static void show_file(const char * fmt, const char * name, int in_porcelain,
1372                      int * first, const char *header_msg)
1373{
1374        if (in_porcelain && *first && header_msg) {
1375                printf("%s\n", header_msg);
1376                *first = 0;
1377        }
1378        printf(fmt, name);
1379}
1380
1381int refresh_index(struct index_state *istate, unsigned int flags,
1382                  const struct pathspec *pathspec,
1383                  char *seen, const char *header_msg)
1384{
1385        int i;
1386        int has_errors = 0;
1387        int really = (flags & REFRESH_REALLY) != 0;
1388        int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1389        int quiet = (flags & REFRESH_QUIET) != 0;
1390        int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1391        int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1392        int first = 1;
1393        int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1394        unsigned int options = (CE_MATCH_REFRESH |
1395                                (really ? CE_MATCH_IGNORE_VALID : 0) |
1396                                (not_new ? CE_MATCH_IGNORE_MISSING : 0));
1397        const char *modified_fmt;
1398        const char *deleted_fmt;
1399        const char *typechange_fmt;
1400        const char *added_fmt;
1401        const char *unmerged_fmt;
1402        uint64_t start = getnanotime();
1403
1404        modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1405        deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1406        typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1407        added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
1408        unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1409        for (i = 0; i < istate->cache_nr; i++) {
1410                struct cache_entry *ce, *new_entry;
1411                int cache_errno = 0;
1412                int changed = 0;
1413                int filtered = 0;
1414
1415                ce = istate->cache[i];
1416                if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1417                        continue;
1418
1419                if (pathspec && !ce_path_match(ce, pathspec, seen))
1420                        filtered = 1;
1421
1422                if (ce_stage(ce)) {
1423                        while ((i < istate->cache_nr) &&
1424                               ! strcmp(istate->cache[i]->name, ce->name))
1425                                i++;
1426                        i--;
1427                        if (allow_unmerged)
1428                                continue;
1429                        if (!filtered)
1430                                show_file(unmerged_fmt, ce->name, in_porcelain,
1431                                          &first, header_msg);
1432                        has_errors = 1;
1433                        continue;
1434                }
1435
1436                if (filtered)
1437                        continue;
1438
1439                new_entry = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1440                if (new_entry == ce)
1441                        continue;
1442                if (!new_entry) {
1443                        const char *fmt;
1444
1445                        if (really && cache_errno == EINVAL) {
1446                                /* If we are doing --really-refresh that
1447                                 * means the index is not valid anymore.
1448                                 */
1449                                ce->ce_flags &= ~CE_VALID;
1450                                ce->ce_flags |= CE_UPDATE_IN_BASE;
1451                                mark_fsmonitor_invalid(istate, ce);
1452                                istate->cache_changed |= CE_ENTRY_CHANGED;
1453                        }
1454                        if (quiet)
1455                                continue;
1456
1457                        if (cache_errno == ENOENT)
1458                                fmt = deleted_fmt;
1459                        else if (ce_intent_to_add(ce))
1460                                fmt = added_fmt; /* must be before other checks */
1461                        else if (changed & TYPE_CHANGED)
1462                                fmt = typechange_fmt;
1463                        else
1464                                fmt = modified_fmt;
1465                        show_file(fmt,
1466                                  ce->name, in_porcelain, &first, header_msg);
1467                        has_errors = 1;
1468                        continue;
1469                }
1470
1471                replace_index_entry(istate, i, new_entry);
1472        }
1473        trace_performance_since(start, "refresh index");
1474        return has_errors;
1475}
1476
1477struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1478                                               unsigned int options)
1479{
1480        return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1481}
1482
1483
1484/*****************************************************************
1485 * Index File I/O
1486 *****************************************************************/
1487
1488#define INDEX_FORMAT_DEFAULT 3
1489
1490static unsigned int get_index_format_default(void)
1491{
1492        char *envversion = getenv("GIT_INDEX_VERSION");
1493        char *endp;
1494        int value;
1495        unsigned int version = INDEX_FORMAT_DEFAULT;
1496
1497        if (!envversion) {
1498                if (!git_config_get_int("index.version", &value))
1499                        version = value;
1500                if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1501                        warning(_("index.version set, but the value is invalid.\n"
1502                                  "Using version %i"), INDEX_FORMAT_DEFAULT);
1503                        return INDEX_FORMAT_DEFAULT;
1504                }
1505                return version;
1506        }
1507
1508        version = strtoul(envversion, &endp, 10);
1509        if (*endp ||
1510            version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1511                warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1512                          "Using version %i"), INDEX_FORMAT_DEFAULT);
1513                version = INDEX_FORMAT_DEFAULT;
1514        }
1515        return version;
1516}
1517
1518/*
1519 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1520 * Again - this is just a (very strong in practice) heuristic that
1521 * the inode hasn't changed.
1522 *
1523 * We save the fields in big-endian order to allow using the
1524 * index file over NFS transparently.
1525 */
1526struct ondisk_cache_entry {
1527        struct cache_time ctime;
1528        struct cache_time mtime;
1529        uint32_t dev;
1530        uint32_t ino;
1531        uint32_t mode;
1532        uint32_t uid;
1533        uint32_t gid;
1534        uint32_t size;
1535        unsigned char sha1[20];
1536        uint16_t flags;
1537        char name[FLEX_ARRAY]; /* more */
1538};
1539
1540/*
1541 * This struct is used when CE_EXTENDED bit is 1
1542 * The struct must match ondisk_cache_entry exactly from
1543 * ctime till flags
1544 */
1545struct ondisk_cache_entry_extended {
1546        struct cache_time ctime;
1547        struct cache_time mtime;
1548        uint32_t dev;
1549        uint32_t ino;
1550        uint32_t mode;
1551        uint32_t uid;
1552        uint32_t gid;
1553        uint32_t size;
1554        unsigned char sha1[20];
1555        uint16_t flags;
1556        uint16_t flags2;
1557        char name[FLEX_ARRAY]; /* more */
1558};
1559
1560/* These are only used for v3 or lower */
1561#define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1562#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1563#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1564#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1565#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1566                            ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1567                            ondisk_cache_entry_size(ce_namelen(ce)))
1568
1569/* Allow fsck to force verification of the index checksum. */
1570int verify_index_checksum;
1571
1572/* Allow fsck to force verification of the cache entry order. */
1573int verify_ce_order;
1574
1575static int verify_hdr(struct cache_header *hdr, unsigned long size)
1576{
1577        git_hash_ctx c;
1578        unsigned char hash[GIT_MAX_RAWSZ];
1579        int hdr_version;
1580
1581        if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1582                return error("bad signature");
1583        hdr_version = ntohl(hdr->hdr_version);
1584        if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1585                return error("bad index version %d", hdr_version);
1586
1587        if (!verify_index_checksum)
1588                return 0;
1589
1590        the_hash_algo->init_fn(&c);
1591        the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz);
1592        the_hash_algo->final_fn(hash, &c);
1593        if (hashcmp(hash, (unsigned char *)hdr + size - the_hash_algo->rawsz))
1594                return error("bad index file sha1 signature");
1595        return 0;
1596}
1597
1598static int read_index_extension(struct index_state *istate,
1599                                const char *ext, void *data, unsigned long sz)
1600{
1601        switch (CACHE_EXT(ext)) {
1602        case CACHE_EXT_TREE:
1603                istate->cache_tree = cache_tree_read(data, sz);
1604                break;
1605        case CACHE_EXT_RESOLVE_UNDO:
1606                istate->resolve_undo = resolve_undo_read(data, sz);
1607                break;
1608        case CACHE_EXT_LINK:
1609                if (read_link_extension(istate, data, sz))
1610                        return -1;
1611                break;
1612        case CACHE_EXT_UNTRACKED:
1613                istate->untracked = read_untracked_extension(data, sz);
1614                break;
1615        case CACHE_EXT_FSMONITOR:
1616                read_fsmonitor_extension(istate, data, sz);
1617                break;
1618        default:
1619                if (*ext < 'A' || 'Z' < *ext)
1620                        return error("index uses %.4s extension, which we do not understand",
1621                                     ext);
1622                fprintf(stderr, "ignoring %.4s extension\n", ext);
1623                break;
1624        }
1625        return 0;
1626}
1627
1628int hold_locked_index(struct lock_file *lk, int lock_flags)
1629{
1630        return hold_lock_file_for_update(lk, get_index_file(), lock_flags);
1631}
1632
1633int read_index(struct index_state *istate)
1634{
1635        return read_index_from(istate, get_index_file(), get_git_dir());
1636}
1637
1638static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1639                                                   unsigned int flags,
1640                                                   const char *name,
1641                                                   size_t len)
1642{
1643        struct cache_entry *ce = xmalloc(cache_entry_size(len));
1644
1645        ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1646        ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1647        ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1648        ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1649        ce->ce_stat_data.sd_dev   = get_be32(&ondisk->dev);
1650        ce->ce_stat_data.sd_ino   = get_be32(&ondisk->ino);
1651        ce->ce_mode  = get_be32(&ondisk->mode);
1652        ce->ce_stat_data.sd_uid   = get_be32(&ondisk->uid);
1653        ce->ce_stat_data.sd_gid   = get_be32(&ondisk->gid);
1654        ce->ce_stat_data.sd_size  = get_be32(&ondisk->size);
1655        ce->ce_flags = flags & ~CE_NAMEMASK;
1656        ce->ce_namelen = len;
1657        ce->index = 0;
1658        hashcpy(ce->oid.hash, ondisk->sha1);
1659        memcpy(ce->name, name, len);
1660        ce->name[len] = '\0';
1661        return ce;
1662}
1663
1664/*
1665 * Adjacent cache entries tend to share the leading paths, so it makes
1666 * sense to only store the differences in later entries.  In the v4
1667 * on-disk format of the index, each on-disk cache entry stores the
1668 * number of bytes to be stripped from the end of the previous name,
1669 * and the bytes to append to the result, to come up with its name.
1670 */
1671static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1672{
1673        const unsigned char *ep, *cp = (const unsigned char *)cp_;
1674        size_t len = decode_varint(&cp);
1675
1676        if (name->len < len)
1677                die("malformed name field in the index");
1678        strbuf_remove(name, name->len - len, len);
1679        for (ep = cp; *ep; ep++)
1680                ; /* find the end */
1681        strbuf_add(name, cp, ep - cp);
1682        return (const char *)ep + 1 - cp_;
1683}
1684
1685static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1686                                            unsigned long *ent_size,
1687                                            struct strbuf *previous_name)
1688{
1689        struct cache_entry *ce;
1690        size_t len;
1691        const char *name;
1692        unsigned int flags;
1693
1694        /* On-disk flags are just 16 bits */
1695        flags = get_be16(&ondisk->flags);
1696        len = flags & CE_NAMEMASK;
1697
1698        if (flags & CE_EXTENDED) {
1699                struct ondisk_cache_entry_extended *ondisk2;
1700                int extended_flags;
1701                ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1702                extended_flags = get_be16(&ondisk2->flags2) << 16;
1703                /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1704                if (extended_flags & ~CE_EXTENDED_FLAGS)
1705                        die("Unknown index entry format %08x", extended_flags);
1706                flags |= extended_flags;
1707                name = ondisk2->name;
1708        }
1709        else
1710                name = ondisk->name;
1711
1712        if (!previous_name) {
1713                /* v3 and earlier */
1714                if (len == CE_NAMEMASK)
1715                        len = strlen(name);
1716                ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1717
1718                *ent_size = ondisk_ce_size(ce);
1719        } else {
1720                unsigned long consumed;
1721                consumed = expand_name_field(previous_name, name);
1722                ce = cache_entry_from_ondisk(ondisk, flags,
1723                                             previous_name->buf,
1724                                             previous_name->len);
1725
1726                *ent_size = (name - ((char *)ondisk)) + consumed;
1727        }
1728        return ce;
1729}
1730
1731static void check_ce_order(struct index_state *istate)
1732{
1733        unsigned int i;
1734
1735        if (!verify_ce_order)
1736                return;
1737
1738        for (i = 1; i < istate->cache_nr; i++) {
1739                struct cache_entry *ce = istate->cache[i - 1];
1740                struct cache_entry *next_ce = istate->cache[i];
1741                int name_compare = strcmp(ce->name, next_ce->name);
1742
1743                if (0 < name_compare)
1744                        die("unordered stage entries in index");
1745                if (!name_compare) {
1746                        if (!ce_stage(ce))
1747                                die("multiple stage entries for merged file '%s'",
1748                                    ce->name);
1749                        if (ce_stage(ce) > ce_stage(next_ce))
1750                                die("unordered stage entries for '%s'",
1751                                    ce->name);
1752                }
1753        }
1754}
1755
1756static void tweak_untracked_cache(struct index_state *istate)
1757{
1758        switch (git_config_get_untracked_cache()) {
1759        case -1: /* keep: do nothing */
1760                break;
1761        case 0: /* false */
1762                remove_untracked_cache(istate);
1763                break;
1764        case 1: /* true */
1765                add_untracked_cache(istate);
1766                break;
1767        default: /* unknown value: do nothing */
1768                break;
1769        }
1770}
1771
1772static void tweak_split_index(struct index_state *istate)
1773{
1774        switch (git_config_get_split_index()) {
1775        case -1: /* unset: do nothing */
1776                break;
1777        case 0: /* false */
1778                remove_split_index(istate);
1779                break;
1780        case 1: /* true */
1781                add_split_index(istate);
1782                break;
1783        default: /* unknown value: do nothing */
1784                break;
1785        }
1786}
1787
1788static void post_read_index_from(struct index_state *istate)
1789{
1790        check_ce_order(istate);
1791        tweak_untracked_cache(istate);
1792        tweak_split_index(istate);
1793        tweak_fsmonitor(istate);
1794}
1795
1796/* remember to discard_cache() before reading a different cache! */
1797int do_read_index(struct index_state *istate, const char *path, int must_exist)
1798{
1799        int fd, i;
1800        struct stat st;
1801        unsigned long src_offset;
1802        struct cache_header *hdr;
1803        void *mmap;
1804        size_t mmap_size;
1805        struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1806
1807        if (istate->initialized)
1808                return istate->cache_nr;
1809
1810        istate->timestamp.sec = 0;
1811        istate->timestamp.nsec = 0;
1812        fd = open(path, O_RDONLY);
1813        if (fd < 0) {
1814                if (!must_exist && errno == ENOENT)
1815                        return 0;
1816                die_errno("%s: index file open failed", path);
1817        }
1818
1819        if (fstat(fd, &st))
1820                die_errno("cannot stat the open index");
1821
1822        mmap_size = xsize_t(st.st_size);
1823        if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
1824                die("index file smaller than expected");
1825
1826        mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
1827        if (mmap == MAP_FAILED)
1828                die_errno("unable to map index file");
1829        close(fd);
1830
1831        hdr = mmap;
1832        if (verify_hdr(hdr, mmap_size) < 0)
1833                goto unmap;
1834
1835        hashcpy(istate->oid.hash, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);
1836        istate->version = ntohl(hdr->hdr_version);
1837        istate->cache_nr = ntohl(hdr->hdr_entries);
1838        istate->cache_alloc = alloc_nr(istate->cache_nr);
1839        istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1840        istate->initialized = 1;
1841
1842        if (istate->version == 4)
1843                previous_name = &previous_name_buf;
1844        else
1845                previous_name = NULL;
1846
1847        src_offset = sizeof(*hdr);
1848        for (i = 0; i < istate->cache_nr; i++) {
1849                struct ondisk_cache_entry *disk_ce;
1850                struct cache_entry *ce;
1851                unsigned long consumed;
1852
1853                disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1854                ce = create_from_disk(disk_ce, &consumed, previous_name);
1855                set_index_entry(istate, i, ce);
1856
1857                src_offset += consumed;
1858        }
1859        strbuf_release(&previous_name_buf);
1860        istate->timestamp.sec = st.st_mtime;
1861        istate->timestamp.nsec = ST_MTIME_NSEC(st);
1862
1863        while (src_offset <= mmap_size - the_hash_algo->rawsz - 8) {
1864                /* After an array of active_nr index entries,
1865                 * there can be arbitrary number of extended
1866                 * sections, each of which is prefixed with
1867                 * extension name (4-byte) and section length
1868                 * in 4-byte network byte order.
1869                 */
1870                uint32_t extsize;
1871                memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1872                extsize = ntohl(extsize);
1873                if (read_index_extension(istate,
1874                                         (const char *) mmap + src_offset,
1875                                         (char *) mmap + src_offset + 8,
1876                                         extsize) < 0)
1877                        goto unmap;
1878                src_offset += 8;
1879                src_offset += extsize;
1880        }
1881        munmap(mmap, mmap_size);
1882        return istate->cache_nr;
1883
1884unmap:
1885        munmap(mmap, mmap_size);
1886        die("index file corrupt");
1887}
1888
1889/*
1890 * Signal that the shared index is used by updating its mtime.
1891 *
1892 * This way, shared index can be removed if they have not been used
1893 * for some time.
1894 */
1895static void freshen_shared_index(const char *shared_index, int warn)
1896{
1897        if (!check_and_freshen_file(shared_index, 1) && warn)
1898                warning("could not freshen shared index '%s'", shared_index);
1899}
1900
1901int read_index_from(struct index_state *istate, const char *path,
1902                    const char *gitdir)
1903{
1904        uint64_t start = getnanotime();
1905        struct split_index *split_index;
1906        int ret;
1907        char *base_oid_hex;
1908        char *base_path;
1909
1910        /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1911        if (istate->initialized)
1912                return istate->cache_nr;
1913
1914        ret = do_read_index(istate, path, 0);
1915        trace_performance_since(start, "read cache %s", path);
1916
1917        split_index = istate->split_index;
1918        if (!split_index || is_null_oid(&split_index->base_oid)) {
1919                post_read_index_from(istate);
1920                return ret;
1921        }
1922
1923        if (split_index->base)
1924                discard_index(split_index->base);
1925        else
1926                split_index->base = xcalloc(1, sizeof(*split_index->base));
1927
1928        base_oid_hex = oid_to_hex(&split_index->base_oid);
1929        base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
1930        ret = do_read_index(split_index->base, base_path, 1);
1931        if (oidcmp(&split_index->base_oid, &split_index->base->oid))
1932                die("broken index, expect %s in %s, got %s",
1933                    base_oid_hex, base_path,
1934                    oid_to_hex(&split_index->base->oid));
1935
1936        freshen_shared_index(base_path, 0);
1937        merge_base_index(istate);
1938        post_read_index_from(istate);
1939        trace_performance_since(start, "read cache %s", base_path);
1940        free(base_path);
1941        return ret;
1942}
1943
1944int is_index_unborn(struct index_state *istate)
1945{
1946        return (!istate->cache_nr && !istate->timestamp.sec);
1947}
1948
1949int discard_index(struct index_state *istate)
1950{
1951        int i;
1952
1953        for (i = 0; i < istate->cache_nr; i++) {
1954                if (istate->cache[i]->index &&
1955                    istate->split_index &&
1956                    istate->split_index->base &&
1957                    istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1958                    istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1959                        continue;
1960                free(istate->cache[i]);
1961        }
1962        resolve_undo_clear_index(istate);
1963        istate->cache_nr = 0;
1964        istate->cache_changed = 0;
1965        istate->timestamp.sec = 0;
1966        istate->timestamp.nsec = 0;
1967        free_name_hash(istate);
1968        cache_tree_free(&(istate->cache_tree));
1969        istate->initialized = 0;
1970        FREE_AND_NULL(istate->cache);
1971        istate->cache_alloc = 0;
1972        discard_split_index(istate);
1973        free_untracked_cache(istate->untracked);
1974        istate->untracked = NULL;
1975        return 0;
1976}
1977
1978int unmerged_index(const struct index_state *istate)
1979{
1980        int i;
1981        for (i = 0; i < istate->cache_nr; i++) {
1982                if (ce_stage(istate->cache[i]))
1983                        return 1;
1984        }
1985        return 0;
1986}
1987
1988#define WRITE_BUFFER_SIZE 8192
1989static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1990static unsigned long write_buffer_len;
1991
1992static int ce_write_flush(git_hash_ctx *context, int fd)
1993{
1994        unsigned int buffered = write_buffer_len;
1995        if (buffered) {
1996                the_hash_algo->update_fn(context, write_buffer, buffered);
1997                if (write_in_full(fd, write_buffer, buffered) < 0)
1998                        return -1;
1999                write_buffer_len = 0;
2000        }
2001        return 0;
2002}
2003
2004static int ce_write(git_hash_ctx *context, int fd, void *data, unsigned int len)
2005{
2006        while (len) {
2007                unsigned int buffered = write_buffer_len;
2008                unsigned int partial = WRITE_BUFFER_SIZE - buffered;
2009                if (partial > len)
2010                        partial = len;
2011                memcpy(write_buffer + buffered, data, partial);
2012                buffered += partial;
2013                if (buffered == WRITE_BUFFER_SIZE) {
2014                        write_buffer_len = buffered;
2015                        if (ce_write_flush(context, fd))
2016                                return -1;
2017                        buffered = 0;
2018                }
2019                write_buffer_len = buffered;
2020                len -= partial;
2021                data = (char *) data + partial;
2022        }
2023        return 0;
2024}
2025
2026static int write_index_ext_header(git_hash_ctx *context, int fd,
2027                                  unsigned int ext, unsigned int sz)
2028{
2029        ext = htonl(ext);
2030        sz = htonl(sz);
2031        return ((ce_write(context, fd, &ext, 4) < 0) ||
2032                (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
2033}
2034
2035static int ce_flush(git_hash_ctx *context, int fd, unsigned char *hash)
2036{
2037        unsigned int left = write_buffer_len;
2038
2039        if (left) {
2040                write_buffer_len = 0;
2041                the_hash_algo->update_fn(context, write_buffer, left);
2042        }
2043
2044        /* Flush first if not enough space for hash signature */
2045        if (left + the_hash_algo->rawsz > WRITE_BUFFER_SIZE) {
2046                if (write_in_full(fd, write_buffer, left) < 0)
2047                        return -1;
2048                left = 0;
2049        }
2050
2051        /* Append the hash signature at the end */
2052        the_hash_algo->final_fn(write_buffer + left, context);
2053        hashcpy(hash, write_buffer + left);
2054        left += the_hash_algo->rawsz;
2055        return (write_in_full(fd, write_buffer, left) < 0) ? -1 : 0;
2056}
2057
2058static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
2059{
2060        /*
2061         * The only thing we care about in this function is to smudge the
2062         * falsely clean entry due to touch-update-touch race, so we leave
2063         * everything else as they are.  We are called for entries whose
2064         * ce_stat_data.sd_mtime match the index file mtime.
2065         *
2066         * Note that this actually does not do much for gitlinks, for
2067         * which ce_match_stat_basic() always goes to the actual
2068         * contents.  The caller checks with is_racy_timestamp() which
2069         * always says "no" for gitlinks, so we are not called for them ;-)
2070         */
2071        struct stat st;
2072
2073        if (lstat(ce->name, &st) < 0)
2074                return;
2075        if (ce_match_stat_basic(ce, &st))
2076                return;
2077        if (ce_modified_check_fs(ce, &st)) {
2078                /* This is "racily clean"; smudge it.  Note that this
2079                 * is a tricky code.  At first glance, it may appear
2080                 * that it can break with this sequence:
2081                 *
2082                 * $ echo xyzzy >frotz
2083                 * $ git-update-index --add frotz
2084                 * $ : >frotz
2085                 * $ sleep 3
2086                 * $ echo filfre >nitfol
2087                 * $ git-update-index --add nitfol
2088                 *
2089                 * but it does not.  When the second update-index runs,
2090                 * it notices that the entry "frotz" has the same timestamp
2091                 * as index, and if we were to smudge it by resetting its
2092                 * size to zero here, then the object name recorded
2093                 * in index is the 6-byte file but the cached stat information
2094                 * becomes zero --- which would then match what we would
2095                 * obtain from the filesystem next time we stat("frotz").
2096                 *
2097                 * However, the second update-index, before calling
2098                 * this function, notices that the cached size is 6
2099                 * bytes and what is on the filesystem is an empty
2100                 * file, and never calls us, so the cached size information
2101                 * for "frotz" stays 6 which does not match the filesystem.
2102                 */
2103                ce->ce_stat_data.sd_size = 0;
2104        }
2105}
2106
2107/* Copy miscellaneous fields but not the name */
2108static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
2109                                       struct cache_entry *ce)
2110{
2111        short flags;
2112
2113        ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
2114        ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
2115        ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
2116        ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
2117        ondisk->dev  = htonl(ce->ce_stat_data.sd_dev);
2118        ondisk->ino  = htonl(ce->ce_stat_data.sd_ino);
2119        ondisk->mode = htonl(ce->ce_mode);
2120        ondisk->uid  = htonl(ce->ce_stat_data.sd_uid);
2121        ondisk->gid  = htonl(ce->ce_stat_data.sd_gid);
2122        ondisk->size = htonl(ce->ce_stat_data.sd_size);
2123        hashcpy(ondisk->sha1, ce->oid.hash);
2124
2125        flags = ce->ce_flags & ~CE_NAMEMASK;
2126        flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
2127        ondisk->flags = htons(flags);
2128        if (ce->ce_flags & CE_EXTENDED) {
2129                struct ondisk_cache_entry_extended *ondisk2;
2130                ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
2131                ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
2132        }
2133}
2134
2135static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
2136                          struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
2137{
2138        int size;
2139        int result;
2140        unsigned int saved_namelen;
2141        int stripped_name = 0;
2142        static unsigned char padding[8] = { 0x00 };
2143
2144        if (ce->ce_flags & CE_STRIP_NAME) {
2145                saved_namelen = ce_namelen(ce);
2146                ce->ce_namelen = 0;
2147                stripped_name = 1;
2148        }
2149
2150        if (ce->ce_flags & CE_EXTENDED)
2151                size = offsetof(struct ondisk_cache_entry_extended, name);
2152        else
2153                size = offsetof(struct ondisk_cache_entry, name);
2154
2155        if (!previous_name) {
2156                int len = ce_namelen(ce);
2157                copy_cache_entry_to_ondisk(ondisk, ce);
2158                result = ce_write(c, fd, ondisk, size);
2159                if (!result)
2160                        result = ce_write(c, fd, ce->name, len);
2161                if (!result)
2162                        result = ce_write(c, fd, padding, align_padding_size(size, len));
2163        } else {
2164                int common, to_remove, prefix_size;
2165                unsigned char to_remove_vi[16];
2166                for (common = 0;
2167                     (ce->name[common] &&
2168                      common < previous_name->len &&
2169                      ce->name[common] == previous_name->buf[common]);
2170                     common++)
2171                        ; /* still matching */
2172                to_remove = previous_name->len - common;
2173                prefix_size = encode_varint(to_remove, to_remove_vi);
2174
2175                copy_cache_entry_to_ondisk(ondisk, ce);
2176                result = ce_write(c, fd, ondisk, size);
2177                if (!result)
2178                        result = ce_write(c, fd, to_remove_vi, prefix_size);
2179                if (!result)
2180                        result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common);
2181                if (!result)
2182                        result = ce_write(c, fd, padding, 1);
2183
2184                strbuf_splice(previous_name, common, to_remove,
2185                              ce->name + common, ce_namelen(ce) - common);
2186        }
2187        if (stripped_name) {
2188                ce->ce_namelen = saved_namelen;
2189                ce->ce_flags &= ~CE_STRIP_NAME;
2190        }
2191
2192        return result;
2193}
2194
2195/*
2196 * This function verifies if index_state has the correct sha1 of the
2197 * index file.  Don't die if we have any other failure, just return 0.
2198 */
2199static int verify_index_from(const struct index_state *istate, const char *path)
2200{
2201        int fd;
2202        ssize_t n;
2203        struct stat st;
2204        unsigned char hash[GIT_MAX_RAWSZ];
2205
2206        if (!istate->initialized)
2207                return 0;
2208
2209        fd = open(path, O_RDONLY);
2210        if (fd < 0)
2211                return 0;
2212
2213        if (fstat(fd, &st))
2214                goto out;
2215
2216        if (st.st_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
2217                goto out;
2218
2219        n = pread_in_full(fd, hash, the_hash_algo->rawsz, st.st_size - the_hash_algo->rawsz);
2220        if (n != the_hash_algo->rawsz)
2221                goto out;
2222
2223        if (hashcmp(istate->oid.hash, hash))
2224                goto out;
2225
2226        close(fd);
2227        return 1;
2228
2229out:
2230        close(fd);
2231        return 0;
2232}
2233
2234static int verify_index(const struct index_state *istate)
2235{
2236        return verify_index_from(istate, get_index_file());
2237}
2238
2239static int has_racy_timestamp(struct index_state *istate)
2240{
2241        int entries = istate->cache_nr;
2242        int i;
2243
2244        for (i = 0; i < entries; i++) {
2245                struct cache_entry *ce = istate->cache[i];
2246                if (is_racy_timestamp(istate, ce))
2247                        return 1;
2248        }
2249        return 0;
2250}
2251
2252void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
2253{
2254        if ((istate->cache_changed || has_racy_timestamp(istate)) &&
2255            verify_index(istate))
2256                write_locked_index(istate, lockfile, COMMIT_LOCK);
2257        else
2258                rollback_lock_file(lockfile);
2259}
2260
2261/*
2262 * On success, `tempfile` is closed. If it is the temporary file
2263 * of a `struct lock_file`, we will therefore effectively perform
2264 * a 'close_lock_file_gently()`. Since that is an implementation
2265 * detail of lockfiles, callers of `do_write_index()` should not
2266 * rely on it.
2267 */
2268static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
2269                          int strip_extensions)
2270{
2271        uint64_t start = getnanotime();
2272        int newfd = tempfile->fd;
2273        git_hash_ctx c;
2274        struct cache_header hdr;
2275        int i, err = 0, removed, extended, hdr_version;
2276        struct cache_entry **cache = istate->cache;
2277        int entries = istate->cache_nr;
2278        struct stat st;
2279        struct ondisk_cache_entry_extended ondisk;
2280        struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
2281        int drop_cache_tree = istate->drop_cache_tree;
2282
2283        for (i = removed = extended = 0; i < entries; i++) {
2284                if (cache[i]->ce_flags & CE_REMOVE)
2285                        removed++;
2286
2287                /* reduce extended entries if possible */
2288                cache[i]->ce_flags &= ~CE_EXTENDED;
2289                if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
2290                        extended++;
2291                        cache[i]->ce_flags |= CE_EXTENDED;
2292                }
2293        }
2294
2295        if (!istate->version) {
2296                istate->version = get_index_format_default();
2297                if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
2298                        init_split_index(istate);
2299        }
2300
2301        /* demote version 3 to version 2 when the latter suffices */
2302        if (istate->version == 3 || istate->version == 2)
2303                istate->version = extended ? 3 : 2;
2304
2305        hdr_version = istate->version;
2306
2307        hdr.hdr_signature = htonl(CACHE_SIGNATURE);
2308        hdr.hdr_version = htonl(hdr_version);
2309        hdr.hdr_entries = htonl(entries - removed);
2310
2311        the_hash_algo->init_fn(&c);
2312        if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
2313                return -1;
2314
2315        previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
2316
2317        for (i = 0; i < entries; i++) {
2318                struct cache_entry *ce = cache[i];
2319                if (ce->ce_flags & CE_REMOVE)
2320                        continue;
2321                if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
2322                        ce_smudge_racily_clean_entry(ce);
2323                if (is_null_oid(&ce->oid)) {
2324                        static const char msg[] = "cache entry has null sha1: %s";
2325                        static int allow = -1;
2326
2327                        if (allow < 0)
2328                                allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2329                        if (allow)
2330                                warning(msg, ce->name);
2331                        else
2332                                err = error(msg, ce->name);
2333
2334                        drop_cache_tree = 1;
2335                }
2336                if (ce_write_entry(&c, newfd, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
2337                        err = -1;
2338
2339                if (err)
2340                        break;
2341        }
2342        strbuf_release(&previous_name_buf);
2343
2344        if (err)
2345                return err;
2346
2347        /* Write extension data here */
2348        if (!strip_extensions && istate->split_index) {
2349                struct strbuf sb = STRBUF_INIT;
2350
2351                err = write_link_extension(&sb, istate) < 0 ||
2352                        write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
2353                                               sb.len) < 0 ||
2354                        ce_write(&c, newfd, sb.buf, sb.len) < 0;
2355                strbuf_release(&sb);
2356                if (err)
2357                        return -1;
2358        }
2359        if (!strip_extensions && !drop_cache_tree && istate->cache_tree) {
2360                struct strbuf sb = STRBUF_INIT;
2361
2362                cache_tree_write(&sb, istate->cache_tree);
2363                err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
2364                        || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2365                strbuf_release(&sb);
2366                if (err)
2367                        return -1;
2368        }
2369        if (!strip_extensions && istate->resolve_undo) {
2370                struct strbuf sb = STRBUF_INIT;
2371
2372                resolve_undo_write(&sb, istate->resolve_undo);
2373                err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2374                                             sb.len) < 0
2375                        || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2376                strbuf_release(&sb);
2377                if (err)
2378                        return -1;
2379        }
2380        if (!strip_extensions && istate->untracked) {
2381                struct strbuf sb = STRBUF_INIT;
2382
2383                write_untracked_extension(&sb, istate->untracked);
2384                err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,
2385                                             sb.len) < 0 ||
2386                        ce_write(&c, newfd, sb.buf, sb.len) < 0;
2387                strbuf_release(&sb);
2388                if (err)
2389                        return -1;
2390        }
2391        if (!strip_extensions && istate->fsmonitor_last_update) {
2392                struct strbuf sb = STRBUF_INIT;
2393
2394                write_fsmonitor_extension(&sb, istate);
2395                err = write_index_ext_header(&c, newfd, CACHE_EXT_FSMONITOR, sb.len) < 0
2396                        || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2397                strbuf_release(&sb);
2398                if (err)
2399                        return -1;
2400        }
2401
2402        if (ce_flush(&c, newfd, istate->oid.hash))
2403                return -1;
2404        if (close_tempfile_gently(tempfile)) {
2405                error(_("could not close '%s'"), tempfile->filename.buf);
2406                return -1;
2407        }
2408        if (stat(tempfile->filename.buf, &st))
2409                return -1;
2410        istate->timestamp.sec = (unsigned int)st.st_mtime;
2411        istate->timestamp.nsec = ST_MTIME_NSEC(st);
2412        trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed);
2413        return 0;
2414}
2415
2416void set_alternate_index_output(const char *name)
2417{
2418        alternate_index_output = name;
2419}
2420
2421static int commit_locked_index(struct lock_file *lk)
2422{
2423        if (alternate_index_output)
2424                return commit_lock_file_to(lk, alternate_index_output);
2425        else
2426                return commit_lock_file(lk);
2427}
2428
2429static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2430                                 unsigned flags)
2431{
2432        int ret = do_write_index(istate, lock->tempfile, 0);
2433        if (ret)
2434                return ret;
2435        if (flags & COMMIT_LOCK)
2436                return commit_locked_index(lock);
2437        return close_lock_file_gently(lock);
2438}
2439
2440static int write_split_index(struct index_state *istate,
2441                             struct lock_file *lock,
2442                             unsigned flags)
2443{
2444        int ret;
2445        prepare_to_write_split_index(istate);
2446        ret = do_write_locked_index(istate, lock, flags);
2447        finish_writing_split_index(istate);
2448        return ret;
2449}
2450
2451static const char *shared_index_expire = "2.weeks.ago";
2452
2453static unsigned long get_shared_index_expire_date(void)
2454{
2455        static unsigned long shared_index_expire_date;
2456        static int shared_index_expire_date_prepared;
2457
2458        if (!shared_index_expire_date_prepared) {
2459                git_config_get_expiry("splitindex.sharedindexexpire",
2460                                      &shared_index_expire);
2461                shared_index_expire_date = approxidate(shared_index_expire);
2462                shared_index_expire_date_prepared = 1;
2463        }
2464
2465        return shared_index_expire_date;
2466}
2467
2468static int should_delete_shared_index(const char *shared_index_path)
2469{
2470        struct stat st;
2471        unsigned long expiration;
2472
2473        /* Check timestamp */
2474        expiration = get_shared_index_expire_date();
2475        if (!expiration)
2476                return 0;
2477        if (stat(shared_index_path, &st))
2478                return error_errno(_("could not stat '%s'"), shared_index_path);
2479        if (st.st_mtime > expiration)
2480                return 0;
2481
2482        return 1;
2483}
2484
2485static int clean_shared_index_files(const char *current_hex)
2486{
2487        struct dirent *de;
2488        DIR *dir = opendir(get_git_dir());
2489
2490        if (!dir)
2491                return error_errno(_("unable to open git dir: %s"), get_git_dir());
2492
2493        while ((de = readdir(dir)) != NULL) {
2494                const char *sha1_hex;
2495                const char *shared_index_path;
2496                if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
2497                        continue;
2498                if (!strcmp(sha1_hex, current_hex))
2499                        continue;
2500                shared_index_path = git_path("%s", de->d_name);
2501                if (should_delete_shared_index(shared_index_path) > 0 &&
2502                    unlink(shared_index_path))
2503                        warning_errno(_("unable to unlink: %s"), shared_index_path);
2504        }
2505        closedir(dir);
2506
2507        return 0;
2508}
2509
2510static int write_shared_index(struct index_state *istate,
2511                              struct tempfile **temp)
2512{
2513        struct split_index *si = istate->split_index;
2514        int ret;
2515
2516        move_cache_to_base_index(istate);
2517        ret = do_write_index(si->base, *temp, 1);
2518        if (ret)
2519                return ret;
2520        ret = adjust_shared_perm(get_tempfile_path(*temp));
2521        if (ret) {
2522                error("cannot fix permission bits on %s", get_tempfile_path(*temp));
2523                return ret;
2524        }
2525        ret = rename_tempfile(temp,
2526                              git_path("sharedindex.%s", oid_to_hex(&si->base->oid)));
2527        if (!ret) {
2528                oidcpy(&si->base_oid, &si->base->oid);
2529                clean_shared_index_files(oid_to_hex(&si->base->oid));
2530        }
2531
2532        return ret;
2533}
2534
2535static const int default_max_percent_split_change = 20;
2536
2537static int too_many_not_shared_entries(struct index_state *istate)
2538{
2539        int i, not_shared = 0;
2540        int max_split = git_config_get_max_percent_split_change();
2541
2542        switch (max_split) {
2543        case -1:
2544                /* not or badly configured: use the default value */
2545                max_split = default_max_percent_split_change;
2546                break;
2547        case 0:
2548                return 1; /* 0% means always write a new shared index */
2549        case 100:
2550                return 0; /* 100% means never write a new shared index */
2551        default:
2552                break; /* just use the configured value */
2553        }
2554
2555        /* Count not shared entries */
2556        for (i = 0; i < istate->cache_nr; i++) {
2557                struct cache_entry *ce = istate->cache[i];
2558                if (!ce->index)
2559                        not_shared++;
2560        }
2561
2562        return (int64_t)istate->cache_nr * max_split < (int64_t)not_shared * 100;
2563}
2564
2565int write_locked_index(struct index_state *istate, struct lock_file *lock,
2566                       unsigned flags)
2567{
2568        int new_shared_index, ret;
2569        struct split_index *si = istate->split_index;
2570
2571        if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) {
2572                if (flags & COMMIT_LOCK)
2573                        rollback_lock_file(lock);
2574                return 0;
2575        }
2576
2577        if (istate->fsmonitor_last_update)
2578                fill_fsmonitor_bitmap(istate);
2579
2580        if (!si || alternate_index_output ||
2581            (istate->cache_changed & ~EXTMASK)) {
2582                if (si)
2583                        oidclr(&si->base_oid);
2584                ret = do_write_locked_index(istate, lock, flags);
2585                goto out;
2586        }
2587
2588        if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {
2589                int v = si->base_oid.hash[0];
2590                if ((v & 15) < 6)
2591                        istate->cache_changed |= SPLIT_INDEX_ORDERED;
2592        }
2593        if (too_many_not_shared_entries(istate))
2594                istate->cache_changed |= SPLIT_INDEX_ORDERED;
2595
2596        new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED;
2597
2598        if (new_shared_index) {
2599                struct tempfile *temp;
2600                int saved_errno;
2601
2602                temp = mks_tempfile(git_path("sharedindex_XXXXXX"));
2603                if (!temp) {
2604                        oidclr(&si->base_oid);
2605                        ret = do_write_locked_index(istate, lock, flags);
2606                        goto out;
2607                }
2608                ret = write_shared_index(istate, &temp);
2609
2610                saved_errno = errno;
2611                if (is_tempfile_active(temp))
2612                        delete_tempfile(&temp);
2613                errno = saved_errno;
2614
2615                if (ret)
2616                        goto out;
2617        }
2618
2619        ret = write_split_index(istate, lock, flags);
2620
2621        /* Freshen the shared index only if the split-index was written */
2622        if (!ret && !new_shared_index) {
2623                const char *shared_index = git_path("sharedindex.%s",
2624                                                    oid_to_hex(&si->base_oid));
2625                freshen_shared_index(shared_index, 1);
2626        }
2627
2628out:
2629        if (flags & COMMIT_LOCK)
2630                rollback_lock_file(lock);
2631        return ret;
2632}
2633
2634/*
2635 * Read the index file that is potentially unmerged into given
2636 * index_state, dropping any unmerged entries.  Returns true if
2637 * the index is unmerged.  Callers who want to refuse to work
2638 * from an unmerged state can call this and check its return value,
2639 * instead of calling read_cache().
2640 */
2641int read_index_unmerged(struct index_state *istate)
2642{
2643        int i;
2644        int unmerged = 0;
2645
2646        read_index(istate);
2647        for (i = 0; i < istate->cache_nr; i++) {
2648                struct cache_entry *ce = istate->cache[i];
2649                struct cache_entry *new_ce;
2650                int size, len;
2651
2652                if (!ce_stage(ce))
2653                        continue;
2654                unmerged = 1;
2655                len = ce_namelen(ce);
2656                size = cache_entry_size(len);
2657                new_ce = xcalloc(1, size);
2658                memcpy(new_ce->name, ce->name, len);
2659                new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2660                new_ce->ce_namelen = len;
2661                new_ce->ce_mode = ce->ce_mode;
2662                if (add_index_entry(istate, new_ce, 0))
2663                        return error("%s: cannot drop to stage #0",
2664                                     new_ce->name);
2665        }
2666        return unmerged;
2667}
2668
2669/*
2670 * Returns 1 if the path is an "other" path with respect to
2671 * the index; that is, the path is not mentioned in the index at all,
2672 * either as a file, a directory with some files in the index,
2673 * or as an unmerged entry.
2674 *
2675 * We helpfully remove a trailing "/" from directories so that
2676 * the output of read_directory can be used as-is.
2677 */
2678int index_name_is_other(const struct index_state *istate, const char *name,
2679                int namelen)
2680{
2681        int pos;
2682        if (namelen && name[namelen - 1] == '/')
2683                namelen--;
2684        pos = index_name_pos(istate, name, namelen);
2685        if (0 <= pos)
2686                return 0;       /* exact match */
2687        pos = -pos - 1;
2688        if (pos < istate->cache_nr) {
2689                struct cache_entry *ce = istate->cache[pos];
2690                if (ce_namelen(ce) == namelen &&
2691                    !memcmp(ce->name, name, namelen))
2692                        return 0; /* Yup, this one exists unmerged */
2693        }
2694        return 1;
2695}
2696
2697void *read_blob_data_from_index(const struct index_state *istate,
2698                                const char *path, unsigned long *size)
2699{
2700        int pos, len;
2701        unsigned long sz;
2702        enum object_type type;
2703        void *data;
2704
2705        len = strlen(path);
2706        pos = index_name_pos(istate, path, len);
2707        if (pos < 0) {
2708                /*
2709                 * We might be in the middle of a merge, in which
2710                 * case we would read stage #2 (ours).
2711                 */
2712                int i;
2713                for (i = -pos - 1;
2714                     (pos < 0 && i < istate->cache_nr &&
2715                      !strcmp(istate->cache[i]->name, path));
2716                     i++)
2717                        if (ce_stage(istate->cache[i]) == 2)
2718                                pos = i;
2719        }
2720        if (pos < 0)
2721                return NULL;
2722        data = read_object_file(&istate->cache[pos]->oid, &type, &sz);
2723        if (!data || type != OBJ_BLOB) {
2724                free(data);
2725                return NULL;
2726        }
2727        if (size)
2728                *size = sz;
2729        return data;
2730}
2731
2732void stat_validity_clear(struct stat_validity *sv)
2733{
2734        FREE_AND_NULL(sv->sd);
2735}
2736
2737int stat_validity_check(struct stat_validity *sv, const char *path)
2738{
2739        struct stat st;
2740
2741        if (stat(path, &st) < 0)
2742                return sv->sd == NULL;
2743        if (!sv->sd)
2744                return 0;
2745        return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2746}
2747
2748void stat_validity_update(struct stat_validity *sv, int fd)
2749{
2750        struct stat st;
2751
2752        if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2753                stat_validity_clear(sv);
2754        else {
2755                if (!sv->sd)
2756                        sv->sd = xcalloc(1, sizeof(struct stat_data));
2757                fill_stat_data(sv->sd, &st);
2758        }
2759}
2760
2761void move_index_extensions(struct index_state *dst, struct index_state *src)
2762{
2763        dst->untracked = src->untracked;
2764        src->untracked = NULL;
2765}