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