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