builtin / update-index.con commit Sync with 2.8.3 (3916adf)
   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(int flip, const char *path)
 423{
 424        int pos;
 425        struct cache_entry *ce;
 426        unsigned int mode;
 427
 428        pos = cache_name_pos(path, strlen(path));
 429        if (pos < 0)
 430                goto fail;
 431        ce = active_cache[pos];
 432        mode = ce->ce_mode;
 433        if (!S_ISREG(mode))
 434                goto fail;
 435        switch (flip) {
 436        case '+':
 437                ce->ce_mode |= 0111; break;
 438        case '-':
 439                ce->ce_mode &= ~0111; break;
 440        default:
 441                goto fail;
 442        }
 443        cache_tree_invalidate_path(&the_index, path);
 444        ce->ce_flags |= CE_UPDATE_IN_BASE;
 445        active_cache_changed |= CE_ENTRY_CHANGED;
 446        report("chmod %cx '%s'", flip, path);
 447        return;
 448 fail:
 449        die("git update-index: cannot chmod %cx '%s'", flip, path);
 450}
 451
 452static void update_one(const char *path)
 453{
 454        if (!verify_path(path)) {
 455                fprintf(stderr, "Ignoring path %s\n", path);
 456                return;
 457        }
 458        if (mark_valid_only) {
 459                if (mark_ce_flags(path, CE_VALID, mark_valid_only == MARK_FLAG))
 460                        die("Unable to mark file %s", path);
 461                return;
 462        }
 463        if (mark_skip_worktree_only) {
 464                if (mark_ce_flags(path, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
 465                        die("Unable to mark file %s", path);
 466                return;
 467        }
 468
 469        if (force_remove) {
 470                if (remove_file_from_cache(path))
 471                        die("git update-index: unable to remove %s", path);
 472                report("remove '%s'", path);
 473                return;
 474        }
 475        if (process_path(path))
 476                die("Unable to process path %s", path);
 477        report("add '%s'", path);
 478}
 479
 480static void read_index_info(int nul_term_line)
 481{
 482        struct strbuf buf = STRBUF_INIT;
 483        struct strbuf uq = STRBUF_INIT;
 484        strbuf_getline_fn getline_fn;
 485
 486        getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
 487        while (getline_fn(&buf, stdin) != EOF) {
 488                char *ptr, *tab;
 489                char *path_name;
 490                unsigned char sha1[20];
 491                unsigned int mode;
 492                unsigned long ul;
 493                int stage;
 494
 495                /* This reads lines formatted in one of three formats:
 496                 *
 497                 * (1) mode         SP sha1          TAB path
 498                 * The first format is what "git apply --index-info"
 499                 * reports, and used to reconstruct a partial tree
 500                 * that is used for phony merge base tree when falling
 501                 * back on 3-way merge.
 502                 *
 503                 * (2) mode SP type SP sha1          TAB path
 504                 * The second format is to stuff "git ls-tree" output
 505                 * into the index file.
 506                 *
 507                 * (3) mode         SP sha1 SP stage TAB path
 508                 * This format is to put higher order stages into the
 509                 * index file and matches "git ls-files --stage" output.
 510                 */
 511                errno = 0;
 512                ul = strtoul(buf.buf, &ptr, 8);
 513                if (ptr == buf.buf || *ptr != ' '
 514                    || errno || (unsigned int) ul != ul)
 515                        goto bad_line;
 516                mode = ul;
 517
 518                tab = strchr(ptr, '\t');
 519                if (!tab || tab - ptr < 41)
 520                        goto bad_line;
 521
 522                if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
 523                        stage = tab[-1] - '0';
 524                        ptr = tab + 1; /* point at the head of path */
 525                        tab = tab - 2; /* point at tail of sha1 */
 526                }
 527                else {
 528                        stage = 0;
 529                        ptr = tab + 1; /* point at the head of path */
 530                }
 531
 532                if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
 533                        goto bad_line;
 534
 535                path_name = ptr;
 536                if (!nul_term_line && path_name[0] == '"') {
 537                        strbuf_reset(&uq);
 538                        if (unquote_c_style(&uq, path_name, NULL)) {
 539                                die("git update-index: bad quoting of path name");
 540                        }
 541                        path_name = uq.buf;
 542                }
 543
 544                if (!verify_path(path_name)) {
 545                        fprintf(stderr, "Ignoring path %s\n", path_name);
 546                        continue;
 547                }
 548
 549                if (!mode) {
 550                        /* mode == 0 means there is no such path -- remove */
 551                        if (remove_file_from_cache(path_name))
 552                                die("git update-index: unable to remove %s",
 553                                    ptr);
 554                }
 555                else {
 556                        /* mode ' ' sha1 '\t' name
 557                         * ptr[-1] points at tab,
 558                         * ptr[-41] is at the beginning of sha1
 559                         */
 560                        ptr[-42] = ptr[-1] = 0;
 561                        if (add_cacheinfo(mode, sha1, path_name, stage))
 562                                die("git update-index: unable to update %s",
 563                                    path_name);
 564                }
 565                continue;
 566
 567        bad_line:
 568                die("malformed index info %s", buf.buf);
 569        }
 570        strbuf_release(&buf);
 571        strbuf_release(&uq);
 572}
 573
 574static const char * const update_index_usage[] = {
 575        N_("git update-index [<options>] [--] [<file>...]"),
 576        NULL
 577};
 578
 579static unsigned char head_sha1[20];
 580static unsigned char merge_head_sha1[20];
 581
 582static struct cache_entry *read_one_ent(const char *which,
 583                                        unsigned char *ent, const char *path,
 584                                        int namelen, int stage)
 585{
 586        unsigned mode;
 587        unsigned char sha1[20];
 588        int size;
 589        struct cache_entry *ce;
 590
 591        if (get_tree_entry(ent, path, sha1, &mode)) {
 592                if (which)
 593                        error("%s: not in %s branch.", path, which);
 594                return NULL;
 595        }
 596        if (mode == S_IFDIR) {
 597                if (which)
 598                        error("%s: not a blob in %s branch.", path, which);
 599                return NULL;
 600        }
 601        size = cache_entry_size(namelen);
 602        ce = xcalloc(1, size);
 603
 604        hashcpy(ce->sha1, sha1);
 605        memcpy(ce->name, path, namelen);
 606        ce->ce_flags = create_ce_flags(stage);
 607        ce->ce_namelen = namelen;
 608        ce->ce_mode = create_ce_mode(mode);
 609        return ce;
 610}
 611
 612static int unresolve_one(const char *path)
 613{
 614        int namelen = strlen(path);
 615        int pos;
 616        int ret = 0;
 617        struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
 618
 619        /* See if there is such entry in the index. */
 620        pos = cache_name_pos(path, namelen);
 621        if (0 <= pos) {
 622                /* already merged */
 623                pos = unmerge_cache_entry_at(pos);
 624                if (pos < active_nr) {
 625                        const struct cache_entry *ce = active_cache[pos];
 626                        if (ce_stage(ce) &&
 627                            ce_namelen(ce) == namelen &&
 628                            !memcmp(ce->name, path, namelen))
 629                                return 0;
 630                }
 631                /* no resolve-undo information; fall back */
 632        } else {
 633                /* If there isn't, either it is unmerged, or
 634                 * resolved as "removed" by mistake.  We do not
 635                 * want to do anything in the former case.
 636                 */
 637                pos = -pos-1;
 638                if (pos < active_nr) {
 639                        const struct cache_entry *ce = active_cache[pos];
 640                        if (ce_namelen(ce) == namelen &&
 641                            !memcmp(ce->name, path, namelen)) {
 642                                fprintf(stderr,
 643                                        "%s: skipping still unmerged path.\n",
 644                                        path);
 645                                goto free_return;
 646                        }
 647                }
 648        }
 649
 650        /* Grab blobs from given path from HEAD and MERGE_HEAD,
 651         * stuff HEAD version in stage #2,
 652         * stuff MERGE_HEAD version in stage #3.
 653         */
 654        ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
 655        ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
 656
 657        if (!ce_2 || !ce_3) {
 658                ret = -1;
 659                goto free_return;
 660        }
 661        if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
 662            ce_2->ce_mode == ce_3->ce_mode) {
 663                fprintf(stderr, "%s: identical in both, skipping.\n",
 664                        path);
 665                goto free_return;
 666        }
 667
 668        remove_file_from_cache(path);
 669        if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
 670                error("%s: cannot add our version to the index.", path);
 671                ret = -1;
 672                goto free_return;
 673        }
 674        if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
 675                return 0;
 676        error("%s: cannot add their version to the index.", path);
 677        ret = -1;
 678 free_return:
 679        free(ce_2);
 680        free(ce_3);
 681        return ret;
 682}
 683
 684static void read_head_pointers(void)
 685{
 686        if (read_ref("HEAD", head_sha1))
 687                die("No HEAD -- no initial commit yet?");
 688        if (read_ref("MERGE_HEAD", merge_head_sha1)) {
 689                fprintf(stderr, "Not in the middle of a merge.\n");
 690                exit(0);
 691        }
 692}
 693
 694static int do_unresolve(int ac, const char **av,
 695                        const char *prefix, int prefix_length)
 696{
 697        int i;
 698        int err = 0;
 699
 700        /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
 701         * are not doing a merge, so exit with success status.
 702         */
 703        read_head_pointers();
 704
 705        for (i = 1; i < ac; i++) {
 706                const char *arg = av[i];
 707                char *p = prefix_path(prefix, prefix_length, arg);
 708                err |= unresolve_one(p);
 709                free(p);
 710        }
 711        return err;
 712}
 713
 714static int do_reupdate(int ac, const char **av,
 715                       const char *prefix, int prefix_length)
 716{
 717        /* Read HEAD and run update-index on paths that are
 718         * merged and already different between index and HEAD.
 719         */
 720        int pos;
 721        int has_head = 1;
 722        struct pathspec pathspec;
 723
 724        parse_pathspec(&pathspec, 0,
 725                       PATHSPEC_PREFER_CWD,
 726                       prefix, av + 1);
 727
 728        if (read_ref("HEAD", head_sha1))
 729                /* If there is no HEAD, that means it is an initial
 730                 * commit.  Update everything in the index.
 731                 */
 732                has_head = 0;
 733 redo:
 734        for (pos = 0; pos < active_nr; pos++) {
 735                const struct cache_entry *ce = active_cache[pos];
 736                struct cache_entry *old = NULL;
 737                int save_nr;
 738                char *path;
 739
 740                if (ce_stage(ce) || !ce_path_match(ce, &pathspec, NULL))
 741                        continue;
 742                if (has_head)
 743                        old = read_one_ent(NULL, head_sha1,
 744                                           ce->name, ce_namelen(ce), 0);
 745                if (old && ce->ce_mode == old->ce_mode &&
 746                    !hashcmp(ce->sha1, old->sha1)) {
 747                        free(old);
 748                        continue; /* unchanged */
 749                }
 750                /* Be careful.  The working tree may not have the
 751                 * path anymore, in which case, under 'allow_remove',
 752                 * or worse yet 'allow_replace', active_nr may decrease.
 753                 */
 754                save_nr = active_nr;
 755                path = xstrdup(ce->name);
 756                update_one(path);
 757                free(path);
 758                free(old);
 759                if (save_nr != active_nr)
 760                        goto redo;
 761        }
 762        free_pathspec(&pathspec);
 763        return 0;
 764}
 765
 766struct refresh_params {
 767        unsigned int flags;
 768        int *has_errors;
 769};
 770
 771static int refresh(struct refresh_params *o, unsigned int flag)
 772{
 773        setup_work_tree();
 774        read_cache_preload(NULL);
 775        *o->has_errors |= refresh_cache(o->flags | flag);
 776        return 0;
 777}
 778
 779static int refresh_callback(const struct option *opt,
 780                                const char *arg, int unset)
 781{
 782        return refresh(opt->value, 0);
 783}
 784
 785static int really_refresh_callback(const struct option *opt,
 786                                const char *arg, int unset)
 787{
 788        return refresh(opt->value, REFRESH_REALLY);
 789}
 790
 791static int chmod_callback(const struct option *opt,
 792                                const char *arg, int unset)
 793{
 794        char *flip = opt->value;
 795        if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
 796                return error("option 'chmod' expects \"+x\" or \"-x\"");
 797        *flip = arg[0];
 798        return 0;
 799}
 800
 801static int resolve_undo_clear_callback(const struct option *opt,
 802                                const char *arg, int unset)
 803{
 804        resolve_undo_clear();
 805        return 0;
 806}
 807
 808static int parse_new_style_cacheinfo(const char *arg,
 809                                     unsigned int *mode,
 810                                     unsigned char sha1[],
 811                                     const char **path)
 812{
 813        unsigned long ul;
 814        char *endp;
 815
 816        if (!arg)
 817                return -1;
 818
 819        errno = 0;
 820        ul = strtoul(arg, &endp, 8);
 821        if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
 822                return -1; /* not a new-style cacheinfo */
 823        *mode = ul;
 824        endp++;
 825        if (get_sha1_hex(endp, sha1) || endp[40] != ',')
 826                return -1;
 827        *path = endp + 41;
 828        return 0;
 829}
 830
 831static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
 832                                const struct option *opt, int unset)
 833{
 834        unsigned char sha1[20];
 835        unsigned int mode;
 836        const char *path;
 837
 838        if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, sha1, &path)) {
 839                if (add_cacheinfo(mode, sha1, path, 0))
 840                        die("git update-index: --cacheinfo cannot add %s", path);
 841                ctx->argv++;
 842                ctx->argc--;
 843                return 0;
 844        }
 845        if (ctx->argc <= 3)
 846                return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
 847        if (strtoul_ui(*++ctx->argv, 8, &mode) ||
 848            get_sha1_hex(*++ctx->argv, sha1) ||
 849            add_cacheinfo(mode, sha1, *++ctx->argv, 0))
 850                die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
 851        ctx->argc -= 3;
 852        return 0;
 853}
 854
 855static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
 856                              const struct option *opt, int unset)
 857{
 858        int *nul_term_line = opt->value;
 859
 860        if (ctx->argc != 1)
 861                return error("option '%s' must be the last argument", opt->long_name);
 862        allow_add = allow_replace = allow_remove = 1;
 863        read_index_info(*nul_term_line);
 864        return 0;
 865}
 866
 867static int stdin_callback(struct parse_opt_ctx_t *ctx,
 868                                const struct option *opt, int unset)
 869{
 870        int *read_from_stdin = opt->value;
 871
 872        if (ctx->argc != 1)
 873                return error("option '%s' must be the last argument", opt->long_name);
 874        *read_from_stdin = 1;
 875        return 0;
 876}
 877
 878static int unresolve_callback(struct parse_opt_ctx_t *ctx,
 879                                const struct option *opt, int flags)
 880{
 881        int *has_errors = opt->value;
 882        const char *prefix = startup_info->prefix;
 883
 884        /* consume remaining arguments. */
 885        *has_errors = do_unresolve(ctx->argc, ctx->argv,
 886                                prefix, prefix ? strlen(prefix) : 0);
 887        if (*has_errors)
 888                active_cache_changed = 0;
 889
 890        ctx->argv += ctx->argc - 1;
 891        ctx->argc = 1;
 892        return 0;
 893}
 894
 895static int reupdate_callback(struct parse_opt_ctx_t *ctx,
 896                                const struct option *opt, int flags)
 897{
 898        int *has_errors = opt->value;
 899        const char *prefix = startup_info->prefix;
 900
 901        /* consume remaining arguments. */
 902        setup_work_tree();
 903        *has_errors = do_reupdate(ctx->argc, ctx->argv,
 904                                prefix, prefix ? strlen(prefix) : 0);
 905        if (*has_errors)
 906                active_cache_changed = 0;
 907
 908        ctx->argv += ctx->argc - 1;
 909        ctx->argc = 1;
 910        return 0;
 911}
 912
 913int cmd_update_index(int argc, const char **argv, const char *prefix)
 914{
 915        int newfd, entries, has_errors = 0, nul_term_line = 0;
 916        enum uc_mode untracked_cache = UC_UNSPECIFIED;
 917        int read_from_stdin = 0;
 918        int prefix_length = prefix ? strlen(prefix) : 0;
 919        int preferred_index_format = 0;
 920        char set_executable_bit = 0;
 921        struct refresh_params refresh_args = {0, &has_errors};
 922        int lock_error = 0;
 923        int split_index = -1;
 924        struct lock_file *lock_file;
 925        struct parse_opt_ctx_t ctx;
 926        strbuf_getline_fn getline_fn;
 927        int parseopt_state = PARSE_OPT_UNKNOWN;
 928        struct option options[] = {
 929                OPT_BIT('q', NULL, &refresh_args.flags,
 930                        N_("continue refresh even when index needs update"),
 931                        REFRESH_QUIET),
 932                OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
 933                        N_("refresh: ignore submodules"),
 934                        REFRESH_IGNORE_SUBMODULES),
 935                OPT_SET_INT(0, "add", &allow_add,
 936                        N_("do not ignore new files"), 1),
 937                OPT_SET_INT(0, "replace", &allow_replace,
 938                        N_("let files replace directories and vice-versa"), 1),
 939                OPT_SET_INT(0, "remove", &allow_remove,
 940                        N_("notice files missing from worktree"), 1),
 941                OPT_BIT(0, "unmerged", &refresh_args.flags,
 942                        N_("refresh even if index contains unmerged entries"),
 943                        REFRESH_UNMERGED),
 944                {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
 945                        N_("refresh stat information"),
 946                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 947                        refresh_callback},
 948                {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
 949                        N_("like --refresh, but ignore assume-unchanged setting"),
 950                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 951                        really_refresh_callback},
 952                {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
 953                        N_("<mode>,<object>,<path>"),
 954                        N_("add the specified entry to the index"),
 955                        PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
 956                        PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 957                        (parse_opt_cb *) cacheinfo_callback},
 958                {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
 959                        N_("override the executable bit of the listed files"),
 960                        PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 961                        chmod_callback},
 962                {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
 963                        N_("mark files as \"not changing\""),
 964                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
 965                {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
 966                        N_("clear assumed-unchanged bit"),
 967                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
 968                {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
 969                        N_("mark files as \"index-only\""),
 970                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
 971                {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
 972                        N_("clear skip-worktree bit"),
 973                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
 974                OPT_SET_INT(0, "info-only", &info_only,
 975                        N_("add to index only; do not add content to object database"), 1),
 976                OPT_SET_INT(0, "force-remove", &force_remove,
 977                        N_("remove named paths even if present in worktree"), 1),
 978                OPT_BOOL('z', NULL, &nul_term_line,
 979                         N_("with --stdin: input lines are terminated by null bytes")),
 980                {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
 981                        N_("read list of paths to be updated from standard input"),
 982                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 983                        (parse_opt_cb *) stdin_callback},
 984                {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
 985                        N_("add entries from standard input to the index"),
 986                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 987                        (parse_opt_cb *) stdin_cacheinfo_callback},
 988                {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
 989                        N_("repopulate stages #2 and #3 for the listed paths"),
 990                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 991                        (parse_opt_cb *) unresolve_callback},
 992                {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
 993                        N_("only update entries that differ from HEAD"),
 994                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 995                        (parse_opt_cb *) reupdate_callback},
 996                OPT_BIT(0, "ignore-missing", &refresh_args.flags,
 997                        N_("ignore files missing from worktree"),
 998                        REFRESH_IGNORE_MISSING),
 999                OPT_SET_INT(0, "verbose", &verbose,
1000                        N_("report actions to standard output"), 1),
1001                {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
1002                        N_("(for porcelains) forget saved unresolved conflicts"),
1003                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1004                        resolve_undo_clear_callback},
1005                OPT_INTEGER(0, "index-version", &preferred_index_format,
1006                        N_("write index in this format")),
1007                OPT_BOOL(0, "split-index", &split_index,
1008                        N_("enable or disable split index")),
1009                OPT_BOOL(0, "untracked-cache", &untracked_cache,
1010                        N_("enable/disable untracked cache")),
1011                OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
1012                            N_("test if the filesystem supports untracked cache"), UC_TEST),
1013                OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
1014                            N_("enable untracked cache without testing the filesystem"), UC_FORCE),
1015                OPT_END()
1016        };
1017
1018        if (argc == 2 && !strcmp(argv[1], "-h"))
1019                usage_with_options(update_index_usage, options);
1020
1021        git_config(git_default_config, NULL);
1022
1023        /* We can't free this memory, it becomes part of a linked list parsed atexit() */
1024        lock_file = xcalloc(1, sizeof(struct lock_file));
1025
1026        newfd = hold_locked_index(lock_file, 0);
1027        if (newfd < 0)
1028                lock_error = errno;
1029
1030        entries = read_cache();
1031        if (entries < 0)
1032                die("cache corrupted");
1033
1034        /*
1035         * Custom copy of parse_options() because we want to handle
1036         * filename arguments as they come.
1037         */
1038        parse_options_start(&ctx, argc, argv, prefix,
1039                            options, PARSE_OPT_STOP_AT_NON_OPTION);
1040        while (ctx.argc) {
1041                if (parseopt_state != PARSE_OPT_DONE)
1042                        parseopt_state = parse_options_step(&ctx, options,
1043                                                            update_index_usage);
1044                if (!ctx.argc)
1045                        break;
1046                switch (parseopt_state) {
1047                case PARSE_OPT_HELP:
1048                        exit(129);
1049                case PARSE_OPT_NON_OPTION:
1050                case PARSE_OPT_DONE:
1051                {
1052                        const char *path = ctx.argv[0];
1053                        char *p;
1054
1055                        setup_work_tree();
1056                        p = prefix_path(prefix, prefix_length, path);
1057                        update_one(p);
1058                        if (set_executable_bit)
1059                                chmod_path(set_executable_bit, p);
1060                        free(p);
1061                        ctx.argc--;
1062                        ctx.argv++;
1063                        break;
1064                }
1065                case PARSE_OPT_UNKNOWN:
1066                        if (ctx.argv[0][1] == '-')
1067                                error("unknown option '%s'", ctx.argv[0] + 2);
1068                        else
1069                                error("unknown switch '%c'", *ctx.opt);
1070                        usage_with_options(update_index_usage, options);
1071                }
1072        }
1073        argc = parse_options_end(&ctx);
1074
1075        getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
1076        if (preferred_index_format) {
1077                if (preferred_index_format < INDEX_FORMAT_LB ||
1078                    INDEX_FORMAT_UB < preferred_index_format)
1079                        die("index-version %d not in range: %d..%d",
1080                            preferred_index_format,
1081                            INDEX_FORMAT_LB, INDEX_FORMAT_UB);
1082
1083                if (the_index.version != preferred_index_format)
1084                        active_cache_changed |= SOMETHING_CHANGED;
1085                the_index.version = preferred_index_format;
1086        }
1087
1088        if (read_from_stdin) {
1089                struct strbuf buf = STRBUF_INIT;
1090                struct strbuf unquoted = STRBUF_INIT;
1091
1092                setup_work_tree();
1093                while (getline_fn(&buf, stdin) != EOF) {
1094                        char *p;
1095                        if (!nul_term_line && buf.buf[0] == '"') {
1096                                strbuf_reset(&unquoted);
1097                                if (unquote_c_style(&unquoted, buf.buf, NULL))
1098                                        die("line is badly quoted");
1099                                strbuf_swap(&buf, &unquoted);
1100                        }
1101                        p = prefix_path(prefix, prefix_length, buf.buf);
1102                        update_one(p);
1103                        if (set_executable_bit)
1104                                chmod_path(set_executable_bit, p);
1105                        free(p);
1106                }
1107                strbuf_release(&unquoted);
1108                strbuf_release(&buf);
1109        }
1110
1111        if (split_index > 0) {
1112                init_split_index(&the_index);
1113                the_index.cache_changed |= SPLIT_INDEX_ORDERED;
1114        } else if (!split_index && the_index.split_index) {
1115                /*
1116                 * can't discard_split_index(&the_index); because that
1117                 * will destroy split_index->base->cache[], which may
1118                 * be shared with the_index.cache[]. So yeah we're
1119                 * leaking a bit here.
1120                 */
1121                the_index.split_index = NULL;
1122                the_index.cache_changed |= SOMETHING_CHANGED;
1123        }
1124
1125        switch (untracked_cache) {
1126        case UC_UNSPECIFIED:
1127                break;
1128        case UC_DISABLE:
1129                if (git_config_get_untracked_cache() == 1)
1130                        warning("core.untrackedCache is set to true; "
1131                                "remove or change it, if you really want to "
1132                                "disable the untracked cache");
1133                remove_untracked_cache(&the_index);
1134                report(_("Untracked cache disabled"));
1135                break;
1136        case UC_TEST:
1137                setup_work_tree();
1138                return !test_if_untracked_cache_is_supported();
1139        case UC_ENABLE:
1140        case UC_FORCE:
1141                if (git_config_get_untracked_cache() == 0)
1142                        warning("core.untrackedCache is set to false; "
1143                                "remove or change it, if you really want to "
1144                                "enable the untracked cache");
1145                add_untracked_cache(&the_index);
1146                report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1147                break;
1148        default:
1149                die("Bug: bad untracked_cache value: %d", untracked_cache);
1150        }
1151
1152        if (active_cache_changed) {
1153                if (newfd < 0) {
1154                        if (refresh_args.flags & REFRESH_QUIET)
1155                                exit(128);
1156                        unable_to_lock_die(get_index_file(), lock_error);
1157                }
1158                if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
1159                        die("Unable to write new index file");
1160        }
1161
1162        rollback_lock_file(lock_file);
1163
1164        return has_errors ? 1 : 0;
1165}