builtin/reset.c

   1 /*
   2  * "git reset" builtin command
   3  *
   4  * Copyright (c) 2007 Carlos Rica
   5  *
   6  * Based on git-reset.sh, which is
   7  *
   8  * Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
   9  */
  10 #define USE_THE_INDEX_VARIABLE
  11 #include "builtin.h"
  12 #include "advice.h"
  13 #include "config.h"
  14 #include "environment.h"
  15 #include "gettext.h"
  16 #include "hash.h"
  17 #include "hex.h"
  18 #include "lockfile.h"
  19 #include "tag.h"
  20 #include "object.h"
  21 #include "pretty.h"
  22 #include "run-command.h"
  23 #include "refs.h"
  24 #include "diff.h"
  25 #include "diffcore.h"
  26 #include "tree.h"
  27 #include "branch.h"
  28 #include "object-name.h"
  29 #include "parse-options.h"
  30 #include "path.h"
  31 #include "unpack-trees.h"
  32 #include "cache-tree.h"
  33 #include "setup.h"
  34 #include "sparse-index.h"
  35 #include "submodule.h"
  36 #include "submodule-config.h"
  37 #include "trace.h"
  38 #include "trace2.h"
  39 #include "dir.h"
  40 #include "add-interactive.h"
  41
  42 #define REFRESH_INDEX_DELAY_WARNING_IN_MS (2 * 1000)
  43
  44 static const char * const git_reset_usage[] = {
  45         N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
  46         N_("git reset [-q] [<tree-ish>] [--] <pathspec>..."),
  47         N_("git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"),
  48         N_("git reset --patch [<tree-ish>] [--] [<pathspec>...]"),
  49         NULL
  50 };
  51
  52 enum reset_type { MIXED, SOFT, HARD, MERGE, KEEP, NONE };
  53 static const char *reset_type_names[] = {
  54         N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
  55 };
  56
  57 static inline int is_merge(void)
  58 {
  59         return !access(git_path_merge_head(the_repository), F_OK);
  60 }
  61
  62 static int reset_index(const char *ref, const struct object_id *oid, int reset_type, int quiet)
  63 {
  64         int i, nr = 0;
  65         struct tree_desc desc[2];
  66         struct tree *tree;
  67         struct unpack_trees_options opts;
  68         int ret = -1;
  69
  70         memset(&opts, 0, sizeof(opts));
  71         opts.head_idx = 1;
  72         opts.src_index = &the_index;
  73         opts.dst_index = &the_index;
  74         opts.fn = oneway_merge;
  75         opts.merge = 1;
  76         init_checkout_metadata(&opts.meta, ref, oid, NULL);
  77         if (!quiet)
  78                 opts.verbose_update = 1;
  79         switch (reset_type) {
  80         case KEEP:
  81         case MERGE:
  82                 opts.update = 1;
  83                 opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
  84                 break;
  85         case HARD:
  86                 opts.update = 1;
  87                 opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
  88                 opts.skip_cache_tree_update = 1;
  89                 break;
  90         case MIXED:
  91                 opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
  92                 opts.skip_cache_tree_update = 1;
  93                 /* but opts.update=0, so working tree not updated */
  94                 break;
  95         default:
  96                 BUG("invalid reset_type passed to reset_index");
  97         }
  98
  99         repo_read_index_unmerged(the_repository);
 100
 101         if (reset_type == KEEP) {
 102                 struct object_id head_oid;
 103                 if (repo_get_oid(the_repository, "HEAD", &head_oid))
 104                         return error(_("You do not have a valid HEAD."));
 105                 if (!fill_tree_descriptor(the_repository, desc + nr, &head_oid))
 106                         return error(_("Failed to find tree of HEAD."));
 107                 nr++;
 108                 opts.fn = twoway_merge;
 109         }
 110
 111         if (!fill_tree_descriptor(the_repository, desc + nr, oid)) {
 112                 error(_("Failed to find tree of %s."), oid_to_hex(oid));
 113                 goto out;
 114         }
 115         nr++;
 116
 117         if (unpack_trees(nr, desc, &opts))
 118                 goto out;
 119
 120         if (reset_type == MIXED || reset_type == HARD) {
 121                 tree = parse_tree_indirect(oid);
 122                 prime_cache_tree(the_repository, the_repository->index, tree);
 123         }
 124
 125         ret = 0;
 126
 127 out:
 128         for (i = 0; i < nr; i++)
 129                 free((void *)desc[i].buffer);
 130         return ret;
 131 }
 132
 133 static void print_new_head_line(struct commit *commit)
 134 {
 135         struct strbuf buf = STRBUF_INIT;
 136
 137         printf(_("HEAD is now at %s"),
 138                 repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
 139
 140         pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
 141         if (buf.len > 0)
 142                 printf(" %s", buf.buf);
 143         putchar('\n');
 144         strbuf_release(&buf);
 145 }
 146
 147 static void update_index_from_diff(struct diff_queue_struct *q,
 148                                    struct diff_options *opt UNUSED,
 149                                    void *data)
 150 {
 151         int i;
 152         int intent_to_add = *(int *)data;
 153
 154         for (i = 0; i < q->nr; i++) {
 155                 int pos;
 156                 struct diff_filespec *one = q->queue[i]->one;
 157                 int is_in_reset_tree = one->mode && !is_null_oid(&one->oid);
 158                 struct cache_entry *ce;
 159
 160                 if (!is_in_reset_tree && !intent_to_add) {
 161                         remove_file_from_index(&the_index, one->path);
 162                         continue;
 163                 }
 164
 165                 ce = make_cache_entry(&the_index, one->mode, &one->oid, one->path,
 166                                       0, 0);
 167
 168                 /*
 169                  * If the file 1) corresponds to an existing index entry with
 170                  * skip-worktree set, or 2) does not exist in the index but is
 171                  * outside the sparse checkout definition, add a skip-worktree bit
 172                  * to the new index entry. Note that a sparse index will be expanded
 173                  * if this entry is outside the sparse cone - this is necessary
 174                  * to properly construct the reset sparse directory.
 175                  */
 176                 pos = index_name_pos(&the_index, one->path, strlen(one->path));
 177                 if ((pos >= 0 && ce_skip_worktree(the_index.cache[pos])) ||
 178                     (pos < 0 && !path_in_sparse_checkout(one->path, &the_index)))
 179                         ce->ce_flags |= CE_SKIP_WORKTREE;
 180
 181                 if (!ce)
 182                         die(_("make_cache_entry failed for path '%s'"),
 183                             one->path);
 184                 if (!is_in_reset_tree) {
 185                         ce->ce_flags |= CE_INTENT_TO_ADD;
 186                         set_object_name_for_intent_to_add_entry(ce);
 187                 }
 188                 add_index_entry(&the_index, ce,
 189                                 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
 190         }
 191 }
 192
 193 static int read_from_tree(const struct pathspec *pathspec,
 194                           struct object_id *tree_oid,
 195                           int intent_to_add)
 196 {
 197         struct diff_options opt;
 198
 199         memset(&opt, 0, sizeof(opt));
 200         copy_pathspec(&opt.pathspec, pathspec);
 201         opt.output_format = DIFF_FORMAT_CALLBACK;
 202         opt.format_callback = update_index_from_diff;
 203         opt.format_callback_data = &intent_to_add;
 204         opt.flags.override_submodule_config = 1;
 205         opt.flags.recursive = 1;
 206         opt.repo = the_repository;
 207         opt.change = diff_change;
 208         opt.add_remove = diff_addremove;
 209
 210         if (pathspec->nr && pathspec_needs_expanded_index(&the_index, pathspec))
 211                 ensure_full_index(&the_index);
 212
 213         if (do_diff_cache(tree_oid, &opt))
 214                 return 1;
 215         diffcore_std(&opt);
 216         diff_flush(&opt);
 217
 218         return 0;
 219 }
 220
 221 static void set_reflog_message(struct strbuf *sb, const char *action,
 222                                const char *rev)
 223 {
 224         const char *rla = getenv("GIT_REFLOG_ACTION");
 225
 226         strbuf_reset(sb);
 227         if (rla)
 228                 strbuf_addf(sb, "%s: %s", rla, action);
 229         else if (rev)
 230                 strbuf_addf(sb, "reset: moving to %s", rev);
 231         else
 232                 strbuf_addf(sb, "reset: %s", action);
 233 }
 234
 235 static void die_if_unmerged_cache(int reset_type)
 236 {
 237         if (is_merge() || unmerged_index(&the_index))
 238                 die(_("Cannot do a %s reset in the middle of a merge."),
 239                     _(reset_type_names[reset_type]));
 240
 241 }
 242
 243 static void parse_args(struct pathspec *pathspec,
 244                        const char **argv, const char *prefix,
 245                        int patch_mode,
 246                        const char **rev_ret)
 247 {
 248         const char *rev = "HEAD";
 249         struct object_id unused;
 250         /*
 251          * Possible arguments are:
 252          *
 253          * git reset [-opts] [<rev>]
 254          * git reset [-opts] <tree> [<paths>...]
 255          * git reset [-opts] <tree> -- [<paths>...]
 256          * git reset [-opts] -- [<paths>...]
 257          * git reset [-opts] <paths>...
 258          *
 259          * At this point, argv points immediately after [-opts].
 260          */
 261
 262         if (argv[0]) {
 263                 if (!strcmp(argv[0], "--")) {
 264                         argv++; /* reset to HEAD, possibly with paths */
 265                 } else if (argv[1] && !strcmp(argv[1], "--")) {
 266                         rev = argv[0];
 267                         argv += 2;
 268                 }
 269                 /*
 270                  * Otherwise, argv[0] could be either <rev> or <paths> and
 271                  * has to be unambiguous. If there is a single argument, it
 272                  * can not be a tree
 273                  */
 274                 else if ((!argv[1] && !repo_get_oid_committish(the_repository, argv[0], &unused)) ||
 275                          (argv[1] && !repo_get_oid_treeish(the_repository, argv[0], &unused))) {
 276                         /*
 277                          * Ok, argv[0] looks like a commit/tree; it should not
 278                          * be a filename.
 279                          */
 280                         verify_non_filename(prefix, argv[0]);
 281                         rev = *argv++;
 282                 } else {
 283                         /* Otherwise we treat this as a filename */
 284                         verify_filename(prefix, argv[0], 1);
 285                 }
 286         }
 287         *rev_ret = rev;
 288
 289         parse_pathspec(pathspec, 0,
 290                        PATHSPEC_PREFER_FULL |
 291                        (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
 292                        prefix, argv);
 293 }
 294
 295 static int reset_refs(const char *rev, const struct object_id *oid)
 296 {
 297         int update_ref_status;
 298         struct strbuf msg = STRBUF_INIT;
 299         struct object_id *orig = NULL, oid_orig,
 300                 *old_orig = NULL, oid_old_orig;
 301
 302         if (!repo_get_oid(the_repository, "ORIG_HEAD", &oid_old_orig))
 303                 old_orig = &oid_old_orig;
 304         if (!repo_get_oid(the_repository, "HEAD", &oid_orig)) {
 305                 orig = &oid_orig;
 306                 set_reflog_message(&msg, "updating ORIG_HEAD", NULL);
 307                 update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
 308                            UPDATE_REFS_MSG_ON_ERR);
 309         } else if (old_orig)
 310                 delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
 311         set_reflog_message(&msg, "updating HEAD", rev);
 312         update_ref_status = update_ref(msg.buf, "HEAD", oid, orig, 0,
 313                                        UPDATE_REFS_MSG_ON_ERR);
 314         strbuf_release(&msg);
 315         return update_ref_status;
 316 }
 317
 318 static int git_reset_config(const char *var, const char *value,
 319                             const struct config_context *ctx, void *cb)
 320 {
 321         if (!strcmp(var, "submodule.recurse"))
 322                 return git_default_submodule_config(var, value, cb);
 323
 324         return git_default_config(var, value, ctx, cb);
 325 }
 326
 327 int cmd_reset(int argc, const char **argv, const char *prefix)
 328 {
 329         int reset_type = NONE, update_ref_status = 0, quiet = 0;
 330         int no_refresh = 0;
 331         int patch_mode = 0, pathspec_file_nul = 0, unborn;
 332         const char *rev;
 333         char *pathspec_from_file = NULL;
 334         struct object_id oid;
 335         struct pathspec pathspec;
 336         int intent_to_add = 0;
 337         const struct option options[] = {
 338                 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 339                 OPT_BOOL(0, "no-refresh", &no_refresh,
 340                                 N_("skip refreshing the index after reset")),
 341                 OPT_SET_INT(0, "mixed", &reset_type,
 342                                                 N_("reset HEAD and index"), MIXED),
 343                 OPT_SET_INT(0, "soft", &reset_type, N_("reset only HEAD"), SOFT),
 344                 OPT_SET_INT(0, "hard", &reset_type,
 345                                 N_("reset HEAD, index and working tree"), HARD),
 346                 OPT_SET_INT(0, "merge", &reset_type,
 347                                 N_("reset HEAD, index and working tree"), MERGE),
 348                 OPT_SET_INT(0, "keep", &reset_type,
 349                                 N_("reset HEAD but keep local changes"), KEEP),
 350                 OPT_CALLBACK_F(0, "recurse-submodules", NULL,
 351                             "reset", "control recursive updating of submodules",
 352                             PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater),
 353                 OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
 354                 OPT_BOOL('N', "intent-to-add", &intent_to_add,
 355                                 N_("record only the fact that removed paths will be added later")),
 356                 OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
 357                 OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 358                 OPT_END()
 359         };
 360
 361         git_config(git_reset_config, NULL);
 362
 363         argc = parse_options(argc, argv, prefix, options, git_reset_usage,
 364                                                 PARSE_OPT_KEEP_DASHDASH);
 365         parse_args(&pathspec, argv, prefix, patch_mode, &rev);
 366
 367         if (pathspec_from_file) {
 368                 if (patch_mode)
 369                         die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
 370
 371                 if (pathspec.nr)
 372                         die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
 373
 374                 parse_pathspec_file(&pathspec, 0,
 375                                     PATHSPEC_PREFER_FULL,
 376                                     prefix, pathspec_from_file, pathspec_file_nul);
 377         } else if (pathspec_file_nul) {
 378                 die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
 379         }
 380
 381         unborn = !strcmp(rev, "HEAD") && repo_get_oid(the_repository, "HEAD",
 382                                                       &oid);
 383         if (unborn) {
 384                 /* reset on unborn branch: treat as reset to empty tree */
 385                 oidcpy(&oid, the_hash_algo->empty_tree);
 386         } else if (!pathspec.nr && !patch_mode) {
 387                 struct commit *commit;
 388                 if (repo_get_oid_committish(the_repository, rev, &oid))
 389                         die(_("Failed to resolve '%s' as a valid revision."), rev);
 390                 commit = lookup_commit_reference(the_repository, &oid);
 391                 if (!commit)
 392                         die(_("Could not parse object '%s'."), rev);
 393                 oidcpy(&oid, &commit->object.oid);
 394         } else {
 395                 struct tree *tree;
 396                 if (repo_get_oid_treeish(the_repository, rev, &oid))
 397                         die(_("Failed to resolve '%s' as a valid tree."), rev);
 398                 tree = parse_tree_indirect(&oid);
 399                 if (!tree)
 400                         die(_("Could not parse object '%s'."), rev);
 401                 oidcpy(&oid, &tree->object.oid);
 402         }
 403
 404         if (patch_mode) {
 405                 if (reset_type != NONE)
 406                         die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
 407                 trace2_cmd_mode("patch-interactive");
 408                 update_ref_status = !!run_add_p(the_repository, ADD_P_RESET, rev,
 409                                    &pathspec);
 410                 goto cleanup;
 411         }
 412
 413         /* git reset tree [--] paths... can be used to
 414          * load chosen paths from the tree into the index without
 415          * affecting the working tree nor HEAD. */
 416         if (pathspec.nr) {
 417                 if (reset_type == MIXED)
 418                         warning(_("--mixed with paths is deprecated; use 'git reset -- <paths>' instead."));
 419                 else if (reset_type != NONE)
 420                         die(_("Cannot do %s reset with paths."),
 421                                         _(reset_type_names[reset_type]));
 422         }
 423         if (reset_type == NONE)
 424                 reset_type = MIXED; /* by default */
 425
 426         if (pathspec.nr)
 427                 trace2_cmd_mode("path");
 428         else
 429                 trace2_cmd_mode(reset_type_names[reset_type]);
 430
 431         if (reset_type != SOFT && (reset_type != MIXED || get_git_work_tree()))
 432                 setup_work_tree();
 433
 434         if (reset_type == MIXED && is_bare_repository())
 435                 die(_("%s reset is not allowed in a bare repository"),
 436                     _(reset_type_names[reset_type]));
 437
 438         if (intent_to_add && reset_type != MIXED)
 439                 die(_("the option '%s' requires '%s'"), "-N", "--mixed");
 440
 441         prepare_repo_settings(the_repository);
 442         the_repository->settings.command_requires_full_index = 0;
 443
 444         if (repo_read_index(the_repository) < 0)
 445                 die(_("index file corrupt"));
 446
 447         /* Soft reset does not touch the index file nor the working tree
 448          * at all, but requires them in a good order.  Other resets reset
 449          * the index file to the tree object we are switching to. */
 450         if (reset_type == SOFT || reset_type == KEEP)
 451                 die_if_unmerged_cache(reset_type);
 452
 453         if (reset_type != SOFT) {
 454                 struct lock_file lock = LOCK_INIT;
 455                 repo_hold_locked_index(the_repository, &lock,
 456                                        LOCK_DIE_ON_ERROR);
 457                 if (reset_type == MIXED) {
 458                         int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
 459                         if (read_from_tree(&pathspec, &oid, intent_to_add)) {
 460                                 update_ref_status = 1;
 461                                 goto cleanup;
 462                         }
 463                         the_index.updated_skipworktree = 1;
 464                         if (!no_refresh && get_git_work_tree()) {
 465                                 uint64_t t_begin, t_delta_in_ms;
 466
 467                                 t_begin = getnanotime();
 468                                 refresh_index(&the_index, flags, NULL, NULL,
 469                                               _("Unstaged changes after reset:"));
 470                                 t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
 471                                 if (!quiet && advice_enabled(ADVICE_RESET_NO_REFRESH_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
 472                                         advise(_("It took %.2f seconds to refresh the index after reset.  You can use\n"
 473                                                  "'--no-refresh' to avoid this."), t_delta_in_ms / 1000.0);
 474                                 }
 475                         }
 476                 } else {
 477                         struct object_id dummy;
 478                         char *ref = NULL;
 479                         int err;
 480
 481                         repo_dwim_ref(the_repository, rev, strlen(rev),
 482                                       &dummy, &ref, 0);
 483                         if (ref && !starts_with(ref, "refs/"))
 484                                 FREE_AND_NULL(ref);
 485
 486                         err = reset_index(ref, &oid, reset_type, quiet);
 487                         if (reset_type == KEEP && !err)
 488                                 err = reset_index(ref, &oid, MIXED, quiet);
 489                         if (err)
 490                                 die(_("Could not reset index file to revision '%s'."), rev);
 491                         free(ref);
 492                 }
 493
 494                 if (write_locked_index(&the_index, &lock, COMMIT_LOCK))
 495                         die(_("Could not write new index file."));
 496         }
 497
 498         if (!pathspec.nr && !unborn) {
 499                 /* Any resets without paths update HEAD to the head being
 500                  * switched to, saving the previous head in ORIG_HEAD before. */
 501                 update_ref_status = reset_refs(rev, &oid);
 502
 503                 if (reset_type == HARD && !update_ref_status && !quiet)
 504                         print_new_head_line(lookup_commit_reference(the_repository, &oid));
 505         }
 506         if (!pathspec.nr)
 507                 remove_branch_state(the_repository, 0);
 508
 509         discard_index(&the_index);
 510
 511 cleanup:
 512         clear_pathspec(&pathspec);
 513         free(pathspec_from_file);
 514         return update_ref_status;
 515 }