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