builtin / update-index.con commit Merge tag 'v2.9.5' into maint-2.10 (d78f06a)
   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6#include "cache.h"
   7#include "lockfile.h"
   8#include "quote.h"
   9#include "cache-tree.h"
  10#include "tree-walk.h"
  11#include "builtin.h"
  12#include "refs.h"
  13#include "resolve-undo.h"
  14#include "parse-options.h"
  15#include "pathspec.h"
  16#include "dir.h"
  17#include "split-index.h"
  18
  19/*
  20 * Default to not allowing changes to the list of files. The
  21 * tool doesn't actually care, but this makes it harder to add
  22 * files to the revision control by mistake by doing something
  23 * like "git update-index *" and suddenly having all the object
  24 * files be revision controlled.
  25 */
  26static int allow_add;
  27static int allow_remove;
  28static int allow_replace;
  29static int info_only;
  30static int force_remove;
  31static int verbose;
  32static int mark_valid_only;
  33static int mark_skip_worktree_only;
  34#define MARK_FLAG 1
  35#define UNMARK_FLAG 2
  36static struct strbuf mtime_dir = STRBUF_INIT;
  37
  38/* Untracked cache mode */
  39enum uc_mode {
  40        UC_UNSPECIFIED = -1,
  41        UC_DISABLE = 0,
  42        UC_ENABLE,
  43        UC_TEST,
  44        UC_FORCE
  45};
  46
  47__attribute__((format (printf, 1, 2)))
  48static void report(const char *fmt, ...)
  49{
  50        va_list vp;
  51
  52        if (!verbose)
  53                return;
  54
  55        va_start(vp, fmt);
  56        vprintf(fmt, vp);
  57        putchar('\n');
  58        va_end(vp);
  59}
  60
  61static void remove_test_directory(void)
  62{
  63        if (mtime_dir.len)
  64                remove_dir_recursively(&mtime_dir, 0);
  65}
  66
  67static const char *get_mtime_path(const char *path)
  68{
  69        static struct strbuf sb = STRBUF_INIT;
  70        strbuf_reset(&sb);
  71        strbuf_addf(&sb, "%s/%s", mtime_dir.buf, path);
  72        return sb.buf;
  73}
  74
  75static void xmkdir(const char *path)
  76{
  77        path = get_mtime_path(path);
  78        if (mkdir(path, 0700))
  79                die_errno(_("failed to create directory %s"), path);
  80}
  81
  82static int xstat_mtime_dir(struct stat *st)
  83{
  84        if (stat(mtime_dir.buf, st))
  85                die_errno(_("failed to stat %s"), mtime_dir.buf);
  86        return 0;
  87}
  88
  89static int create_file(const char *path)
  90{
  91        int fd;
  92        path = get_mtime_path(path);
  93        fd = open(path, O_CREAT | O_RDWR, 0644);
  94        if (fd < 0)
  95                die_errno(_("failed to create file %s"), path);
  96        return fd;
  97}
  98
  99static void xunlink(const char *path)
 100{
 101        path = get_mtime_path(path);
 102        if (unlink(path))
 103                die_errno(_("failed to delete file %s"), path);
 104}
 105
 106static void xrmdir(const char *path)
 107{
 108        path = get_mtime_path(path);
 109        if (rmdir(path))
 110                die_errno(_("failed to delete directory %s"), path);
 111}
 112
 113static void avoid_racy(void)
 114{
 115        /*
 116         * not use if we could usleep(10) if USE_NSEC is defined. The
 117         * field nsec could be there, but the OS could choose to
 118         * ignore it?
 119         */
 120        sleep(1);
 121}
 122
 123static int test_if_untracked_cache_is_supported(void)
 124{
 125        struct stat st;
 126        struct stat_data base;
 127        int fd, ret = 0;
 128
 129        strbuf_addstr(&mtime_dir, "mtime-test-XXXXXX");
 130        if (!mkdtemp(mtime_dir.buf))
 131                die_errno("Could not make temporary directory");
 132
 133        fprintf(stderr, _("Testing mtime in '%s' "), xgetcwd());
 134        atexit(remove_test_directory);
 135        xstat_mtime_dir(&st);
 136        fill_stat_data(&base, &st);
 137        fputc('.', stderr);
 138
 139        avoid_racy();
 140        fd = create_file("newfile");
 141        xstat_mtime_dir(&st);
 142        if (!match_stat_data(&base, &st)) {
 143                close(fd);
 144                fputc('\n', stderr);
 145                fprintf_ln(stderr,_("directory stat info does not "
 146                                    "change after adding a new file"));
 147                goto done;
 148        }
 149        fill_stat_data(&base, &st);
 150        fputc('.', stderr);
 151
 152        avoid_racy();
 153        xmkdir("new-dir");
 154        xstat_mtime_dir(&st);
 155        if (!match_stat_data(&base, &st)) {
 156                close(fd);
 157                fputc('\n', stderr);
 158                fprintf_ln(stderr, _("directory stat info does not change "
 159                                     "after adding a new directory"));
 160                goto done;
 161        }
 162        fill_stat_data(&base, &st);
 163        fputc('.', stderr);
 164
 165        avoid_racy();
 166        write_or_die(fd, "data", 4);
 167        close(fd);
 168        xstat_mtime_dir(&st);
 169        if (match_stat_data(&base, &st)) {
 170                fputc('\n', stderr);
 171                fprintf_ln(stderr, _("directory stat info changes "
 172                                     "after updating a file"));
 173                goto done;
 174        }
 175        fputc('.', stderr);
 176
 177        avoid_racy();
 178        close(create_file("new-dir/new"));
 179        xstat_mtime_dir(&st);
 180        if (match_stat_data(&base, &st)) {
 181                fputc('\n', stderr);
 182                fprintf_ln(stderr, _("directory stat info changes after "
 183                                     "adding a file inside subdirectory"));
 184                goto done;
 185        }
 186        fputc('.', stderr);
 187
 188        avoid_racy();
 189        xunlink("newfile");
 190        xstat_mtime_dir(&st);
 191        if (!match_stat_data(&base, &st)) {
 192                fputc('\n', stderr);
 193                fprintf_ln(stderr, _("directory stat info does not "
 194                                     "change after deleting a file"));
 195                goto done;
 196        }
 197        fill_stat_data(&base, &st);
 198        fputc('.', stderr);
 199
 200        avoid_racy();
 201        xunlink("new-dir/new");
 202        xrmdir("new-dir");
 203        xstat_mtime_dir(&st);
 204        if (!match_stat_data(&base, &st)) {
 205                fputc('\n', stderr);
 206                fprintf_ln(stderr, _("directory stat info does not "
 207                                     "change after deleting a directory"));
 208                goto done;
 209        }
 210
 211        if (rmdir(mtime_dir.buf))
 212                die_errno(_("failed to delete directory %s"), mtime_dir.buf);
 213        fprintf_ln(stderr, _(" OK"));
 214        ret = 1;
 215
 216done:
 217        strbuf_release(&mtime_dir);
 218        return ret;
 219}
 220
 221static int mark_ce_flags(const char *path, int flag, int mark)
 222{
 223        int namelen = strlen(path);
 224        int pos = cache_name_pos(path, namelen);
 225        if (0 <= pos) {
 226                if (mark)
 227                        active_cache[pos]->ce_flags |= flag;
 228                else
 229                        active_cache[pos]->ce_flags &= ~flag;
 230                active_cache[pos]->ce_flags |= CE_UPDATE_IN_BASE;
 231                cache_tree_invalidate_path(&the_index, path);
 232                active_cache_changed |= CE_ENTRY_CHANGED;
 233                return 0;
 234        }
 235        return -1;
 236}
 237
 238static int remove_one_path(const char *path)
 239{
 240        if (!allow_remove)
 241                return error("%s: does not exist and --remove not passed", path);
 242        if (remove_file_from_cache(path))
 243                return error("%s: cannot remove from the index", path);
 244        return 0;
 245}
 246
 247/*
 248 * Handle a path that couldn't be lstat'ed. It's either:
 249 *  - missing file (ENOENT or ENOTDIR). That's ok if we're
 250 *    supposed to be removing it and the removal actually
 251 *    succeeds.
 252 *  - permission error. That's never ok.
 253 */
 254static int process_lstat_error(const char *path, int err)
 255{
 256        if (err == ENOENT || err == ENOTDIR)
 257                return remove_one_path(path);
 258        return error("lstat(\"%s\"): %s", path, strerror(err));
 259}
 260
 261static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
 262{
 263        int option, size;
 264        struct cache_entry *ce;
 265
 266        /* Was the old index entry already up-to-date? */
 267        if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
 268                return 0;
 269
 270        size = cache_entry_size(len);
 271        ce = xcalloc(1, size);
 272        memcpy(ce->name, path, len);
 273        ce->ce_flags = create_ce_flags(0);
 274        ce->ce_namelen = len;
 275        fill_stat_cache_info(ce, st);
 276        ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
 277
 278        if (index_path(ce->sha1, path, st,
 279                       info_only ? 0 : HASH_WRITE_OBJECT)) {
 280                free(ce);
 281                return -1;
 282        }
 283        option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
 284        option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
 285        if (add_cache_entry(ce, option))
 286                return error("%s: cannot add to the index - missing --add option?", path);
 287        return 0;
 288}
 289
 290/*
 291 * Handle a path that was a directory. Four cases:
 292 *
 293 *  - it's already a gitlink in the index, and we keep it that
 294 *    way, and update it if we can (if we cannot find the HEAD,
 295 *    we're going to keep it unchanged in the index!)
 296 *
 297 *  - it's a *file* in the index, in which case it should be
 298 *    removed as a file if removal is allowed, since it doesn't
 299 *    exist as such any more. If removal isn't allowed, it's
 300 *    an error.
 301 *
 302 *    (NOTE! This is old and arguably fairly strange behaviour.
 303 *    We might want to make this an error unconditionally, and
 304 *    use "--force-remove" if you actually want to force removal).
 305 *
 306 *  - it used to exist as a subdirectory (ie multiple files with
 307 *    this particular prefix) in the index, in which case it's wrong
 308 *    to try to update it as a directory.
 309 *
 310 *  - it doesn't exist at all in the index, but it is a valid
 311 *    git directory, and it should be *added* as a gitlink.
 312 */
 313static int process_directory(const char *path, int len, struct stat *st)
 314{
 315        unsigned char sha1[20];
 316        int pos = cache_name_pos(path, len);
 317
 318        /* Exact match: file or existing gitlink */
 319        if (pos >= 0) {
 320                const struct cache_entry *ce = active_cache[pos];
 321                if (S_ISGITLINK(ce->ce_mode)) {
 322
 323                        /* Do nothing to the index if there is no HEAD! */
 324                        if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
 325                                return 0;
 326
 327                        return add_one_path(ce, path, len, st);
 328                }
 329                /* Should this be an unconditional error? */
 330                return remove_one_path(path);
 331        }
 332
 333        /* Inexact match: is there perhaps a subdirectory match? */
 334        pos = -pos-1;
 335        while (pos < active_nr) {
 336                const struct cache_entry *ce = active_cache[pos++];
 337
 338                if (strncmp(ce->name, path, len))
 339                        break;
 340                if (ce->name[len] > '/')
 341                        break;
 342                if (ce->name[len] < '/')
 343                        continue;
 344
 345                /* Subdirectory match - error out */
 346                return error("%s: is a directory - add individual files instead", path);
 347        }
 348
 349        /* No match - should we add it as a gitlink? */
 350        if (!resolve_gitlink_ref(path, "HEAD", sha1))
 351                return add_one_path(NULL, path, len, st);
 352
 353        /* Error out. */
 354        return error("%s: is a directory - add files inside instead", path);
 355}
 356
 357static int process_path(const char *path)
 358{
 359        int pos, len;
 360        struct stat st;
 361        const struct cache_entry *ce;
 362
 363        len = strlen(path);
 364        if (has_symlink_leading_path(path, len))
 365                return error("'%s' is beyond a symbolic link", path);
 366
 367        pos = cache_name_pos(path, len);
 368        ce = pos < 0 ? NULL : active_cache[pos];
 369        if (ce && ce_skip_worktree(ce)) {
 370                /*
 371                 * working directory version is assumed "good"
 372                 * so updating it does not make sense.
 373                 * On the other hand, removing it from index should work
 374                 */
 375                if (allow_remove && remove_file_from_cache(path))
 376                        return error("%s: cannot remove from the index", path);
 377                return 0;
 378        }
 379
 380        /*
 381         * First things first: get the stat information, to decide
 382         * what to do about the pathname!
 383         */
 384        if (lstat(path, &st) < 0)
 385                return process_lstat_error(path, errno);
 386
 387        if (S_ISDIR(st.st_mode))
 388                return process_directory(path, len, &st);
 389
 390        return add_one_path(ce, path, len, &st);
 391}
 392
 393static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
 394                         const char *path, int stage)
 395{
 396        int size, len, option;
 397        struct cache_entry *ce;
 398
 399        if (!verify_path(path))
 400                return error("Invalid path '%s'", path);
 401
 402        len = strlen(path);
 403        size = cache_entry_size(len);
 404        ce = xcalloc(1, size);
 405
 406        hashcpy(ce->sha1, sha1);
 407        memcpy(ce->name, path, len);
 408        ce->ce_flags = create_ce_flags(stage);
 409        ce->ce_namelen = len;
 410        ce->ce_mode = create_ce_mode(mode);
 411        if (assume_unchanged)
 412                ce->ce_flags |= CE_VALID;
 413        option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
 414        option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
 415        if (add_cache_entry(ce, option))
 416                return error("%s: cannot add to the index - missing --add option?",
 417                             path);
 418        report("add '%s'", path);
 419        return 0;
 420}
 421
 422static void chmod_path(char flip, const char *path)
 423{
 424        int pos;
 425        struct cache_entry *ce;
 426
 427        pos = cache_name_pos(path, strlen(path));
 428        if (pos < 0)
 429                goto fail;
 430        ce = active_cache[pos];
 431        if (chmod_cache_entry(ce, flip) < 0)
 432                goto fail;
 433
 434        report("chmod %cx '%s'", flip, path);
 435        return;
 436 fail:
 437        die("git update-index: cannot chmod %cx '%s'", flip, path);
 438}
 439
 440static void update_one(const char *path)
 441{
 442        if (!verify_path(path)) {
 443                fprintf(stderr, "Ignoring path %s\n", path);
 444                return;
 445        }
 446        if (mark_valid_only) {
 447                if (mark_ce_flags(path, CE_VALID, mark_valid_only == MARK_FLAG))
 448                        die("Unable to mark file %s", path);
 449                return;
 450        }
 451        if (mark_skip_worktree_only) {
 452                if (mark_ce_flags(path, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
 453                        die("Unable to mark file %s", path);
 454                return;
 455        }
 456
 457        if (force_remove) {
 458                if (remove_file_from_cache(path))
 459                        die("git update-index: unable to remove %s", path);
 460                report("remove '%s'", path);
 461                return;
 462        }
 463        if (process_path(path))
 464                die("Unable to process path %s", path);
 465        report("add '%s'", path);
 466}
 467
 468static void read_index_info(int nul_term_line)
 469{
 470        struct strbuf buf = STRBUF_INIT;
 471        struct strbuf uq = STRBUF_INIT;
 472        strbuf_getline_fn getline_fn;
 473
 474        getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
 475        while (getline_fn(&buf, stdin) != EOF) {
 476                char *ptr, *tab;
 477                char *path_name;
 478                unsigned char sha1[20];
 479                unsigned int mode;
 480                unsigned long ul;
 481                int stage;
 482
 483                /* This reads lines formatted in one of three formats:
 484                 *
 485                 * (1) mode         SP sha1          TAB path
 486                 * The first format is what "git apply --index-info"
 487                 * reports, and used to reconstruct a partial tree
 488                 * that is used for phony merge base tree when falling
 489                 * back on 3-way merge.
 490                 *
 491                 * (2) mode SP type SP sha1          TAB path
 492                 * The second format is to stuff "git ls-tree" output
 493                 * into the index file.
 494                 *
 495                 * (3) mode         SP sha1 SP stage TAB path
 496                 * This format is to put higher order stages into the
 497                 * index file and matches "git ls-files --stage" output.
 498                 */
 499                errno = 0;
 500                ul = strtoul(buf.buf, &ptr, 8);
 501                if (ptr == buf.buf || *ptr != ' '
 502                    || errno || (unsigned int) ul != ul)
 503                        goto bad_line;
 504                mode = ul;
 505
 506                tab = strchr(ptr, '\t');
 507                if (!tab || tab - ptr < 41)
 508                        goto bad_line;
 509
 510                if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
 511                        stage = tab[-1] - '0';
 512                        ptr = tab + 1; /* point at the head of path */
 513                        tab = tab - 2; /* point at tail of sha1 */
 514                }
 515                else {
 516                        stage = 0;
 517                        ptr = tab + 1; /* point at the head of path */
 518                }
 519
 520                if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
 521                        goto bad_line;
 522
 523                path_name = ptr;
 524                if (!nul_term_line && path_name[0] == '"') {
 525                        strbuf_reset(&uq);
 526                        if (unquote_c_style(&uq, path_name, NULL)) {
 527                                die("git update-index: bad quoting of path name");
 528                        }
 529                        path_name = uq.buf;
 530                }
 531
 532                if (!verify_path(path_name)) {
 533                        fprintf(stderr, "Ignoring path %s\n", path_name);
 534                        continue;
 535                }
 536
 537                if (!mode) {
 538                        /* mode == 0 means there is no such path -- remove */
 539                        if (remove_file_from_cache(path_name))
 540                                die("git update-index: unable to remove %s",
 541                                    ptr);
 542                }
 543                else {
 544                        /* mode ' ' sha1 '\t' name
 545                         * ptr[-1] points at tab,
 546                         * ptr[-41] is at the beginning of sha1
 547                         */
 548                        ptr[-42] = ptr[-1] = 0;
 549                        if (add_cacheinfo(mode, sha1, path_name, stage))
 550                                die("git update-index: unable to update %s",
 551                                    path_name);
 552                }
 553                continue;
 554
 555        bad_line:
 556                die("malformed index info %s", buf.buf);
 557        }
 558        strbuf_release(&buf);
 559        strbuf_release(&uq);
 560}
 561
 562static const char * const update_index_usage[] = {
 563        N_("git update-index [<options>] [--] [<file>...]"),
 564        NULL
 565};
 566
 567static unsigned char head_sha1[20];
 568static unsigned char merge_head_sha1[20];
 569
 570static struct cache_entry *read_one_ent(const char *which,
 571                                        unsigned char *ent, const char *path,
 572                                        int namelen, int stage)
 573{
 574        unsigned mode;
 575        unsigned char sha1[20];
 576        int size;
 577        struct cache_entry *ce;
 578
 579        if (get_tree_entry(ent, path, sha1, &mode)) {
 580                if (which)
 581                        error("%s: not in %s branch.", path, which);
 582                return NULL;
 583        }
 584        if (mode == S_IFDIR) {
 585                if (which)
 586                        error("%s: not a blob in %s branch.", path, which);
 587                return NULL;
 588        }
 589        size = cache_entry_size(namelen);
 590        ce = xcalloc(1, size);
 591
 592        hashcpy(ce->sha1, sha1);
 593        memcpy(ce->name, path, namelen);
 594        ce->ce_flags = create_ce_flags(stage);
 595        ce->ce_namelen = namelen;
 596        ce->ce_mode = create_ce_mode(mode);
 597        return ce;
 598}
 599
 600static int unresolve_one(const char *path)
 601{
 602        int namelen = strlen(path);
 603        int pos;
 604        int ret = 0;
 605        struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
 606
 607        /* See if there is such entry in the index. */
 608        pos = cache_name_pos(path, namelen);
 609        if (0 <= pos) {
 610                /* already merged */
 611                pos = unmerge_cache_entry_at(pos);
 612                if (pos < active_nr) {
 613                        const struct cache_entry *ce = active_cache[pos];
 614                        if (ce_stage(ce) &&
 615                            ce_namelen(ce) == namelen &&
 616                            !memcmp(ce->name, path, namelen))
 617                                return 0;
 618                }
 619                /* no resolve-undo information; fall back */
 620        } else {
 621                /* If there isn't, either it is unmerged, or
 622                 * resolved as "removed" by mistake.  We do not
 623                 * want to do anything in the former case.
 624                 */
 625                pos = -pos-1;
 626                if (pos < active_nr) {
 627                        const struct cache_entry *ce = active_cache[pos];
 628                        if (ce_namelen(ce) == namelen &&
 629                            !memcmp(ce->name, path, namelen)) {
 630                                fprintf(stderr,
 631                                        "%s: skipping still unmerged path.\n",
 632                                        path);
 633                                goto free_return;
 634                        }
 635                }
 636        }
 637
 638        /* Grab blobs from given path from HEAD and MERGE_HEAD,
 639         * stuff HEAD version in stage #2,
 640         * stuff MERGE_HEAD version in stage #3.
 641         */
 642        ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
 643        ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
 644
 645        if (!ce_2 || !ce_3) {
 646                ret = -1;
 647                goto free_return;
 648        }
 649        if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
 650            ce_2->ce_mode == ce_3->ce_mode) {
 651                fprintf(stderr, "%s: identical in both, skipping.\n",
 652                        path);
 653                goto free_return;
 654        }
 655
 656        remove_file_from_cache(path);
 657        if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
 658                error("%s: cannot add our version to the index.", path);
 659                ret = -1;
 660                goto free_return;
 661        }
 662        if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
 663                return 0;
 664        error("%s: cannot add their version to the index.", path);
 665        ret = -1;
 666 free_return:
 667        free(ce_2);
 668        free(ce_3);
 669        return ret;
 670}
 671
 672static void read_head_pointers(void)
 673{
 674        if (read_ref("HEAD", head_sha1))
 675                die("No HEAD -- no initial commit yet?");
 676        if (read_ref("MERGE_HEAD", merge_head_sha1)) {
 677                fprintf(stderr, "Not in the middle of a merge.\n");
 678                exit(0);
 679        }
 680}
 681
 682static int do_unresolve(int ac, const char **av,
 683                        const char *prefix, int prefix_length)
 684{
 685        int i;
 686        int err = 0;
 687
 688        /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
 689         * are not doing a merge, so exit with success status.
 690         */
 691        read_head_pointers();
 692
 693        for (i = 1; i < ac; i++) {
 694                const char *arg = av[i];
 695                char *p = prefix_path(prefix, prefix_length, arg);
 696                err |= unresolve_one(p);
 697                free(p);
 698        }
 699        return err;
 700}
 701
 702static int do_reupdate(int ac, const char **av,
 703                       const char *prefix, int prefix_length)
 704{
 705        /* Read HEAD and run update-index on paths that are
 706         * merged and already different between index and HEAD.
 707         */
 708        int pos;
 709        int has_head = 1;
 710        struct pathspec pathspec;
 711
 712        parse_pathspec(&pathspec, 0,
 713                       PATHSPEC_PREFER_CWD,
 714                       prefix, av + 1);
 715
 716        if (read_ref("HEAD", head_sha1))
 717                /* If there is no HEAD, that means it is an initial
 718                 * commit.  Update everything in the index.
 719                 */
 720                has_head = 0;
 721 redo:
 722        for (pos = 0; pos < active_nr; pos++) {
 723                const struct cache_entry *ce = active_cache[pos];
 724                struct cache_entry *old = NULL;
 725                int save_nr;
 726                char *path;
 727
 728                if (ce_stage(ce) || !ce_path_match(ce, &pathspec, NULL))
 729                        continue;
 730                if (has_head)
 731                        old = read_one_ent(NULL, head_sha1,
 732                                           ce->name, ce_namelen(ce), 0);
 733                if (old && ce->ce_mode == old->ce_mode &&
 734                    !hashcmp(ce->sha1, old->sha1)) {
 735                        free(old);
 736                        continue; /* unchanged */
 737                }
 738                /* Be careful.  The working tree may not have the
 739                 * path anymore, in which case, under 'allow_remove',
 740                 * or worse yet 'allow_replace', active_nr may decrease.
 741                 */
 742                save_nr = active_nr;
 743                path = xstrdup(ce->name);
 744                update_one(path);
 745                free(path);
 746                free(old);
 747                if (save_nr != active_nr)
 748                        goto redo;
 749        }
 750        clear_pathspec(&pathspec);
 751        return 0;
 752}
 753
 754struct refresh_params {
 755        unsigned int flags;
 756        int *has_errors;
 757};
 758
 759static int refresh(struct refresh_params *o, unsigned int flag)
 760{
 761        setup_work_tree();
 762        read_cache_preload(NULL);
 763        *o->has_errors |= refresh_cache(o->flags | flag);
 764        return 0;
 765}
 766
 767static int refresh_callback(const struct option *opt,
 768                                const char *arg, int unset)
 769{
 770        return refresh(opt->value, 0);
 771}
 772
 773static int really_refresh_callback(const struct option *opt,
 774                                const char *arg, int unset)
 775{
 776        return refresh(opt->value, REFRESH_REALLY);
 777}
 778
 779static int chmod_callback(const struct option *opt,
 780                                const char *arg, int unset)
 781{
 782        char *flip = opt->value;
 783        if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
 784                return error("option 'chmod' expects \"+x\" or \"-x\"");
 785        *flip = arg[0];
 786        return 0;
 787}
 788
 789static int resolve_undo_clear_callback(const struct option *opt,
 790                                const char *arg, int unset)
 791{
 792        resolve_undo_clear();
 793        return 0;
 794}
 795
 796static int parse_new_style_cacheinfo(const char *arg,
 797                                     unsigned int *mode,
 798                                     unsigned char sha1[],
 799                                     const char **path)
 800{
 801        unsigned long ul;
 802        char *endp;
 803
 804        if (!arg)
 805                return -1;
 806
 807        errno = 0;
 808        ul = strtoul(arg, &endp, 8);
 809        if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
 810                return -1; /* not a new-style cacheinfo */
 811        *mode = ul;
 812        endp++;
 813        if (get_sha1_hex(endp, sha1) || endp[40] != ',')
 814                return -1;
 815        *path = endp + 41;
 816        return 0;
 817}
 818
 819static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
 820                                const struct option *opt, int unset)
 821{
 822        unsigned char sha1[20];
 823        unsigned int mode;
 824        const char *path;
 825
 826        if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, sha1, &path)) {
 827                if (add_cacheinfo(mode, sha1, path, 0))
 828                        die("git update-index: --cacheinfo cannot add %s", path);
 829                ctx->argv++;
 830                ctx->argc--;
 831                return 0;
 832        }
 833        if (ctx->argc <= 3)
 834                return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
 835        if (strtoul_ui(*++ctx->argv, 8, &mode) ||
 836            get_sha1_hex(*++ctx->argv, sha1) ||
 837            add_cacheinfo(mode, sha1, *++ctx->argv, 0))
 838                die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
 839        ctx->argc -= 3;
 840        return 0;
 841}
 842
 843static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
 844                              const struct option *opt, int unset)
 845{
 846        int *nul_term_line = opt->value;
 847
 848        if (ctx->argc != 1)
 849                return error("option '%s' must be the last argument", opt->long_name);
 850        allow_add = allow_replace = allow_remove = 1;
 851        read_index_info(*nul_term_line);
 852        return 0;
 853}
 854
 855static int stdin_callback(struct parse_opt_ctx_t *ctx,
 856                                const struct option *opt, int unset)
 857{
 858        int *read_from_stdin = opt->value;
 859
 860        if (ctx->argc != 1)
 861                return error("option '%s' must be the last argument", opt->long_name);
 862        *read_from_stdin = 1;
 863        return 0;
 864}
 865
 866static int unresolve_callback(struct parse_opt_ctx_t *ctx,
 867                                const struct option *opt, int flags)
 868{
 869        int *has_errors = opt->value;
 870        const char *prefix = startup_info->prefix;
 871
 872        /* consume remaining arguments. */
 873        *has_errors = do_unresolve(ctx->argc, ctx->argv,
 874                                prefix, prefix ? strlen(prefix) : 0);
 875        if (*has_errors)
 876                active_cache_changed = 0;
 877
 878        ctx->argv += ctx->argc - 1;
 879        ctx->argc = 1;
 880        return 0;
 881}
 882
 883static int reupdate_callback(struct parse_opt_ctx_t *ctx,
 884                                const struct option *opt, int flags)
 885{
 886        int *has_errors = opt->value;
 887        const char *prefix = startup_info->prefix;
 888
 889        /* consume remaining arguments. */
 890        setup_work_tree();
 891        *has_errors = do_reupdate(ctx->argc, ctx->argv,
 892                                prefix, prefix ? strlen(prefix) : 0);
 893        if (*has_errors)
 894                active_cache_changed = 0;
 895
 896        ctx->argv += ctx->argc - 1;
 897        ctx->argc = 1;
 898        return 0;
 899}
 900
 901int cmd_update_index(int argc, const char **argv, const char *prefix)
 902{
 903        int newfd, entries, has_errors = 0, nul_term_line = 0;
 904        enum uc_mode untracked_cache = UC_UNSPECIFIED;
 905        int read_from_stdin = 0;
 906        int prefix_length = prefix ? strlen(prefix) : 0;
 907        int preferred_index_format = 0;
 908        char set_executable_bit = 0;
 909        struct refresh_params refresh_args = {0, &has_errors};
 910        int lock_error = 0;
 911        int split_index = -1;
 912        struct lock_file *lock_file;
 913        struct parse_opt_ctx_t ctx;
 914        strbuf_getline_fn getline_fn;
 915        int parseopt_state = PARSE_OPT_UNKNOWN;
 916        struct option options[] = {
 917                OPT_BIT('q', NULL, &refresh_args.flags,
 918                        N_("continue refresh even when index needs update"),
 919                        REFRESH_QUIET),
 920                OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
 921                        N_("refresh: ignore submodules"),
 922                        REFRESH_IGNORE_SUBMODULES),
 923                OPT_SET_INT(0, "add", &allow_add,
 924                        N_("do not ignore new files"), 1),
 925                OPT_SET_INT(0, "replace", &allow_replace,
 926                        N_("let files replace directories and vice-versa"), 1),
 927                OPT_SET_INT(0, "remove", &allow_remove,
 928                        N_("notice files missing from worktree"), 1),
 929                OPT_BIT(0, "unmerged", &refresh_args.flags,
 930                        N_("refresh even if index contains unmerged entries"),
 931                        REFRESH_UNMERGED),
 932                {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
 933                        N_("refresh stat information"),
 934                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 935                        refresh_callback},
 936                {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
 937                        N_("like --refresh, but ignore assume-unchanged setting"),
 938                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 939                        really_refresh_callback},
 940                {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
 941                        N_("<mode>,<object>,<path>"),
 942                        N_("add the specified entry to the index"),
 943                        PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
 944                        PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 945                        (parse_opt_cb *) cacheinfo_callback},
 946                {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
 947                        N_("override the executable bit of the listed files"),
 948                        PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 949                        chmod_callback},
 950                {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
 951                        N_("mark files as \"not changing\""),
 952                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
 953                {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
 954                        N_("clear assumed-unchanged bit"),
 955                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
 956                {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
 957                        N_("mark files as \"index-only\""),
 958                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
 959                {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
 960                        N_("clear skip-worktree bit"),
 961                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
 962                OPT_SET_INT(0, "info-only", &info_only,
 963                        N_("add to index only; do not add content to object database"), 1),
 964                OPT_SET_INT(0, "force-remove", &force_remove,
 965                        N_("remove named paths even if present in worktree"), 1),
 966                OPT_BOOL('z', NULL, &nul_term_line,
 967                         N_("with --stdin: input lines are terminated by null bytes")),
 968                {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
 969                        N_("read list of paths to be updated from standard input"),
 970                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 971                        (parse_opt_cb *) stdin_callback},
 972                {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
 973                        N_("add entries from standard input to the index"),
 974                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 975                        (parse_opt_cb *) stdin_cacheinfo_callback},
 976                {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
 977                        N_("repopulate stages #2 and #3 for the listed paths"),
 978                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 979                        (parse_opt_cb *) unresolve_callback},
 980                {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
 981                        N_("only update entries that differ from HEAD"),
 982                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 983                        (parse_opt_cb *) reupdate_callback},
 984                OPT_BIT(0, "ignore-missing", &refresh_args.flags,
 985                        N_("ignore files missing from worktree"),
 986                        REFRESH_IGNORE_MISSING),
 987                OPT_SET_INT(0, "verbose", &verbose,
 988                        N_("report actions to standard output"), 1),
 989                {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
 990                        N_("(for porcelains) forget saved unresolved conflicts"),
 991                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 992                        resolve_undo_clear_callback},
 993                OPT_INTEGER(0, "index-version", &preferred_index_format,
 994                        N_("write index in this format")),
 995                OPT_BOOL(0, "split-index", &split_index,
 996                        N_("enable or disable split index")),
 997                OPT_BOOL(0, "untracked-cache", &untracked_cache,
 998                        N_("enable/disable untracked cache")),
 999                OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
1000                            N_("test if the filesystem supports untracked cache"), UC_TEST),
1001                OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
1002                            N_("enable untracked cache without testing the filesystem"), UC_FORCE),
1003                OPT_END()
1004        };
1005
1006        if (argc == 2 && !strcmp(argv[1], "-h"))
1007                usage_with_options(update_index_usage, options);
1008
1009        git_config(git_default_config, NULL);
1010
1011        /* We can't free this memory, it becomes part of a linked list parsed atexit() */
1012        lock_file = xcalloc(1, sizeof(struct lock_file));
1013
1014        newfd = hold_locked_index(lock_file, 0);
1015        if (newfd < 0)
1016                lock_error = errno;
1017
1018        entries = read_cache();
1019        if (entries < 0)
1020                die("cache corrupted");
1021
1022        /*
1023         * Custom copy of parse_options() because we want to handle
1024         * filename arguments as they come.
1025         */
1026        parse_options_start(&ctx, argc, argv, prefix,
1027                            options, PARSE_OPT_STOP_AT_NON_OPTION);
1028        while (ctx.argc) {
1029                if (parseopt_state != PARSE_OPT_DONE)
1030                        parseopt_state = parse_options_step(&ctx, options,
1031                                                            update_index_usage);
1032                if (!ctx.argc)
1033                        break;
1034                switch (parseopt_state) {
1035                case PARSE_OPT_HELP:
1036                        exit(129);
1037                case PARSE_OPT_NON_OPTION:
1038                case PARSE_OPT_DONE:
1039                {
1040                        const char *path = ctx.argv[0];
1041                        char *p;
1042
1043                        setup_work_tree();
1044                        p = prefix_path(prefix, prefix_length, path);
1045                        update_one(p);
1046                        if (set_executable_bit)
1047                                chmod_path(set_executable_bit, p);
1048                        free(p);
1049                        ctx.argc--;
1050                        ctx.argv++;
1051                        break;
1052                }
1053                case PARSE_OPT_UNKNOWN:
1054                        if (ctx.argv[0][1] == '-')
1055                                error("unknown option '%s'", ctx.argv[0] + 2);
1056                        else
1057                                error("unknown switch '%c'", *ctx.opt);
1058                        usage_with_options(update_index_usage, options);
1059                }
1060        }
1061        argc = parse_options_end(&ctx);
1062
1063        getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
1064        if (preferred_index_format) {
1065                if (preferred_index_format < INDEX_FORMAT_LB ||
1066                    INDEX_FORMAT_UB < preferred_index_format)
1067                        die("index-version %d not in range: %d..%d",
1068                            preferred_index_format,
1069                            INDEX_FORMAT_LB, INDEX_FORMAT_UB);
1070
1071                if (the_index.version != preferred_index_format)
1072                        active_cache_changed |= SOMETHING_CHANGED;
1073                the_index.version = preferred_index_format;
1074        }
1075
1076        if (read_from_stdin) {
1077                struct strbuf buf = STRBUF_INIT;
1078                struct strbuf unquoted = STRBUF_INIT;
1079
1080                setup_work_tree();
1081                while (getline_fn(&buf, stdin) != EOF) {
1082                        char *p;
1083                        if (!nul_term_line && buf.buf[0] == '"') {
1084                                strbuf_reset(&unquoted);
1085                                if (unquote_c_style(&unquoted, buf.buf, NULL))
1086                                        die("line is badly quoted");
1087                                strbuf_swap(&buf, &unquoted);
1088                        }
1089                        p = prefix_path(prefix, prefix_length, buf.buf);
1090                        update_one(p);
1091                        if (set_executable_bit)
1092                                chmod_path(set_executable_bit, p);
1093                        free(p);
1094                }
1095                strbuf_release(&unquoted);
1096                strbuf_release(&buf);
1097        }
1098
1099        if (split_index > 0) {
1100                init_split_index(&the_index);
1101                the_index.cache_changed |= SPLIT_INDEX_ORDERED;
1102        } else if (!split_index && the_index.split_index) {
1103                /*
1104                 * can't discard_split_index(&the_index); because that
1105                 * will destroy split_index->base->cache[], which may
1106                 * be shared with the_index.cache[]. So yeah we're
1107                 * leaking a bit here.
1108                 */
1109                the_index.split_index = NULL;
1110                the_index.cache_changed |= SOMETHING_CHANGED;
1111        }
1112
1113        switch (untracked_cache) {
1114        case UC_UNSPECIFIED:
1115                break;
1116        case UC_DISABLE:
1117                if (git_config_get_untracked_cache() == 1)
1118                        warning("core.untrackedCache is set to true; "
1119                                "remove or change it, if you really want to "
1120                                "disable the untracked cache");
1121                remove_untracked_cache(&the_index);
1122                report(_("Untracked cache disabled"));
1123                break;
1124        case UC_TEST:
1125                setup_work_tree();
1126                return !test_if_untracked_cache_is_supported();
1127        case UC_ENABLE:
1128        case UC_FORCE:
1129                if (git_config_get_untracked_cache() == 0)
1130                        warning("core.untrackedCache is set to false; "
1131                                "remove or change it, if you really want to "
1132                                "enable the untracked cache");
1133                add_untracked_cache(&the_index);
1134                report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1135                break;
1136        default:
1137                die("BUG: bad untracked_cache value: %d", untracked_cache);
1138        }
1139
1140        if (active_cache_changed) {
1141                if (newfd < 0) {
1142                        if (refresh_args.flags & REFRESH_QUIET)
1143                                exit(128);
1144                        unable_to_lock_die(get_index_file(), lock_error);
1145                }
1146                if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
1147                        die("Unable to write new index file");
1148        }
1149
1150        rollback_lock_file(lock_file);
1151
1152        return has_errors ? 1 : 0;
1153}