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