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