read-cache.con commit Merge branch 'nd/sparse' (73d6632)
   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 "cache-tree.h"
   9#include "refs.h"
  10#include "dir.h"
  11#include "tree.h"
  12#include "commit.h"
  13#include "diff.h"
  14#include "diffcore.h"
  15#include "revision.h"
  16#include "blob.h"
  17
  18/* Index extensions.
  19 *
  20 * The first letter should be 'A'..'Z' for extensions that are not
  21 * necessary for a correct operation (i.e. optimization data).
  22 * When new extensions are added that _needs_ to be understood in
  23 * order to correctly interpret the index file, pick character that
  24 * is outside the range, to cause the reader to abort.
  25 */
  26
  27#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
  28#define CACHE_EXT_TREE 0x54524545       /* "TREE" */
  29
  30struct index_state the_index;
  31
  32static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
  33{
  34        istate->cache[nr] = ce;
  35        add_name_hash(istate, ce);
  36}
  37
  38static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
  39{
  40        struct cache_entry *old = istate->cache[nr];
  41
  42        remove_name_hash(old);
  43        set_index_entry(istate, nr, ce);
  44        istate->cache_changed = 1;
  45}
  46
  47void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
  48{
  49        struct cache_entry *old = istate->cache[nr], *new;
  50        int namelen = strlen(new_name);
  51
  52        new = xmalloc(cache_entry_size(namelen));
  53        copy_cache_entry(new, old);
  54        new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK);
  55        new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen);
  56        memcpy(new->name, new_name, namelen + 1);
  57
  58        cache_tree_invalidate_path(istate->cache_tree, old->name);
  59        remove_index_entry_at(istate, nr);
  60        add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
  61}
  62
  63/*
  64 * This only updates the "non-critical" parts of the directory
  65 * cache, ie the parts that aren't tracked by GIT, and only used
  66 * to validate the cache.
  67 */
  68void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
  69{
  70        ce->ce_ctime.sec = (unsigned int)st->st_ctime;
  71        ce->ce_mtime.sec = (unsigned int)st->st_mtime;
  72        ce->ce_ctime.nsec = ST_CTIME_NSEC(*st);
  73        ce->ce_mtime.nsec = ST_MTIME_NSEC(*st);
  74        ce->ce_dev = st->st_dev;
  75        ce->ce_ino = st->st_ino;
  76        ce->ce_uid = st->st_uid;
  77        ce->ce_gid = st->st_gid;
  78        ce->ce_size = st->st_size;
  79
  80        if (assume_unchanged)
  81                ce->ce_flags |= CE_VALID;
  82
  83        if (S_ISREG(st->st_mode))
  84                ce_mark_uptodate(ce);
  85}
  86
  87static int ce_compare_data(struct cache_entry *ce, struct stat *st)
  88{
  89        int match = -1;
  90        int fd = open(ce->name, O_RDONLY);
  91
  92        if (fd >= 0) {
  93                unsigned char sha1[20];
  94                if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name))
  95                        match = hashcmp(sha1, ce->sha1);
  96                /* index_fd() closed the file descriptor already */
  97        }
  98        return match;
  99}
 100
 101static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
 102{
 103        int match = -1;
 104        void *buffer;
 105        unsigned long size;
 106        enum object_type type;
 107        struct strbuf sb = STRBUF_INIT;
 108
 109        if (strbuf_readlink(&sb, ce->name, expected_size))
 110                return -1;
 111
 112        buffer = read_sha1_file(ce->sha1, &type, &size);
 113        if (buffer) {
 114                if (size == sb.len)
 115                        match = memcmp(buffer, sb.buf, size);
 116                free(buffer);
 117        }
 118        strbuf_release(&sb);
 119        return match;
 120}
 121
 122static int ce_compare_gitlink(struct cache_entry *ce)
 123{
 124        unsigned char sha1[20];
 125
 126        /*
 127         * We don't actually require that the .git directory
 128         * under GITLINK directory be a valid git directory. It
 129         * might even be missing (in case nobody populated that
 130         * sub-project).
 131         *
 132         * If so, we consider it always to match.
 133         */
 134        if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
 135                return 0;
 136        return hashcmp(sha1, ce->sha1);
 137}
 138
 139static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
 140{
 141        switch (st->st_mode & S_IFMT) {
 142        case S_IFREG:
 143                if (ce_compare_data(ce, st))
 144                        return DATA_CHANGED;
 145                break;
 146        case S_IFLNK:
 147                if (ce_compare_link(ce, xsize_t(st->st_size)))
 148                        return DATA_CHANGED;
 149                break;
 150        case S_IFDIR:
 151                if (S_ISGITLINK(ce->ce_mode))
 152                        return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
 153        default:
 154                return TYPE_CHANGED;
 155        }
 156        return 0;
 157}
 158
 159int is_empty_blob_sha1(const unsigned char *sha1)
 160{
 161        static const unsigned char empty_blob_sha1[20] = {
 162                0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
 163                0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
 164        };
 165
 166        return !hashcmp(sha1, empty_blob_sha1);
 167}
 168
 169static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
 170{
 171        unsigned int changed = 0;
 172
 173        if (ce->ce_flags & CE_REMOVE)
 174                return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
 175
 176        switch (ce->ce_mode & S_IFMT) {
 177        case S_IFREG:
 178                changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
 179                /* We consider only the owner x bit to be relevant for
 180                 * "mode changes"
 181                 */
 182                if (trust_executable_bit &&
 183                    (0100 & (ce->ce_mode ^ st->st_mode)))
 184                        changed |= MODE_CHANGED;
 185                break;
 186        case S_IFLNK:
 187                if (!S_ISLNK(st->st_mode) &&
 188                    (has_symlinks || !S_ISREG(st->st_mode)))
 189                        changed |= TYPE_CHANGED;
 190                break;
 191        case S_IFGITLINK:
 192                /* We ignore most of the st_xxx fields for gitlinks */
 193                if (!S_ISDIR(st->st_mode))
 194                        changed |= TYPE_CHANGED;
 195                else if (ce_compare_gitlink(ce))
 196                        changed |= DATA_CHANGED;
 197                return changed;
 198        default:
 199                die("internal error: ce_mode is %o", ce->ce_mode);
 200        }
 201        if (ce->ce_mtime.sec != (unsigned int)st->st_mtime)
 202                changed |= MTIME_CHANGED;
 203        if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime)
 204                changed |= CTIME_CHANGED;
 205
 206#ifdef USE_NSEC
 207        if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st))
 208                changed |= MTIME_CHANGED;
 209        if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st))
 210                changed |= CTIME_CHANGED;
 211#endif
 212
 213        if (ce->ce_uid != (unsigned int) st->st_uid ||
 214            ce->ce_gid != (unsigned int) st->st_gid)
 215                changed |= OWNER_CHANGED;
 216        if (ce->ce_ino != (unsigned int) st->st_ino)
 217                changed |= INODE_CHANGED;
 218
 219#ifdef USE_STDEV
 220        /*
 221         * st_dev breaks on network filesystems where different
 222         * clients will have different views of what "device"
 223         * the filesystem is on
 224         */
 225        if (ce->ce_dev != (unsigned int) st->st_dev)
 226                changed |= INODE_CHANGED;
 227#endif
 228
 229        if (ce->ce_size != (unsigned int) st->st_size)
 230                changed |= DATA_CHANGED;
 231
 232        /* Racily smudged entry? */
 233        if (!ce->ce_size) {
 234                if (!is_empty_blob_sha1(ce->sha1))
 235                        changed |= DATA_CHANGED;
 236        }
 237
 238        return changed;
 239}
 240
 241static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
 242{
 243        return (!S_ISGITLINK(ce->ce_mode) &&
 244                istate->timestamp.sec &&
 245#ifdef USE_NSEC
 246                 /* nanosecond timestamped files can also be racy! */
 247                (istate->timestamp.sec < ce->ce_mtime.sec ||
 248                 (istate->timestamp.sec == ce->ce_mtime.sec &&
 249                  istate->timestamp.nsec <= ce->ce_mtime.nsec))
 250#else
 251                istate->timestamp.sec <= ce->ce_mtime.sec
 252#endif
 253                 );
 254}
 255
 256int ie_match_stat(const struct index_state *istate,
 257                  struct cache_entry *ce, struct stat *st,
 258                  unsigned int options)
 259{
 260        unsigned int changed;
 261        int ignore_valid = options & CE_MATCH_IGNORE_VALID;
 262        int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
 263        int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
 264
 265        /*
 266         * If it's marked as always valid in the index, it's
 267         * valid whatever the checked-out copy says.
 268         *
 269         * skip-worktree has the same effect with higher precedence
 270         */
 271        if (!ignore_skip_worktree && ce_skip_worktree(ce))
 272                return 0;
 273        if (!ignore_valid && (ce->ce_flags & CE_VALID))
 274                return 0;
 275
 276        /*
 277         * Intent-to-add entries have not been added, so the index entry
 278         * by definition never matches what is in the work tree until it
 279         * actually gets added.
 280         */
 281        if (ce->ce_flags & CE_INTENT_TO_ADD)
 282                return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
 283
 284        changed = ce_match_stat_basic(ce, st);
 285
 286        /*
 287         * Within 1 second of this sequence:
 288         *      echo xyzzy >file && git-update-index --add file
 289         * running this command:
 290         *      echo frotz >file
 291         * would give a falsely clean cache entry.  The mtime and
 292         * length match the cache, and other stat fields do not change.
 293         *
 294         * We could detect this at update-index time (the cache entry
 295         * being registered/updated records the same time as "now")
 296         * and delay the return from git-update-index, but that would
 297         * effectively mean we can make at most one commit per second,
 298         * which is not acceptable.  Instead, we check cache entries
 299         * whose mtime are the same as the index file timestamp more
 300         * carefully than others.
 301         */
 302        if (!changed && is_racy_timestamp(istate, ce)) {
 303                if (assume_racy_is_modified)
 304                        changed |= DATA_CHANGED;
 305                else
 306                        changed |= ce_modified_check_fs(ce, st);
 307        }
 308
 309        return changed;
 310}
 311
 312int ie_modified(const struct index_state *istate,
 313                struct cache_entry *ce, struct stat *st, unsigned int options)
 314{
 315        int changed, changed_fs;
 316
 317        changed = ie_match_stat(istate, ce, st, options);
 318        if (!changed)
 319                return 0;
 320        /*
 321         * If the mode or type has changed, there's no point in trying
 322         * to refresh the entry - it's not going to match
 323         */
 324        if (changed & (MODE_CHANGED | TYPE_CHANGED))
 325                return changed;
 326
 327        /*
 328         * Immediately after read-tree or update-index --cacheinfo,
 329         * the length field is zero, as we have never even read the
 330         * lstat(2) information once, and we cannot trust DATA_CHANGED
 331         * returned by ie_match_stat() which in turn was returned by
 332         * ce_match_stat_basic() to signal that the filesize of the
 333         * blob changed.  We have to actually go to the filesystem to
 334         * see if the contents match, and if so, should answer "unchanged".
 335         *
 336         * The logic does not apply to gitlinks, as ce_match_stat_basic()
 337         * already has checked the actual HEAD from the filesystem in the
 338         * subproject.  If ie_match_stat() already said it is different,
 339         * then we know it is.
 340         */
 341        if ((changed & DATA_CHANGED) &&
 342            (S_ISGITLINK(ce->ce_mode) || ce->ce_size != 0))
 343                return changed;
 344
 345        changed_fs = ce_modified_check_fs(ce, st);
 346        if (changed_fs)
 347                return changed | changed_fs;
 348        return 0;
 349}
 350
 351int base_name_compare(const char *name1, int len1, int mode1,
 352                      const char *name2, int len2, int mode2)
 353{
 354        unsigned char c1, c2;
 355        int len = len1 < len2 ? len1 : len2;
 356        int cmp;
 357
 358        cmp = memcmp(name1, name2, len);
 359        if (cmp)
 360                return cmp;
 361        c1 = name1[len];
 362        c2 = name2[len];
 363        if (!c1 && S_ISDIR(mode1))
 364                c1 = '/';
 365        if (!c2 && S_ISDIR(mode2))
 366                c2 = '/';
 367        return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
 368}
 369
 370/*
 371 * df_name_compare() is identical to base_name_compare(), except it
 372 * compares conflicting directory/file entries as equal. Note that
 373 * while a directory name compares as equal to a regular file, they
 374 * then individually compare _differently_ to a filename that has
 375 * a dot after the basename (because '\0' < '.' < '/').
 376 *
 377 * This is used by routines that want to traverse the git namespace
 378 * but then handle conflicting entries together when possible.
 379 */
 380int df_name_compare(const char *name1, int len1, int mode1,
 381                    const char *name2, int len2, int mode2)
 382{
 383        int len = len1 < len2 ? len1 : len2, cmp;
 384        unsigned char c1, c2;
 385
 386        cmp = memcmp(name1, name2, len);
 387        if (cmp)
 388                return cmp;
 389        /* Directories and files compare equal (same length, same name) */
 390        if (len1 == len2)
 391                return 0;
 392        c1 = name1[len];
 393        if (!c1 && S_ISDIR(mode1))
 394                c1 = '/';
 395        c2 = name2[len];
 396        if (!c2 && S_ISDIR(mode2))
 397                c2 = '/';
 398        if (c1 == '/' && !c2)
 399                return 0;
 400        if (c2 == '/' && !c1)
 401                return 0;
 402        return c1 - c2;
 403}
 404
 405int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
 406{
 407        int len1 = flags1 & CE_NAMEMASK;
 408        int len2 = flags2 & CE_NAMEMASK;
 409        int len = len1 < len2 ? len1 : len2;
 410        int cmp;
 411
 412        cmp = memcmp(name1, name2, len);
 413        if (cmp)
 414                return cmp;
 415        if (len1 < len2)
 416                return -1;
 417        if (len1 > len2)
 418                return 1;
 419
 420        /* Compare stages  */
 421        flags1 &= CE_STAGEMASK;
 422        flags2 &= CE_STAGEMASK;
 423
 424        if (flags1 < flags2)
 425                return -1;
 426        if (flags1 > flags2)
 427                return 1;
 428        return 0;
 429}
 430
 431int index_name_pos(const struct index_state *istate, const char *name, int namelen)
 432{
 433        int first, last;
 434
 435        first = 0;
 436        last = istate->cache_nr;
 437        while (last > first) {
 438                int next = (last + first) >> 1;
 439                struct cache_entry *ce = istate->cache[next];
 440                int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
 441                if (!cmp)
 442                        return next;
 443                if (cmp < 0) {
 444                        last = next;
 445                        continue;
 446                }
 447                first = next+1;
 448        }
 449        return -first-1;
 450}
 451
 452/* Remove entry, return true if there are more entries to go.. */
 453int remove_index_entry_at(struct index_state *istate, int pos)
 454{
 455        struct cache_entry *ce = istate->cache[pos];
 456
 457        remove_name_hash(ce);
 458        istate->cache_changed = 1;
 459        istate->cache_nr--;
 460        if (pos >= istate->cache_nr)
 461                return 0;
 462        memmove(istate->cache + pos,
 463                istate->cache + pos + 1,
 464                (istate->cache_nr - pos) * sizeof(struct cache_entry *));
 465        return 1;
 466}
 467
 468/*
 469 * Remove all cache ententries marked for removal, that is where
 470 * CE_REMOVE is set in ce_flags.  This is much more effective than
 471 * calling remove_index_entry_at() for each entry to be removed.
 472 */
 473void remove_marked_cache_entries(struct index_state *istate)
 474{
 475        struct cache_entry **ce_array = istate->cache;
 476        unsigned int i, j;
 477
 478        for (i = j = 0; i < istate->cache_nr; i++) {
 479                if (ce_array[i]->ce_flags & CE_REMOVE)
 480                        remove_name_hash(ce_array[i]);
 481                else
 482                        ce_array[j++] = ce_array[i];
 483        }
 484        istate->cache_changed = 1;
 485        istate->cache_nr = j;
 486}
 487
 488int remove_file_from_index(struct index_state *istate, const char *path)
 489{
 490        int pos = index_name_pos(istate, path, strlen(path));
 491        if (pos < 0)
 492                pos = -pos-1;
 493        cache_tree_invalidate_path(istate->cache_tree, path);
 494        while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
 495                remove_index_entry_at(istate, pos);
 496        return 0;
 497}
 498
 499static int compare_name(struct cache_entry *ce, const char *path, int namelen)
 500{
 501        return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
 502}
 503
 504static int index_name_pos_also_unmerged(struct index_state *istate,
 505        const char *path, int namelen)
 506{
 507        int pos = index_name_pos(istate, path, namelen);
 508        struct cache_entry *ce;
 509
 510        if (pos >= 0)
 511                return pos;
 512
 513        /* maybe unmerged? */
 514        pos = -1 - pos;
 515        if (pos >= istate->cache_nr ||
 516                        compare_name((ce = istate->cache[pos]), path, namelen))
 517                return -1;
 518
 519        /* order of preference: stage 2, 1, 3 */
 520        if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
 521                        ce_stage((ce = istate->cache[pos + 1])) == 2 &&
 522                        !compare_name(ce, path, namelen))
 523                pos++;
 524        return pos;
 525}
 526
 527static int different_name(struct cache_entry *ce, struct cache_entry *alias)
 528{
 529        int len = ce_namelen(ce);
 530        return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
 531}
 532
 533/*
 534 * If we add a filename that aliases in the cache, we will use the
 535 * name that we already have - but we don't want to update the same
 536 * alias twice, because that implies that there were actually two
 537 * different files with aliasing names!
 538 *
 539 * So we use the CE_ADDED flag to verify that the alias was an old
 540 * one before we accept it as
 541 */
 542static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
 543{
 544        int len;
 545        struct cache_entry *new;
 546
 547        if (alias->ce_flags & CE_ADDED)
 548                die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
 549
 550        /* Ok, create the new entry using the name of the existing alias */
 551        len = ce_namelen(alias);
 552        new = xcalloc(1, cache_entry_size(len));
 553        memcpy(new->name, alias->name, len);
 554        copy_cache_entry(new, ce);
 555        free(ce);
 556        return new;
 557}
 558
 559static void record_intent_to_add(struct cache_entry *ce)
 560{
 561        unsigned char sha1[20];
 562        if (write_sha1_file("", 0, blob_type, sha1))
 563                die("cannot create an empty blob in the object database");
 564        hashcpy(ce->sha1, sha1);
 565}
 566
 567int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
 568{
 569        int size, namelen, was_same;
 570        mode_t st_mode = st->st_mode;
 571        struct cache_entry *ce, *alias;
 572        unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
 573        int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
 574        int pretend = flags & ADD_CACHE_PRETEND;
 575        int intent_only = flags & ADD_CACHE_INTENT;
 576        int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
 577                          (intent_only ? ADD_CACHE_NEW_ONLY : 0));
 578
 579        if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
 580                return error("%s: can only add regular files, symbolic links or git-directories", path);
 581
 582        namelen = strlen(path);
 583        if (S_ISDIR(st_mode)) {
 584                while (namelen && path[namelen-1] == '/')
 585                        namelen--;
 586        }
 587        size = cache_entry_size(namelen);
 588        ce = xcalloc(1, size);
 589        memcpy(ce->name, path, namelen);
 590        ce->ce_flags = namelen;
 591        if (!intent_only)
 592                fill_stat_cache_info(ce, st);
 593        else
 594                ce->ce_flags |= CE_INTENT_TO_ADD;
 595
 596        if (trust_executable_bit && has_symlinks)
 597                ce->ce_mode = create_ce_mode(st_mode);
 598        else {
 599                /* If there is an existing entry, pick the mode bits and type
 600                 * from it, otherwise assume unexecutable regular file.
 601                 */
 602                struct cache_entry *ent;
 603                int pos = index_name_pos_also_unmerged(istate, path, namelen);
 604
 605                ent = (0 <= pos) ? istate->cache[pos] : NULL;
 606                ce->ce_mode = ce_mode_from_stat(ent, st_mode);
 607        }
 608
 609        alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case);
 610        if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
 611                /* Nothing changed, really */
 612                free(ce);
 613                ce_mark_uptodate(alias);
 614                alias->ce_flags |= CE_ADDED;
 615                return 0;
 616        }
 617        if (!intent_only) {
 618                if (index_path(ce->sha1, path, st, 1))
 619                        return error("unable to index file %s", path);
 620        } else
 621                record_intent_to_add(ce);
 622
 623        if (ignore_case && alias && different_name(ce, alias))
 624                ce = create_alias_ce(ce, alias);
 625        ce->ce_flags |= CE_ADDED;
 626
 627        /* It was suspected to be racily clean, but it turns out to be Ok */
 628        was_same = (alias &&
 629                    !ce_stage(alias) &&
 630                    !hashcmp(alias->sha1, ce->sha1) &&
 631                    ce->ce_mode == alias->ce_mode);
 632
 633        if (pretend)
 634                ;
 635        else if (add_index_entry(istate, ce, add_option))
 636                return error("unable to add %s to index",path);
 637        if (verbose && !was_same)
 638                printf("add '%s'\n", path);
 639        return 0;
 640}
 641
 642int add_file_to_index(struct index_state *istate, const char *path, int flags)
 643{
 644        struct stat st;
 645        if (lstat(path, &st))
 646                die_errno("unable to stat '%s'", path);
 647        return add_to_index(istate, path, &st, flags);
 648}
 649
 650struct cache_entry *make_cache_entry(unsigned int mode,
 651                const unsigned char *sha1, const char *path, int stage,
 652                int refresh)
 653{
 654        int size, len;
 655        struct cache_entry *ce;
 656
 657        if (!verify_path(path)) {
 658                error("Invalid path '%s'", path);
 659                return NULL;
 660        }
 661
 662        len = strlen(path);
 663        size = cache_entry_size(len);
 664        ce = xcalloc(1, size);
 665
 666        hashcpy(ce->sha1, sha1);
 667        memcpy(ce->name, path, len);
 668        ce->ce_flags = create_ce_flags(len, stage);
 669        ce->ce_mode = create_ce_mode(mode);
 670
 671        if (refresh)
 672                return refresh_cache_entry(ce, 0);
 673
 674        return ce;
 675}
 676
 677int ce_same_name(struct cache_entry *a, struct cache_entry *b)
 678{
 679        int len = ce_namelen(a);
 680        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 681}
 682
 683int ce_path_match(const struct cache_entry *ce, const char **pathspec)
 684{
 685        const char *match, *name;
 686        int len;
 687
 688        if (!pathspec)
 689                return 1;
 690
 691        len = ce_namelen(ce);
 692        name = ce->name;
 693        while ((match = *pathspec++) != NULL) {
 694                int matchlen = strlen(match);
 695                if (matchlen > len)
 696                        continue;
 697                if (memcmp(name, match, matchlen))
 698                        continue;
 699                if (matchlen && name[matchlen-1] == '/')
 700                        return 1;
 701                if (name[matchlen] == '/' || !name[matchlen])
 702                        return 1;
 703                if (!matchlen)
 704                        return 1;
 705        }
 706        return 0;
 707}
 708
 709/*
 710 * We fundamentally don't like some paths: we don't want
 711 * dot or dot-dot anywhere, and for obvious reasons don't
 712 * want to recurse into ".git" either.
 713 *
 714 * Also, we don't want double slashes or slashes at the
 715 * end that can make pathnames ambiguous.
 716 */
 717static int verify_dotfile(const char *rest)
 718{
 719        /*
 720         * The first character was '.', but that
 721         * has already been discarded, we now test
 722         * the rest.
 723         */
 724        switch (*rest) {
 725        /* "." is not allowed */
 726        case '\0': case '/':
 727                return 0;
 728
 729        /*
 730         * ".git" followed by  NUL or slash is bad. This
 731         * shares the path end test with the ".." case.
 732         */
 733        case 'g':
 734                if (rest[1] != 'i')
 735                        break;
 736                if (rest[2] != 't')
 737                        break;
 738                rest += 2;
 739        /* fallthrough */
 740        case '.':
 741                if (rest[1] == '\0' || rest[1] == '/')
 742                        return 0;
 743        }
 744        return 1;
 745}
 746
 747int verify_path(const char *path)
 748{
 749        char c;
 750
 751        goto inside;
 752        for (;;) {
 753                if (!c)
 754                        return 1;
 755                if (c == '/') {
 756inside:
 757                        c = *path++;
 758                        switch (c) {
 759                        default:
 760                                continue;
 761                        case '/': case '\0':
 762                                break;
 763                        case '.':
 764                                if (verify_dotfile(path))
 765                                        continue;
 766                        }
 767                        return 0;
 768                }
 769                c = *path++;
 770        }
 771}
 772
 773/*
 774 * Do we have another file that has the beginning components being a
 775 * proper superset of the name we're trying to add?
 776 */
 777static int has_file_name(struct index_state *istate,
 778                         const struct cache_entry *ce, int pos, int ok_to_replace)
 779{
 780        int retval = 0;
 781        int len = ce_namelen(ce);
 782        int stage = ce_stage(ce);
 783        const char *name = ce->name;
 784
 785        while (pos < istate->cache_nr) {
 786                struct cache_entry *p = istate->cache[pos++];
 787
 788                if (len >= ce_namelen(p))
 789                        break;
 790                if (memcmp(name, p->name, len))
 791                        break;
 792                if (ce_stage(p) != stage)
 793                        continue;
 794                if (p->name[len] != '/')
 795                        continue;
 796                if (p->ce_flags & CE_REMOVE)
 797                        continue;
 798                retval = -1;
 799                if (!ok_to_replace)
 800                        break;
 801                remove_index_entry_at(istate, --pos);
 802        }
 803        return retval;
 804}
 805
 806/*
 807 * Do we have another file with a pathname that is a proper
 808 * subset of the name we're trying to add?
 809 */
 810static int has_dir_name(struct index_state *istate,
 811                        const struct cache_entry *ce, int pos, int ok_to_replace)
 812{
 813        int retval = 0;
 814        int stage = ce_stage(ce);
 815        const char *name = ce->name;
 816        const char *slash = name + ce_namelen(ce);
 817
 818        for (;;) {
 819                int len;
 820
 821                for (;;) {
 822                        if (*--slash == '/')
 823                                break;
 824                        if (slash <= ce->name)
 825                                return retval;
 826                }
 827                len = slash - name;
 828
 829                pos = index_name_pos(istate, name, create_ce_flags(len, stage));
 830                if (pos >= 0) {
 831                        /*
 832                         * Found one, but not so fast.  This could
 833                         * be a marker that says "I was here, but
 834                         * I am being removed".  Such an entry is
 835                         * not a part of the resulting tree, and
 836                         * it is Ok to have a directory at the same
 837                         * path.
 838                         */
 839                        if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
 840                                retval = -1;
 841                                if (!ok_to_replace)
 842                                        break;
 843                                remove_index_entry_at(istate, pos);
 844                                continue;
 845                        }
 846                }
 847                else
 848                        pos = -pos-1;
 849
 850                /*
 851                 * Trivial optimization: if we find an entry that
 852                 * already matches the sub-directory, then we know
 853                 * we're ok, and we can exit.
 854                 */
 855                while (pos < istate->cache_nr) {
 856                        struct cache_entry *p = istate->cache[pos];
 857                        if ((ce_namelen(p) <= len) ||
 858                            (p->name[len] != '/') ||
 859                            memcmp(p->name, name, len))
 860                                break; /* not our subdirectory */
 861                        if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
 862                                /*
 863                                 * p is at the same stage as our entry, and
 864                                 * is a subdirectory of what we are looking
 865                                 * at, so we cannot have conflicts at our
 866                                 * level or anything shorter.
 867                                 */
 868                                return retval;
 869                        pos++;
 870                }
 871        }
 872        return retval;
 873}
 874
 875/* We may be in a situation where we already have path/file and path
 876 * is being added, or we already have path and path/file is being
 877 * added.  Either one would result in a nonsense tree that has path
 878 * twice when git-write-tree tries to write it out.  Prevent it.
 879 *
 880 * If ok-to-replace is specified, we remove the conflicting entries
 881 * from the cache so the caller should recompute the insert position.
 882 * When this happens, we return non-zero.
 883 */
 884static int check_file_directory_conflict(struct index_state *istate,
 885                                         const struct cache_entry *ce,
 886                                         int pos, int ok_to_replace)
 887{
 888        int retval;
 889
 890        /*
 891         * When ce is an "I am going away" entry, we allow it to be added
 892         */
 893        if (ce->ce_flags & CE_REMOVE)
 894                return 0;
 895
 896        /*
 897         * We check if the path is a sub-path of a subsequent pathname
 898         * first, since removing those will not change the position
 899         * in the array.
 900         */
 901        retval = has_file_name(istate, ce, pos, ok_to_replace);
 902
 903        /*
 904         * Then check if the path might have a clashing sub-directory
 905         * before it.
 906         */
 907        return retval + has_dir_name(istate, ce, pos, ok_to_replace);
 908}
 909
 910static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
 911{
 912        int pos;
 913        int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
 914        int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
 915        int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
 916        int new_only = option & ADD_CACHE_NEW_ONLY;
 917
 918        cache_tree_invalidate_path(istate->cache_tree, ce->name);
 919        pos = index_name_pos(istate, ce->name, ce->ce_flags);
 920
 921        /* existing match? Just replace it. */
 922        if (pos >= 0) {
 923                if (!new_only)
 924                        replace_index_entry(istate, pos, ce);
 925                return 0;
 926        }
 927        pos = -pos-1;
 928
 929        /*
 930         * Inserting a merged entry ("stage 0") into the index
 931         * will always replace all non-merged entries..
 932         */
 933        if (pos < istate->cache_nr && ce_stage(ce) == 0) {
 934                while (ce_same_name(istate->cache[pos], ce)) {
 935                        ok_to_add = 1;
 936                        if (!remove_index_entry_at(istate, pos))
 937                                break;
 938                }
 939        }
 940
 941        if (!ok_to_add)
 942                return -1;
 943        if (!verify_path(ce->name))
 944                return error("Invalid path '%s'", ce->name);
 945
 946        if (!skip_df_check &&
 947            check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
 948                if (!ok_to_replace)
 949                        return error("'%s' appears as both a file and as a directory",
 950                                     ce->name);
 951                pos = index_name_pos(istate, ce->name, ce->ce_flags);
 952                pos = -pos-1;
 953        }
 954        return pos + 1;
 955}
 956
 957int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
 958{
 959        int pos;
 960
 961        if (option & ADD_CACHE_JUST_APPEND)
 962                pos = istate->cache_nr;
 963        else {
 964                int ret;
 965                ret = add_index_entry_with_check(istate, ce, option);
 966                if (ret <= 0)
 967                        return ret;
 968                pos = ret - 1;
 969        }
 970
 971        /* Make sure the array is big enough .. */
 972        if (istate->cache_nr == istate->cache_alloc) {
 973                istate->cache_alloc = alloc_nr(istate->cache_alloc);
 974                istate->cache = xrealloc(istate->cache,
 975                                        istate->cache_alloc * sizeof(struct cache_entry *));
 976        }
 977
 978        /* Add it in.. */
 979        istate->cache_nr++;
 980        if (istate->cache_nr > pos + 1)
 981                memmove(istate->cache + pos + 1,
 982                        istate->cache + pos,
 983                        (istate->cache_nr - pos - 1) * sizeof(ce));
 984        set_index_entry(istate, pos, ce);
 985        istate->cache_changed = 1;
 986        return 0;
 987}
 988
 989/*
 990 * "refresh" does not calculate a new sha1 file or bring the
 991 * cache up-to-date for mode/content changes. But what it
 992 * _does_ do is to "re-match" the stat information of a file
 993 * with the cache, so that you can refresh the cache for a
 994 * file that hasn't been changed but where the stat entry is
 995 * out of date.
 996 *
 997 * For example, you'd want to do this after doing a "git-read-tree",
 998 * to link up the stat cache details with the proper files.
 999 */
1000static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1001                                             struct cache_entry *ce,
1002                                             unsigned int options, int *err)
1003{
1004        struct stat st;
1005        struct cache_entry *updated;
1006        int changed, size;
1007        int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1008        int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1009
1010        if (ce_uptodate(ce))
1011                return ce;
1012
1013        /*
1014         * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1015         * that the change to the work tree does not matter and told
1016         * us not to worry.
1017         */
1018        if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1019                ce_mark_uptodate(ce);
1020                return ce;
1021        }
1022        if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1023                ce_mark_uptodate(ce);
1024                return ce;
1025        }
1026
1027        if (lstat(ce->name, &st) < 0) {
1028                if (err)
1029                        *err = errno;
1030                return NULL;
1031        }
1032
1033        changed = ie_match_stat(istate, ce, &st, options);
1034        if (!changed) {
1035                /*
1036                 * The path is unchanged.  If we were told to ignore
1037                 * valid bit, then we did the actual stat check and
1038                 * found that the entry is unmodified.  If the entry
1039                 * is not marked VALID, this is the place to mark it
1040                 * valid again, under "assume unchanged" mode.
1041                 */
1042                if (ignore_valid && assume_unchanged &&
1043                    !(ce->ce_flags & CE_VALID))
1044                        ; /* mark this one VALID again */
1045                else {
1046                        /*
1047                         * We do not mark the index itself "modified"
1048                         * because CE_UPTODATE flag is in-core only;
1049                         * we are not going to write this change out.
1050                         */
1051                        ce_mark_uptodate(ce);
1052                        return ce;
1053                }
1054        }
1055
1056        if (ie_modified(istate, ce, &st, options)) {
1057                if (err)
1058                        *err = EINVAL;
1059                return NULL;
1060        }
1061
1062        size = ce_size(ce);
1063        updated = xmalloc(size);
1064        memcpy(updated, ce, size);
1065        fill_stat_cache_info(updated, &st);
1066        /*
1067         * If ignore_valid is not set, we should leave CE_VALID bit
1068         * alone.  Otherwise, paths marked with --no-assume-unchanged
1069         * (i.e. things to be edited) will reacquire CE_VALID bit
1070         * automatically, which is not really what we want.
1071         */
1072        if (!ignore_valid && assume_unchanged &&
1073            !(ce->ce_flags & CE_VALID))
1074                updated->ce_flags &= ~CE_VALID;
1075
1076        return updated;
1077}
1078
1079static void show_file(const char * fmt, const char * name, int in_porcelain,
1080                      int * first, char *header_msg)
1081{
1082        if (in_porcelain && *first && header_msg) {
1083                printf("%s\n", header_msg);
1084                *first=0;
1085        }
1086        printf(fmt, name);
1087}
1088
1089int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
1090                  char *seen, char *header_msg)
1091{
1092        int i;
1093        int has_errors = 0;
1094        int really = (flags & REFRESH_REALLY) != 0;
1095        int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1096        int quiet = (flags & REFRESH_QUIET) != 0;
1097        int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1098        int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1099        int first = 1;
1100        int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1101        unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
1102        const char *needs_update_fmt;
1103        const char *needs_merge_fmt;
1104
1105        needs_update_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1106        needs_merge_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1107        for (i = 0; i < istate->cache_nr; i++) {
1108                struct cache_entry *ce, *new;
1109                int cache_errno = 0;
1110
1111                ce = istate->cache[i];
1112                if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1113                        continue;
1114
1115                if (ce_stage(ce)) {
1116                        while ((i < istate->cache_nr) &&
1117                               ! strcmp(istate->cache[i]->name, ce->name))
1118                                i++;
1119                        i--;
1120                        if (allow_unmerged)
1121                                continue;
1122                        show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);
1123                        has_errors = 1;
1124                        continue;
1125                }
1126
1127                if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
1128                        continue;
1129
1130                new = refresh_cache_ent(istate, ce, options, &cache_errno);
1131                if (new == ce)
1132                        continue;
1133                if (!new) {
1134                        if (not_new && cache_errno == ENOENT)
1135                                continue;
1136                        if (really && cache_errno == EINVAL) {
1137                                /* If we are doing --really-refresh that
1138                                 * means the index is not valid anymore.
1139                                 */
1140                                ce->ce_flags &= ~CE_VALID;
1141                                istate->cache_changed = 1;
1142                        }
1143                        if (quiet)
1144                                continue;
1145                        show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);
1146                        has_errors = 1;
1147                        continue;
1148                }
1149
1150                replace_index_entry(istate, i, new);
1151        }
1152        return has_errors;
1153}
1154
1155struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
1156{
1157        return refresh_cache_ent(&the_index, ce, really, NULL);
1158}
1159
1160static int verify_hdr(struct cache_header *hdr, unsigned long size)
1161{
1162        git_SHA_CTX c;
1163        unsigned char sha1[20];
1164
1165        if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1166                return error("bad signature");
1167        if (hdr->hdr_version != htonl(2) && hdr->hdr_version != htonl(3))
1168                return error("bad index version");
1169        git_SHA1_Init(&c);
1170        git_SHA1_Update(&c, hdr, size - 20);
1171        git_SHA1_Final(sha1, &c);
1172        if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1173                return error("bad index file sha1 signature");
1174        return 0;
1175}
1176
1177static int read_index_extension(struct index_state *istate,
1178                                const char *ext, void *data, unsigned long sz)
1179{
1180        switch (CACHE_EXT(ext)) {
1181        case CACHE_EXT_TREE:
1182                istate->cache_tree = cache_tree_read(data, sz);
1183                break;
1184        default:
1185                if (*ext < 'A' || 'Z' < *ext)
1186                        return error("index uses %.4s extension, which we do not understand",
1187                                     ext);
1188                fprintf(stderr, "ignoring %.4s extension\n", ext);
1189                break;
1190        }
1191        return 0;
1192}
1193
1194int read_index(struct index_state *istate)
1195{
1196        return read_index_from(istate, get_index_file());
1197}
1198
1199static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce)
1200{
1201        size_t len;
1202        const char *name;
1203
1204        ce->ce_ctime.sec = ntohl(ondisk->ctime.sec);
1205        ce->ce_mtime.sec = ntohl(ondisk->mtime.sec);
1206        ce->ce_ctime.nsec = ntohl(ondisk->ctime.nsec);
1207        ce->ce_mtime.nsec = ntohl(ondisk->mtime.nsec);
1208        ce->ce_dev   = ntohl(ondisk->dev);
1209        ce->ce_ino   = ntohl(ondisk->ino);
1210        ce->ce_mode  = ntohl(ondisk->mode);
1211        ce->ce_uid   = ntohl(ondisk->uid);
1212        ce->ce_gid   = ntohl(ondisk->gid);
1213        ce->ce_size  = ntohl(ondisk->size);
1214        /* On-disk flags are just 16 bits */
1215        ce->ce_flags = ntohs(ondisk->flags);
1216
1217        hashcpy(ce->sha1, ondisk->sha1);
1218
1219        len = ce->ce_flags & CE_NAMEMASK;
1220
1221        if (ce->ce_flags & CE_EXTENDED) {
1222                struct ondisk_cache_entry_extended *ondisk2;
1223                int extended_flags;
1224                ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1225                extended_flags = ntohs(ondisk2->flags2) << 16;
1226                /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1227                if (extended_flags & ~CE_EXTENDED_FLAGS)
1228                        die("Unknown index entry format %08x", extended_flags);
1229                ce->ce_flags |= extended_flags;
1230                name = ondisk2->name;
1231        }
1232        else
1233                name = ondisk->name;
1234
1235        if (len == CE_NAMEMASK)
1236                len = strlen(name);
1237        /*
1238         * NEEDSWORK: If the original index is crafted, this copy could
1239         * go unchecked.
1240         */
1241        memcpy(ce->name, name, len + 1);
1242}
1243
1244static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
1245{
1246        long per_entry;
1247
1248        per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry);
1249
1250        /*
1251         * Alignment can cause differences. This should be "alignof", but
1252         * since that's a gcc'ism, just use the size of a pointer.
1253         */
1254        per_entry += sizeof(void *);
1255        return ondisk_size + entries*per_entry;
1256}
1257
1258/* remember to discard_cache() before reading a different cache! */
1259int read_index_from(struct index_state *istate, const char *path)
1260{
1261        int fd, i;
1262        struct stat st;
1263        unsigned long src_offset, dst_offset;
1264        struct cache_header *hdr;
1265        void *mmap;
1266        size_t mmap_size;
1267
1268        errno = EBUSY;
1269        if (istate->initialized)
1270                return istate->cache_nr;
1271
1272        errno = ENOENT;
1273        istate->timestamp.sec = 0;
1274        istate->timestamp.nsec = 0;
1275        fd = open(path, O_RDONLY);
1276        if (fd < 0) {
1277                if (errno == ENOENT)
1278                        return 0;
1279                die_errno("index file open failed");
1280        }
1281
1282        if (fstat(fd, &st))
1283                die_errno("cannot stat the open index");
1284
1285        errno = EINVAL;
1286        mmap_size = xsize_t(st.st_size);
1287        if (mmap_size < sizeof(struct cache_header) + 20)
1288                die("index file smaller than expected");
1289
1290        mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1291        close(fd);
1292        if (mmap == MAP_FAILED)
1293                die_errno("unable to map index file");
1294
1295        hdr = mmap;
1296        if (verify_hdr(hdr, mmap_size) < 0)
1297                goto unmap;
1298
1299        istate->cache_nr = ntohl(hdr->hdr_entries);
1300        istate->cache_alloc = alloc_nr(istate->cache_nr);
1301        istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
1302
1303        /*
1304         * The disk format is actually larger than the in-memory format,
1305         * due to space for nsec etc, so even though the in-memory one
1306         * has room for a few  more flags, we can allocate using the same
1307         * index size
1308         */
1309        istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));
1310        istate->initialized = 1;
1311
1312        src_offset = sizeof(*hdr);
1313        dst_offset = 0;
1314        for (i = 0; i < istate->cache_nr; i++) {
1315                struct ondisk_cache_entry *disk_ce;
1316                struct cache_entry *ce;
1317
1318                disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1319                ce = (struct cache_entry *)((char *)istate->alloc + dst_offset);
1320                convert_from_disk(disk_ce, ce);
1321                set_index_entry(istate, i, ce);
1322
1323                src_offset += ondisk_ce_size(ce);
1324                dst_offset += ce_size(ce);
1325        }
1326        istate->timestamp.sec = st.st_mtime;
1327        istate->timestamp.nsec = ST_MTIME_NSEC(st);
1328
1329        while (src_offset <= mmap_size - 20 - 8) {
1330                /* After an array of active_nr index entries,
1331                 * there can be arbitrary number of extended
1332                 * sections, each of which is prefixed with
1333                 * extension name (4-byte) and section length
1334                 * in 4-byte network byte order.
1335                 */
1336                uint32_t extsize;
1337                memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1338                extsize = ntohl(extsize);
1339                if (read_index_extension(istate,
1340                                         (const char *) mmap + src_offset,
1341                                         (char *) mmap + src_offset + 8,
1342                                         extsize) < 0)
1343                        goto unmap;
1344                src_offset += 8;
1345                src_offset += extsize;
1346        }
1347        munmap(mmap, mmap_size);
1348        return istate->cache_nr;
1349
1350unmap:
1351        munmap(mmap, mmap_size);
1352        errno = EINVAL;
1353        die("index file corrupt");
1354}
1355
1356int is_index_unborn(struct index_state *istate)
1357{
1358        return (!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);
1359}
1360
1361int discard_index(struct index_state *istate)
1362{
1363        istate->cache_nr = 0;
1364        istate->cache_changed = 0;
1365        istate->timestamp.sec = 0;
1366        istate->timestamp.nsec = 0;
1367        istate->name_hash_initialized = 0;
1368        free_hash(&istate->name_hash);
1369        cache_tree_free(&(istate->cache_tree));
1370        free(istate->alloc);
1371        istate->alloc = NULL;
1372        istate->initialized = 0;
1373
1374        /* no need to throw away allocated active_cache */
1375        return 0;
1376}
1377
1378int unmerged_index(const struct index_state *istate)
1379{
1380        int i;
1381        for (i = 0; i < istate->cache_nr; i++) {
1382                if (ce_stage(istate->cache[i]))
1383                        return 1;
1384        }
1385        return 0;
1386}
1387
1388#define WRITE_BUFFER_SIZE 8192
1389static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1390static unsigned long write_buffer_len;
1391
1392static int ce_write_flush(git_SHA_CTX *context, int fd)
1393{
1394        unsigned int buffered = write_buffer_len;
1395        if (buffered) {
1396                git_SHA1_Update(context, write_buffer, buffered);
1397                if (write_in_full(fd, write_buffer, buffered) != buffered)
1398                        return -1;
1399                write_buffer_len = 0;
1400        }
1401        return 0;
1402}
1403
1404static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1405{
1406        while (len) {
1407                unsigned int buffered = write_buffer_len;
1408                unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1409                if (partial > len)
1410                        partial = len;
1411                memcpy(write_buffer + buffered, data, partial);
1412                buffered += partial;
1413                if (buffered == WRITE_BUFFER_SIZE) {
1414                        write_buffer_len = buffered;
1415                        if (ce_write_flush(context, fd))
1416                                return -1;
1417                        buffered = 0;
1418                }
1419                write_buffer_len = buffered;
1420                len -= partial;
1421                data = (char *) data + partial;
1422        }
1423        return 0;
1424}
1425
1426static int write_index_ext_header(git_SHA_CTX *context, int fd,
1427                                  unsigned int ext, unsigned int sz)
1428{
1429        ext = htonl(ext);
1430        sz = htonl(sz);
1431        return ((ce_write(context, fd, &ext, 4) < 0) ||
1432                (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1433}
1434
1435static int ce_flush(git_SHA_CTX *context, int fd)
1436{
1437        unsigned int left = write_buffer_len;
1438
1439        if (left) {
1440                write_buffer_len = 0;
1441                git_SHA1_Update(context, write_buffer, left);
1442        }
1443
1444        /* Flush first if not enough space for SHA1 signature */
1445        if (left + 20 > WRITE_BUFFER_SIZE) {
1446                if (write_in_full(fd, write_buffer, left) != left)
1447                        return -1;
1448                left = 0;
1449        }
1450
1451        /* Append the SHA1 signature at the end */
1452        git_SHA1_Final(write_buffer + left, context);
1453        left += 20;
1454        return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1455}
1456
1457static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1458{
1459        /*
1460         * The only thing we care about in this function is to smudge the
1461         * falsely clean entry due to touch-update-touch race, so we leave
1462         * everything else as they are.  We are called for entries whose
1463         * ce_mtime match the index file mtime.
1464         *
1465         * Note that this actually does not do much for gitlinks, for
1466         * which ce_match_stat_basic() always goes to the actual
1467         * contents.  The caller checks with is_racy_timestamp() which
1468         * always says "no" for gitlinks, so we are not called for them ;-)
1469         */
1470        struct stat st;
1471
1472        if (lstat(ce->name, &st) < 0)
1473                return;
1474        if (ce_match_stat_basic(ce, &st))
1475                return;
1476        if (ce_modified_check_fs(ce, &st)) {
1477                /* This is "racily clean"; smudge it.  Note that this
1478                 * is a tricky code.  At first glance, it may appear
1479                 * that it can break with this sequence:
1480                 *
1481                 * $ echo xyzzy >frotz
1482                 * $ git-update-index --add frotz
1483                 * $ : >frotz
1484                 * $ sleep 3
1485                 * $ echo filfre >nitfol
1486                 * $ git-update-index --add nitfol
1487                 *
1488                 * but it does not.  When the second update-index runs,
1489                 * it notices that the entry "frotz" has the same timestamp
1490                 * as index, and if we were to smudge it by resetting its
1491                 * size to zero here, then the object name recorded
1492                 * in index is the 6-byte file but the cached stat information
1493                 * becomes zero --- which would then match what we would
1494                 * obtain from the filesystem next time we stat("frotz").
1495                 *
1496                 * However, the second update-index, before calling
1497                 * this function, notices that the cached size is 6
1498                 * bytes and what is on the filesystem is an empty
1499                 * file, and never calls us, so the cached size information
1500                 * for "frotz" stays 6 which does not match the filesystem.
1501                 */
1502                ce->ce_size = 0;
1503        }
1504}
1505
1506static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
1507{
1508        int size = ondisk_ce_size(ce);
1509        struct ondisk_cache_entry *ondisk = xcalloc(1, size);
1510        char *name;
1511
1512        ondisk->ctime.sec = htonl(ce->ce_ctime.sec);
1513        ondisk->mtime.sec = htonl(ce->ce_mtime.sec);
1514        ondisk->ctime.nsec = htonl(ce->ce_ctime.nsec);
1515        ondisk->mtime.nsec = htonl(ce->ce_mtime.nsec);
1516        ondisk->dev  = htonl(ce->ce_dev);
1517        ondisk->ino  = htonl(ce->ce_ino);
1518        ondisk->mode = htonl(ce->ce_mode);
1519        ondisk->uid  = htonl(ce->ce_uid);
1520        ondisk->gid  = htonl(ce->ce_gid);
1521        ondisk->size = htonl(ce->ce_size);
1522        hashcpy(ondisk->sha1, ce->sha1);
1523        ondisk->flags = htons(ce->ce_flags);
1524        if (ce->ce_flags & CE_EXTENDED) {
1525                struct ondisk_cache_entry_extended *ondisk2;
1526                ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1527                ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1528                name = ondisk2->name;
1529        }
1530        else
1531                name = ondisk->name;
1532        memcpy(name, ce->name, ce_namelen(ce));
1533
1534        return ce_write(c, fd, ondisk, size);
1535}
1536
1537int write_index(struct index_state *istate, int newfd)
1538{
1539        git_SHA_CTX c;
1540        struct cache_header hdr;
1541        int i, err, removed, extended;
1542        struct cache_entry **cache = istate->cache;
1543        int entries = istate->cache_nr;
1544        struct stat st;
1545
1546        for (i = removed = extended = 0; i < entries; i++) {
1547                if (cache[i]->ce_flags & CE_REMOVE)
1548                        removed++;
1549
1550                /* reduce extended entries if possible */
1551                cache[i]->ce_flags &= ~CE_EXTENDED;
1552                if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1553                        extended++;
1554                        cache[i]->ce_flags |= CE_EXTENDED;
1555                }
1556        }
1557
1558        hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1559        /* for extended format, increase version so older git won't try to read it */
1560        hdr.hdr_version = htonl(extended ? 3 : 2);
1561        hdr.hdr_entries = htonl(entries - removed);
1562
1563        git_SHA1_Init(&c);
1564        if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1565                return -1;
1566
1567        for (i = 0; i < entries; i++) {
1568                struct cache_entry *ce = cache[i];
1569                if (ce->ce_flags & CE_REMOVE)
1570                        continue;
1571                if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
1572                        ce_smudge_racily_clean_entry(ce);
1573                if (ce_write_entry(&c, newfd, ce) < 0)
1574                        return -1;
1575        }
1576
1577        /* Write extension data here */
1578        if (istate->cache_tree) {
1579                struct strbuf sb = STRBUF_INIT;
1580
1581                cache_tree_write(&sb, istate->cache_tree);
1582                err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1583                        || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1584                strbuf_release(&sb);
1585                if (err)
1586                        return -1;
1587        }
1588
1589        if (ce_flush(&c, newfd) || fstat(newfd, &st))
1590                return -1;
1591        istate->timestamp.sec = (unsigned int)st.st_mtime;
1592        istate->timestamp.nsec = ST_MTIME_NSEC(st);
1593        return 0;
1594}
1595
1596/*
1597 * Read the index file that is potentially unmerged into given
1598 * index_state, dropping any unmerged entries.  Returns true if
1599 * the index is unmerged.  Callers who want to refuse to work
1600 * from an unmerged state can call this and check its return value,
1601 * instead of calling read_cache().
1602 */
1603int read_index_unmerged(struct index_state *istate)
1604{
1605        int i;
1606        int unmerged = 0;
1607
1608        read_index(istate);
1609        for (i = 0; i < istate->cache_nr; i++) {
1610                struct cache_entry *ce = istate->cache[i];
1611                struct cache_entry *new_ce;
1612                int size, len;
1613
1614                if (!ce_stage(ce))
1615                        continue;
1616                unmerged = 1;
1617                len = strlen(ce->name);
1618                size = cache_entry_size(len);
1619                new_ce = xcalloc(1, size);
1620                hashcpy(new_ce->sha1, ce->sha1);
1621                memcpy(new_ce->name, ce->name, len);
1622                new_ce->ce_flags = create_ce_flags(len, 0);
1623                new_ce->ce_mode = ce->ce_mode;
1624                if (add_index_entry(istate, new_ce, 0))
1625                        return error("%s: cannot drop to stage #0",
1626                                     ce->name);
1627                i = index_name_pos(istate, new_ce->name, len);
1628        }
1629        return unmerged;
1630}
1631
1632struct update_callback_data
1633{
1634        int flags;
1635        int add_errors;
1636};
1637
1638static void update_callback(struct diff_queue_struct *q,
1639                            struct diff_options *opt, void *cbdata)
1640{
1641        int i;
1642        struct update_callback_data *data = cbdata;
1643
1644        for (i = 0; i < q->nr; i++) {
1645                struct diff_filepair *p = q->queue[i];
1646                const char *path = p->one->path;
1647                switch (p->status) {
1648                default:
1649                        die("unexpected diff status %c", p->status);
1650                case DIFF_STATUS_UNMERGED:
1651                        /*
1652                         * ADD_CACHE_IGNORE_REMOVAL is unset if "git
1653                         * add -u" is calling us, In such a case, a
1654                         * missing work tree file needs to be removed
1655                         * if there is an unmerged entry at stage #2,
1656                         * but such a diff record is followed by
1657                         * another with DIFF_STATUS_DELETED (and if
1658                         * there is no stage #2, we won't see DELETED
1659                         * nor MODIFIED).  We can simply continue
1660                         * either way.
1661                         */
1662                        if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL))
1663                                continue;
1664                        /*
1665                         * Otherwise, it is "git add path" is asking
1666                         * to explicitly add it; we fall through.  A
1667                         * missing work tree file is an error and is
1668                         * caught by add_file_to_index() in such a
1669                         * case.
1670                         */
1671                case DIFF_STATUS_MODIFIED:
1672                case DIFF_STATUS_TYPE_CHANGED:
1673                        if (add_file_to_index(&the_index, path, data->flags)) {
1674                                if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
1675                                        die("updating files failed");
1676                                data->add_errors++;
1677                        }
1678                        break;
1679                case DIFF_STATUS_DELETED:
1680                        if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
1681                                break;
1682                        if (!(data->flags & ADD_CACHE_PRETEND))
1683                                remove_file_from_index(&the_index, path);
1684                        if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
1685                                printf("remove '%s'\n", path);
1686                        break;
1687                }
1688        }
1689}
1690
1691int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
1692{
1693        struct update_callback_data data;
1694        struct rev_info rev;
1695        init_revisions(&rev, prefix);
1696        setup_revisions(0, NULL, &rev, NULL);
1697        rev.prune_data = pathspec;
1698        rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
1699        rev.diffopt.format_callback = update_callback;
1700        data.flags = flags;
1701        data.add_errors = 0;
1702        rev.diffopt.format_callback_data = &data;
1703        run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
1704        return !!data.add_errors;
1705}
1706
1707/*
1708 * Returns 1 if the path is an "other" path with respect to
1709 * the index; that is, the path is not mentioned in the index at all,
1710 * either as a file, a directory with some files in the index,
1711 * or as an unmerged entry.
1712 *
1713 * We helpfully remove a trailing "/" from directories so that
1714 * the output of read_directory can be used as-is.
1715 */
1716int index_name_is_other(const struct index_state *istate, const char *name,
1717                int namelen)
1718{
1719        int pos;
1720        if (namelen && name[namelen - 1] == '/')
1721                namelen--;
1722        pos = index_name_pos(istate, name, namelen);
1723        if (0 <= pos)
1724                return 0;       /* exact match */
1725        pos = -pos - 1;
1726        if (pos < istate->cache_nr) {
1727                struct cache_entry *ce = istate->cache[pos];
1728                if (ce_namelen(ce) == namelen &&
1729                    !memcmp(ce->name, name, namelen))
1730                        return 0; /* Yup, this one exists unmerged */
1731        }
1732        return 1;
1733}