builtin / update-index.con commit Merge branch 'rr/tests-dedup-test-config' into maint (5753e17)
   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6#include "cache.h"
   7#include "quote.h"
   8#include "cache-tree.h"
   9#include "tree-walk.h"
  10#include "builtin.h"
  11#include "refs.h"
  12#include "resolve-undo.h"
  13#include "parse-options.h"
  14
  15/*
  16 * Default to not allowing changes to the list of files. The
  17 * tool doesn't actually care, but this makes it harder to add
  18 * files to the revision control by mistake by doing something
  19 * like "git update-index *" and suddenly having all the object
  20 * files be revision controlled.
  21 */
  22static int allow_add;
  23static int allow_remove;
  24static int allow_replace;
  25static int info_only;
  26static int force_remove;
  27static int verbose;
  28static int mark_valid_only;
  29static int mark_skip_worktree_only;
  30#define MARK_FLAG 1
  31#define UNMARK_FLAG 2
  32
  33__attribute__((format (printf, 1, 2)))
  34static void report(const char *fmt, ...)
  35{
  36        va_list vp;
  37
  38        if (!verbose)
  39                return;
  40
  41        va_start(vp, fmt);
  42        vprintf(fmt, vp);
  43        putchar('\n');
  44        va_end(vp);
  45}
  46
  47static int mark_ce_flags(const char *path, int flag, int mark)
  48{
  49        int namelen = strlen(path);
  50        int pos = cache_name_pos(path, namelen);
  51        if (0 <= pos) {
  52                if (mark)
  53                        active_cache[pos]->ce_flags |= flag;
  54                else
  55                        active_cache[pos]->ce_flags &= ~flag;
  56                cache_tree_invalidate_path(active_cache_tree, path);
  57                active_cache_changed = 1;
  58                return 0;
  59        }
  60        return -1;
  61}
  62
  63static int remove_one_path(const char *path)
  64{
  65        if (!allow_remove)
  66                return error("%s: does not exist and --remove not passed", path);
  67        if (remove_file_from_cache(path))
  68                return error("%s: cannot remove from the index", path);
  69        return 0;
  70}
  71
  72/*
  73 * Handle a path that couldn't be lstat'ed. It's either:
  74 *  - missing file (ENOENT or ENOTDIR). That's ok if we're
  75 *    supposed to be removing it and the removal actually
  76 *    succeeds.
  77 *  - permission error. That's never ok.
  78 */
  79static int process_lstat_error(const char *path, int err)
  80{
  81        if (err == ENOENT || err == ENOTDIR)
  82                return remove_one_path(path);
  83        return error("lstat(\"%s\"): %s", path, strerror(errno));
  84}
  85
  86static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
  87{
  88        int option, size;
  89        struct cache_entry *ce;
  90
  91        /* Was the old index entry already up-to-date? */
  92        if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
  93                return 0;
  94
  95        size = cache_entry_size(len);
  96        ce = xcalloc(1, size);
  97        memcpy(ce->name, path, len);
  98        ce->ce_flags = create_ce_flags(0);
  99        ce->ce_namelen = len;
 100        fill_stat_cache_info(ce, st);
 101        ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
 102
 103        if (index_path(ce->sha1, path, st,
 104                       info_only ? 0 : HASH_WRITE_OBJECT)) {
 105                free(ce);
 106                return -1;
 107        }
 108        option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
 109        option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
 110        if (add_cache_entry(ce, option))
 111                return error("%s: cannot add to the index - missing --add option?", path);
 112        return 0;
 113}
 114
 115/*
 116 * Handle a path that was a directory. Four cases:
 117 *
 118 *  - it's already a gitlink in the index, and we keep it that
 119 *    way, and update it if we can (if we cannot find the HEAD,
 120 *    we're going to keep it unchanged in the index!)
 121 *
 122 *  - it's a *file* in the index, in which case it should be
 123 *    removed as a file if removal is allowed, since it doesn't
 124 *    exist as such any more. If removal isn't allowed, it's
 125 *    an error.
 126 *
 127 *    (NOTE! This is old and arguably fairly strange behaviour.
 128 *    We might want to make this an error unconditionally, and
 129 *    use "--force-remove" if you actually want to force removal).
 130 *
 131 *  - it used to exist as a subdirectory (ie multiple files with
 132 *    this particular prefix) in the index, in which case it's wrong
 133 *    to try to update it as a directory.
 134 *
 135 *  - it doesn't exist at all in the index, but it is a valid
 136 *    git directory, and it should be *added* as a gitlink.
 137 */
 138static int process_directory(const char *path, int len, struct stat *st)
 139{
 140        unsigned char sha1[20];
 141        int pos = cache_name_pos(path, len);
 142
 143        /* Exact match: file or existing gitlink */
 144        if (pos >= 0) {
 145                struct cache_entry *ce = active_cache[pos];
 146                if (S_ISGITLINK(ce->ce_mode)) {
 147
 148                        /* Do nothing to the index if there is no HEAD! */
 149                        if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
 150                                return 0;
 151
 152                        return add_one_path(ce, path, len, st);
 153                }
 154                /* Should this be an unconditional error? */
 155                return remove_one_path(path);
 156        }
 157
 158        /* Inexact match: is there perhaps a subdirectory match? */
 159        pos = -pos-1;
 160        while (pos < active_nr) {
 161                struct cache_entry *ce = active_cache[pos++];
 162
 163                if (strncmp(ce->name, path, len))
 164                        break;
 165                if (ce->name[len] > '/')
 166                        break;
 167                if (ce->name[len] < '/')
 168                        continue;
 169
 170                /* Subdirectory match - error out */
 171                return error("%s: is a directory - add individual files instead", path);
 172        }
 173
 174        /* No match - should we add it as a gitlink? */
 175        if (!resolve_gitlink_ref(path, "HEAD", sha1))
 176                return add_one_path(NULL, path, len, st);
 177
 178        /* Error out. */
 179        return error("%s: is a directory - add files inside instead", path);
 180}
 181
 182static int process_path(const char *path)
 183{
 184        int pos, len;
 185        struct stat st;
 186        struct cache_entry *ce;
 187
 188        len = strlen(path);
 189        if (has_symlink_leading_path(path, len))
 190                return error("'%s' is beyond a symbolic link", path);
 191
 192        pos = cache_name_pos(path, len);
 193        ce = pos < 0 ? NULL : active_cache[pos];
 194        if (ce && ce_skip_worktree(ce)) {
 195                /*
 196                 * working directory version is assumed "good"
 197                 * so updating it does not make sense.
 198                 * On the other hand, removing it from index should work
 199                 */
 200                if (allow_remove && remove_file_from_cache(path))
 201                        return error("%s: cannot remove from the index", path);
 202                return 0;
 203        }
 204
 205        /*
 206         * First things first: get the stat information, to decide
 207         * what to do about the pathname!
 208         */
 209        if (lstat(path, &st) < 0)
 210                return process_lstat_error(path, errno);
 211
 212        if (S_ISDIR(st.st_mode))
 213                return process_directory(path, len, &st);
 214
 215        return add_one_path(ce, path, len, &st);
 216}
 217
 218static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
 219                         const char *path, int stage)
 220{
 221        int size, len, option;
 222        struct cache_entry *ce;
 223
 224        if (!verify_path(path))
 225                return error("Invalid path '%s'", path);
 226
 227        len = strlen(path);
 228        size = cache_entry_size(len);
 229        ce = xcalloc(1, size);
 230
 231        hashcpy(ce->sha1, sha1);
 232        memcpy(ce->name, path, len);
 233        ce->ce_flags = create_ce_flags(stage);
 234        ce->ce_namelen = len;
 235        ce->ce_mode = create_ce_mode(mode);
 236        if (assume_unchanged)
 237                ce->ce_flags |= CE_VALID;
 238        option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
 239        option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
 240        if (add_cache_entry(ce, option))
 241                return error("%s: cannot add to the index - missing --add option?",
 242                             path);
 243        report("add '%s'", path);
 244        return 0;
 245}
 246
 247static void chmod_path(int flip, const char *path)
 248{
 249        int pos;
 250        struct cache_entry *ce;
 251        unsigned int mode;
 252
 253        pos = cache_name_pos(path, strlen(path));
 254        if (pos < 0)
 255                goto fail;
 256        ce = active_cache[pos];
 257        mode = ce->ce_mode;
 258        if (!S_ISREG(mode))
 259                goto fail;
 260        switch (flip) {
 261        case '+':
 262                ce->ce_mode |= 0111; break;
 263        case '-':
 264                ce->ce_mode &= ~0111; break;
 265        default:
 266                goto fail;
 267        }
 268        cache_tree_invalidate_path(active_cache_tree, path);
 269        active_cache_changed = 1;
 270        report("chmod %cx '%s'", flip, path);
 271        return;
 272 fail:
 273        die("git update-index: cannot chmod %cx '%s'", flip, path);
 274}
 275
 276static void update_one(const char *path, const char *prefix, int prefix_length)
 277{
 278        const char *p = prefix_path(prefix, prefix_length, path);
 279        if (!verify_path(p)) {
 280                fprintf(stderr, "Ignoring path %s\n", path);
 281                goto free_return;
 282        }
 283        if (mark_valid_only) {
 284                if (mark_ce_flags(p, CE_VALID, mark_valid_only == MARK_FLAG))
 285                        die("Unable to mark file %s", path);
 286                goto free_return;
 287        }
 288        if (mark_skip_worktree_only) {
 289                if (mark_ce_flags(p, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
 290                        die("Unable to mark file %s", path);
 291                goto free_return;
 292        }
 293
 294        if (force_remove) {
 295                if (remove_file_from_cache(p))
 296                        die("git update-index: unable to remove %s", path);
 297                report("remove '%s'", path);
 298                goto free_return;
 299        }
 300        if (process_path(p))
 301                die("Unable to process path %s", path);
 302        report("add '%s'", path);
 303 free_return:
 304        if (p < path || p > path + strlen(path))
 305                free((char *)p);
 306}
 307
 308static void read_index_info(int line_termination)
 309{
 310        struct strbuf buf = STRBUF_INIT;
 311        struct strbuf uq = STRBUF_INIT;
 312
 313        while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
 314                char *ptr, *tab;
 315                char *path_name;
 316                unsigned char sha1[20];
 317                unsigned int mode;
 318                unsigned long ul;
 319                int stage;
 320
 321                /* This reads lines formatted in one of three formats:
 322                 *
 323                 * (1) mode         SP sha1          TAB path
 324                 * The first format is what "git apply --index-info"
 325                 * reports, and used to reconstruct a partial tree
 326                 * that is used for phony merge base tree when falling
 327                 * back on 3-way merge.
 328                 *
 329                 * (2) mode SP type SP sha1          TAB path
 330                 * The second format is to stuff "git ls-tree" output
 331                 * into the index file.
 332                 *
 333                 * (3) mode         SP sha1 SP stage TAB path
 334                 * This format is to put higher order stages into the
 335                 * index file and matches "git ls-files --stage" output.
 336                 */
 337                errno = 0;
 338                ul = strtoul(buf.buf, &ptr, 8);
 339                if (ptr == buf.buf || *ptr != ' '
 340                    || errno || (unsigned int) ul != ul)
 341                        goto bad_line;
 342                mode = ul;
 343
 344                tab = strchr(ptr, '\t');
 345                if (!tab || tab - ptr < 41)
 346                        goto bad_line;
 347
 348                if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
 349                        stage = tab[-1] - '0';
 350                        ptr = tab + 1; /* point at the head of path */
 351                        tab = tab - 2; /* point at tail of sha1 */
 352                }
 353                else {
 354                        stage = 0;
 355                        ptr = tab + 1; /* point at the head of path */
 356                }
 357
 358                if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
 359                        goto bad_line;
 360
 361                path_name = ptr;
 362                if (line_termination && path_name[0] == '"') {
 363                        strbuf_reset(&uq);
 364                        if (unquote_c_style(&uq, path_name, NULL)) {
 365                                die("git update-index: bad quoting of path name");
 366                        }
 367                        path_name = uq.buf;
 368                }
 369
 370                if (!verify_path(path_name)) {
 371                        fprintf(stderr, "Ignoring path %s\n", path_name);
 372                        continue;
 373                }
 374
 375                if (!mode) {
 376                        /* mode == 0 means there is no such path -- remove */
 377                        if (remove_file_from_cache(path_name))
 378                                die("git update-index: unable to remove %s",
 379                                    ptr);
 380                }
 381                else {
 382                        /* mode ' ' sha1 '\t' name
 383                         * ptr[-1] points at tab,
 384                         * ptr[-41] is at the beginning of sha1
 385                         */
 386                        ptr[-42] = ptr[-1] = 0;
 387                        if (add_cacheinfo(mode, sha1, path_name, stage))
 388                                die("git update-index: unable to update %s",
 389                                    path_name);
 390                }
 391                continue;
 392
 393        bad_line:
 394                die("malformed index info %s", buf.buf);
 395        }
 396        strbuf_release(&buf);
 397        strbuf_release(&uq);
 398}
 399
 400static const char * const update_index_usage[] = {
 401        N_("git update-index [options] [--] [<file>...]"),
 402        NULL
 403};
 404
 405static unsigned char head_sha1[20];
 406static unsigned char merge_head_sha1[20];
 407
 408static struct cache_entry *read_one_ent(const char *which,
 409                                        unsigned char *ent, const char *path,
 410                                        int namelen, int stage)
 411{
 412        unsigned mode;
 413        unsigned char sha1[20];
 414        int size;
 415        struct cache_entry *ce;
 416
 417        if (get_tree_entry(ent, path, sha1, &mode)) {
 418                if (which)
 419                        error("%s: not in %s branch.", path, which);
 420                return NULL;
 421        }
 422        if (mode == S_IFDIR) {
 423                if (which)
 424                        error("%s: not a blob in %s branch.", path, which);
 425                return NULL;
 426        }
 427        size = cache_entry_size(namelen);
 428        ce = xcalloc(1, size);
 429
 430        hashcpy(ce->sha1, sha1);
 431        memcpy(ce->name, path, namelen);
 432        ce->ce_flags = create_ce_flags(stage);
 433        ce->ce_namelen = namelen;
 434        ce->ce_mode = create_ce_mode(mode);
 435        return ce;
 436}
 437
 438static int unresolve_one(const char *path)
 439{
 440        int namelen = strlen(path);
 441        int pos;
 442        int ret = 0;
 443        struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
 444
 445        /* See if there is such entry in the index. */
 446        pos = cache_name_pos(path, namelen);
 447        if (0 <= pos) {
 448                /* already merged */
 449                pos = unmerge_cache_entry_at(pos);
 450                if (pos < active_nr) {
 451                        struct cache_entry *ce = active_cache[pos];
 452                        if (ce_stage(ce) &&
 453                            ce_namelen(ce) == namelen &&
 454                            !memcmp(ce->name, path, namelen))
 455                                return 0;
 456                }
 457                /* no resolve-undo information; fall back */
 458        } else {
 459                /* If there isn't, either it is unmerged, or
 460                 * resolved as "removed" by mistake.  We do not
 461                 * want to do anything in the former case.
 462                 */
 463                pos = -pos-1;
 464                if (pos < active_nr) {
 465                        struct cache_entry *ce = active_cache[pos];
 466                        if (ce_namelen(ce) == namelen &&
 467                            !memcmp(ce->name, path, namelen)) {
 468                                fprintf(stderr,
 469                                        "%s: skipping still unmerged path.\n",
 470                                        path);
 471                                goto free_return;
 472                        }
 473                }
 474        }
 475
 476        /* Grab blobs from given path from HEAD and MERGE_HEAD,
 477         * stuff HEAD version in stage #2,
 478         * stuff MERGE_HEAD version in stage #3.
 479         */
 480        ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
 481        ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
 482
 483        if (!ce_2 || !ce_3) {
 484                ret = -1;
 485                goto free_return;
 486        }
 487        if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
 488            ce_2->ce_mode == ce_3->ce_mode) {
 489                fprintf(stderr, "%s: identical in both, skipping.\n",
 490                        path);
 491                goto free_return;
 492        }
 493
 494        remove_file_from_cache(path);
 495        if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
 496                error("%s: cannot add our version to the index.", path);
 497                ret = -1;
 498                goto free_return;
 499        }
 500        if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
 501                return 0;
 502        error("%s: cannot add their version to the index.", path);
 503        ret = -1;
 504 free_return:
 505        free(ce_2);
 506        free(ce_3);
 507        return ret;
 508}
 509
 510static void read_head_pointers(void)
 511{
 512        if (read_ref("HEAD", head_sha1))
 513                die("No HEAD -- no initial commit yet?");
 514        if (read_ref("MERGE_HEAD", merge_head_sha1)) {
 515                fprintf(stderr, "Not in the middle of a merge.\n");
 516                exit(0);
 517        }
 518}
 519
 520static int do_unresolve(int ac, const char **av,
 521                        const char *prefix, int prefix_length)
 522{
 523        int i;
 524        int err = 0;
 525
 526        /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
 527         * are not doing a merge, so exit with success status.
 528         */
 529        read_head_pointers();
 530
 531        for (i = 1; i < ac; i++) {
 532                const char *arg = av[i];
 533                const char *p = prefix_path(prefix, prefix_length, arg);
 534                err |= unresolve_one(p);
 535                if (p < arg || p > arg + strlen(arg))
 536                        free((char *)p);
 537        }
 538        return err;
 539}
 540
 541static int do_reupdate(int ac, const char **av,
 542                       const char *prefix, int prefix_length)
 543{
 544        /* Read HEAD and run update-index on paths that are
 545         * merged and already different between index and HEAD.
 546         */
 547        int pos;
 548        int has_head = 1;
 549        const char **paths = get_pathspec(prefix, av + 1);
 550        struct pathspec pathspec;
 551
 552        init_pathspec(&pathspec, paths);
 553
 554        if (read_ref("HEAD", head_sha1))
 555                /* If there is no HEAD, that means it is an initial
 556                 * commit.  Update everything in the index.
 557                 */
 558                has_head = 0;
 559 redo:
 560        for (pos = 0; pos < active_nr; pos++) {
 561                struct cache_entry *ce = active_cache[pos];
 562                struct cache_entry *old = NULL;
 563                int save_nr;
 564
 565                if (ce_stage(ce) || !ce_path_match(ce, &pathspec))
 566                        continue;
 567                if (has_head)
 568                        old = read_one_ent(NULL, head_sha1,
 569                                           ce->name, ce_namelen(ce), 0);
 570                if (old && ce->ce_mode == old->ce_mode &&
 571                    !hashcmp(ce->sha1, old->sha1)) {
 572                        free(old);
 573                        continue; /* unchanged */
 574                }
 575                /* Be careful.  The working tree may not have the
 576                 * path anymore, in which case, under 'allow_remove',
 577                 * or worse yet 'allow_replace', active_nr may decrease.
 578                 */
 579                save_nr = active_nr;
 580                update_one(ce->name + prefix_length, prefix, prefix_length);
 581                if (save_nr != active_nr)
 582                        goto redo;
 583        }
 584        free_pathspec(&pathspec);
 585        return 0;
 586}
 587
 588struct refresh_params {
 589        unsigned int flags;
 590        int *has_errors;
 591};
 592
 593static int refresh(struct refresh_params *o, unsigned int flag)
 594{
 595        setup_work_tree();
 596        read_cache_preload(NULL);
 597        *o->has_errors |= refresh_cache(o->flags | flag);
 598        return 0;
 599}
 600
 601static int refresh_callback(const struct option *opt,
 602                                const char *arg, int unset)
 603{
 604        return refresh(opt->value, 0);
 605}
 606
 607static int really_refresh_callback(const struct option *opt,
 608                                const char *arg, int unset)
 609{
 610        return refresh(opt->value, REFRESH_REALLY);
 611}
 612
 613static int chmod_callback(const struct option *opt,
 614                                const char *arg, int unset)
 615{
 616        char *flip = opt->value;
 617        if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
 618                return error("option 'chmod' expects \"+x\" or \"-x\"");
 619        *flip = arg[0];
 620        return 0;
 621}
 622
 623static int resolve_undo_clear_callback(const struct option *opt,
 624                                const char *arg, int unset)
 625{
 626        resolve_undo_clear();
 627        return 0;
 628}
 629
 630static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
 631                                const struct option *opt, int unset)
 632{
 633        unsigned char sha1[20];
 634        unsigned int mode;
 635
 636        if (ctx->argc <= 3)
 637                return error("option 'cacheinfo' expects three arguments");
 638        if (strtoul_ui(*++ctx->argv, 8, &mode) ||
 639            get_sha1_hex(*++ctx->argv, sha1) ||
 640            add_cacheinfo(mode, sha1, *++ctx->argv, 0))
 641                die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
 642        ctx->argc -= 3;
 643        return 0;
 644}
 645
 646static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
 647                              const struct option *opt, int unset)
 648{
 649        int *line_termination = opt->value;
 650
 651        if (ctx->argc != 1)
 652                return error("option '%s' must be the last argument", opt->long_name);
 653        allow_add = allow_replace = allow_remove = 1;
 654        read_index_info(*line_termination);
 655        return 0;
 656}
 657
 658static int stdin_callback(struct parse_opt_ctx_t *ctx,
 659                                const struct option *opt, int unset)
 660{
 661        int *read_from_stdin = opt->value;
 662
 663        if (ctx->argc != 1)
 664                return error("option '%s' must be the last argument", opt->long_name);
 665        *read_from_stdin = 1;
 666        return 0;
 667}
 668
 669static int unresolve_callback(struct parse_opt_ctx_t *ctx,
 670                                const struct option *opt, int flags)
 671{
 672        int *has_errors = opt->value;
 673        const char *prefix = startup_info->prefix;
 674
 675        /* consume remaining arguments. */
 676        *has_errors = do_unresolve(ctx->argc, ctx->argv,
 677                                prefix, prefix ? strlen(prefix) : 0);
 678        if (*has_errors)
 679                active_cache_changed = 0;
 680
 681        ctx->argv += ctx->argc - 1;
 682        ctx->argc = 1;
 683        return 0;
 684}
 685
 686static int reupdate_callback(struct parse_opt_ctx_t *ctx,
 687                                const struct option *opt, int flags)
 688{
 689        int *has_errors = opt->value;
 690        const char *prefix = startup_info->prefix;
 691
 692        /* consume remaining arguments. */
 693        setup_work_tree();
 694        *has_errors = do_reupdate(ctx->argc, ctx->argv,
 695                                prefix, prefix ? strlen(prefix) : 0);
 696        if (*has_errors)
 697                active_cache_changed = 0;
 698
 699        ctx->argv += ctx->argc - 1;
 700        ctx->argc = 1;
 701        return 0;
 702}
 703
 704int cmd_update_index(int argc, const char **argv, const char *prefix)
 705{
 706        int newfd, entries, has_errors = 0, line_termination = '\n';
 707        int read_from_stdin = 0;
 708        int prefix_length = prefix ? strlen(prefix) : 0;
 709        int preferred_index_format = 0;
 710        char set_executable_bit = 0;
 711        struct refresh_params refresh_args = {0, &has_errors};
 712        int lock_error = 0;
 713        struct lock_file *lock_file;
 714        struct parse_opt_ctx_t ctx;
 715        int parseopt_state = PARSE_OPT_UNKNOWN;
 716        struct option options[] = {
 717                OPT_BIT('q', NULL, &refresh_args.flags,
 718                        N_("continue refresh even when index needs update"),
 719                        REFRESH_QUIET),
 720                OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
 721                        N_("refresh: ignore submodules"),
 722                        REFRESH_IGNORE_SUBMODULES),
 723                OPT_SET_INT(0, "add", &allow_add,
 724                        N_("do not ignore new files"), 1),
 725                OPT_SET_INT(0, "replace", &allow_replace,
 726                        N_("let files replace directories and vice-versa"), 1),
 727                OPT_SET_INT(0, "remove", &allow_remove,
 728                        N_("notice files missing from worktree"), 1),
 729                OPT_BIT(0, "unmerged", &refresh_args.flags,
 730                        N_("refresh even if index contains unmerged entries"),
 731                        REFRESH_UNMERGED),
 732                {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
 733                        N_("refresh stat information"),
 734                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 735                        refresh_callback},
 736                {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
 737                        N_("like --refresh, but ignore assume-unchanged setting"),
 738                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 739                        really_refresh_callback},
 740                {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
 741                        N_("<mode> <object> <path>"),
 742                        N_("add the specified entry to the index"),
 743                        PARSE_OPT_NOARG |       /* disallow --cacheinfo=<mode> form */
 744                        PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 745                        (parse_opt_cb *) cacheinfo_callback},
 746                {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
 747                        N_("override the executable bit of the listed files"),
 748                        PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 749                        chmod_callback},
 750                {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
 751                        N_("mark files as \"not changing\""),
 752                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
 753                {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
 754                        N_("clear assumed-unchanged bit"),
 755                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
 756                {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
 757                        N_("mark files as \"index-only\""),
 758                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
 759                {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
 760                        N_("clear skip-worktree bit"),
 761                        PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
 762                OPT_SET_INT(0, "info-only", &info_only,
 763                        N_("add to index only; do not add content to object database"), 1),
 764                OPT_SET_INT(0, "force-remove", &force_remove,
 765                        N_("remove named paths even if present in worktree"), 1),
 766                OPT_SET_INT('z', NULL, &line_termination,
 767                        N_("with --stdin: input lines are terminated by null bytes"), '\0'),
 768                {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
 769                        N_("read list of paths to be updated from standard input"),
 770                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 771                        (parse_opt_cb *) stdin_callback},
 772                {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &line_termination, NULL,
 773                        N_("add entries from standard input to the index"),
 774                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 775                        (parse_opt_cb *) stdin_cacheinfo_callback},
 776                {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
 777                        N_("repopulate stages #2 and #3 for the listed paths"),
 778                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 779                        (parse_opt_cb *) unresolve_callback},
 780                {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
 781                        N_("only update entries that differ from HEAD"),
 782                        PARSE_OPT_NONEG | PARSE_OPT_NOARG,
 783                        (parse_opt_cb *) reupdate_callback},
 784                OPT_BIT(0, "ignore-missing", &refresh_args.flags,
 785                        N_("ignore files missing from worktree"),
 786                        REFRESH_IGNORE_MISSING),
 787                OPT_SET_INT(0, "verbose", &verbose,
 788                        N_("report actions to standard output"), 1),
 789                {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
 790                        N_("(for porcelains) forget saved unresolved conflicts"),
 791                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 792                        resolve_undo_clear_callback},
 793                OPT_INTEGER(0, "index-version", &preferred_index_format,
 794                        N_("write index in this format")),
 795                OPT_END()
 796        };
 797
 798        if (argc == 2 && !strcmp(argv[1], "-h"))
 799                usage_with_options(update_index_usage, options);
 800
 801        git_config(git_default_config, NULL);
 802
 803        /* We can't free this memory, it becomes part of a linked list parsed atexit() */
 804        lock_file = xcalloc(1, sizeof(struct lock_file));
 805
 806        newfd = hold_locked_index(lock_file, 0);
 807        if (newfd < 0)
 808                lock_error = errno;
 809
 810        entries = read_cache();
 811        if (entries < 0)
 812                die("cache corrupted");
 813
 814        /*
 815         * Custom copy of parse_options() because we want to handle
 816         * filename arguments as they come.
 817         */
 818        parse_options_start(&ctx, argc, argv, prefix,
 819                            options, PARSE_OPT_STOP_AT_NON_OPTION);
 820        while (ctx.argc) {
 821                if (parseopt_state != PARSE_OPT_DONE)
 822                        parseopt_state = parse_options_step(&ctx, options,
 823                                                            update_index_usage);
 824                if (!ctx.argc)
 825                        break;
 826                switch (parseopt_state) {
 827                case PARSE_OPT_HELP:
 828                        exit(129);
 829                case PARSE_OPT_NON_OPTION:
 830                case PARSE_OPT_DONE:
 831                {
 832                        const char *path = ctx.argv[0];
 833                        const char *p;
 834
 835                        setup_work_tree();
 836                        p = prefix_path(prefix, prefix_length, path);
 837                        update_one(p, NULL, 0);
 838                        if (set_executable_bit)
 839                                chmod_path(set_executable_bit, p);
 840                        if (p < path || p > path + strlen(path))
 841                                free((char *)p);
 842                        ctx.argc--;
 843                        ctx.argv++;
 844                        break;
 845                }
 846                case PARSE_OPT_UNKNOWN:
 847                        if (ctx.argv[0][1] == '-')
 848                                error("unknown option '%s'", ctx.argv[0] + 2);
 849                        else
 850                                error("unknown switch '%c'", *ctx.opt);
 851                        usage_with_options(update_index_usage, options);
 852                }
 853        }
 854        argc = parse_options_end(&ctx);
 855        if (preferred_index_format) {
 856                if (preferred_index_format < INDEX_FORMAT_LB ||
 857                    INDEX_FORMAT_UB < preferred_index_format)
 858                        die("index-version %d not in range: %d..%d",
 859                            preferred_index_format,
 860                            INDEX_FORMAT_LB, INDEX_FORMAT_UB);
 861
 862                if (the_index.version != preferred_index_format)
 863                        active_cache_changed = 1;
 864                the_index.version = preferred_index_format;
 865        }
 866
 867        if (read_from_stdin) {
 868                struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
 869
 870                setup_work_tree();
 871                while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
 872                        const char *p;
 873                        if (line_termination && buf.buf[0] == '"') {
 874                                strbuf_reset(&nbuf);
 875                                if (unquote_c_style(&nbuf, buf.buf, NULL))
 876                                        die("line is badly quoted");
 877                                strbuf_swap(&buf, &nbuf);
 878                        }
 879                        p = prefix_path(prefix, prefix_length, buf.buf);
 880                        update_one(p, NULL, 0);
 881                        if (set_executable_bit)
 882                                chmod_path(set_executable_bit, p);
 883                        if (p < buf.buf || p > buf.buf + buf.len)
 884                                free((char *)p);
 885                }
 886                strbuf_release(&nbuf);
 887                strbuf_release(&buf);
 888        }
 889
 890        if (active_cache_changed) {
 891                if (newfd < 0) {
 892                        if (refresh_args.flags & REFRESH_QUIET)
 893                                exit(128);
 894                        unable_to_lock_index_die(get_index_file(), lock_error);
 895                }
 896                if (write_cache(newfd, active_cache, active_nr) ||
 897                    commit_locked_index(lock_file))
 898                        die("Unable to write new index file");
 899        }
 900
 901        rollback_lock_file(lock_file);
 902
 903        return has_errors ? 1 : 0;
 904}