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 #include "builtin.h"
  11 #include "tag.h"
  12 #include "object.h"
  13 #include "commit.h"
  14 #include "run-command.h"
  15 #include "refs.h"
  16 #include "diff.h"
  17 #include "diffcore.h"
  18 #include "tree.h"
  19 #include "branch.h"
  20 #include "parse-options.h"
  21 #include "unpack-trees.h"
  22 #include "cache-tree.h"
  23
  24 static const char * const git_reset_usage[] = {
  25         N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
  26         N_("git reset [-q] <commit> [--] <paths>..."),
  27         N_("git reset --patch [<commit>] [--] [<paths>...]"),
  28         NULL
  29 };
  30
  31 enum reset_type { MIXED, SOFT, HARD, MERGE, KEEP, NONE };
  32 static const char *reset_type_names[] = {
  33         N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
  34 };
  35
  36 static inline int is_merge(void)
  37 {
  38         return !access(git_path("MERGE_HEAD"), F_OK);
  39 }
  40
  41 static int reset_index(const unsigned char *sha1, int reset_type, int quiet)
  42 {
  43         int nr = 1;
  44         struct tree_desc desc[2];
  45         struct tree *tree;
  46         struct unpack_trees_options opts;
  47
  48         memset(&opts, 0, sizeof(opts));
  49         opts.head_idx = 1;
  50         opts.src_index = &the_index;
  51         opts.dst_index = &the_index;
  52         opts.fn = oneway_merge;
  53         opts.merge = 1;
  54         if (!quiet)
  55                 opts.verbose_update = 1;
  56         switch (reset_type) {
  57         case KEEP:
  58         case MERGE:
  59                 opts.update = 1;
  60                 break;
  61         case HARD:
  62                 opts.update = 1;
  63                 /* fallthrough */
  64         default:
  65                 opts.reset = 1;
  66         }
  67
  68         read_cache_unmerged();
  69
  70         if (reset_type == KEEP) {
  71                 unsigned char head_sha1[20];
  72                 if (get_sha1("HEAD", head_sha1))
  73                         return error(_("You do not have a valid HEAD."));
  74                 if (!fill_tree_descriptor(desc, head_sha1))
  75                         return error(_("Failed to find tree of HEAD."));
  76                 nr++;
  77                 opts.fn = twoway_merge;
  78         }
  79
  80         if (!fill_tree_descriptor(desc + nr - 1, sha1))
  81                 return error(_("Failed to find tree of %s."), sha1_to_hex(sha1));
  82         if (unpack_trees(nr, desc, &opts))
  83                 return -1;
  84
  85         if (reset_type == MIXED || reset_type == HARD) {
  86                 tree = parse_tree_indirect(sha1);
  87                 prime_cache_tree(&active_cache_tree, tree);
  88         }
  89
  90         return 0;
  91 }
  92
  93 static void print_new_head_line(struct commit *commit)
  94 {
  95         const char *hex, *body;
  96
  97         hex = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
  98         printf(_("HEAD is now at %s"), hex);
  99         body = strstr(commit->buffer, "\n\n");
 100         if (body) {
 101                 const char *eol;
 102                 size_t len;
 103                 body += 2;
 104                 eol = strchr(body, '\n');
 105                 len = eol ? eol - body : strlen(body);
 106                 printf(" %.*s\n", (int) len, body);
 107         }
 108         else
 109                 printf("\n");
 110 }
 111
 112 static int update_index_refresh(int fd, struct lock_file *index_lock, int flags)
 113 {
 114         if (!index_lock) {
 115                 index_lock = xcalloc(1, sizeof(struct lock_file));
 116                 fd = hold_locked_index(index_lock, 1);
 117         }
 118
 119         refresh_index(&the_index, (flags), NULL, NULL,
 120                       _("Unstaged changes after reset:"));
 121         if (write_cache(fd, active_cache, active_nr) ||
 122                         commit_locked_index(index_lock))
 123                 return error ("Could not refresh index");
 124         return 0;
 125 }
 126
 127 static void update_index_from_diff(struct diff_queue_struct *q,
 128                 struct diff_options *opt, void *data)
 129 {
 130         int i;
 131
 132         for (i = 0; i < q->nr; i++) {
 133                 struct diff_filespec *one = q->queue[i]->one;
 134                 if (one->mode && !is_null_sha1(one->sha1)) {
 135                         struct cache_entry *ce;
 136                         ce = make_cache_entry(one->mode, one->sha1, one->path,
 137                                 0, 0);
 138                         if (!ce)
 139                                 die(_("make_cache_entry failed for path '%s'"),
 140                                     one->path);
 141                         add_cache_entry(ce, ADD_CACHE_OK_TO_ADD |
 142                                 ADD_CACHE_OK_TO_REPLACE);
 143                 } else
 144                         remove_file_from_cache(one->path);
 145         }
 146 }
 147
 148 static int read_from_tree(const char **pathspec, unsigned char *tree_sha1)
 149 {
 150         struct diff_options opt;
 151
 152         memset(&opt, 0, sizeof(opt));
 153         diff_tree_setup_paths(pathspec, &opt);
 154         opt.output_format = DIFF_FORMAT_CALLBACK;
 155         opt.format_callback = update_index_from_diff;
 156
 157         read_cache();
 158         if (do_diff_cache(tree_sha1, &opt))
 159                 return 1;
 160         diffcore_std(&opt);
 161         diff_flush(&opt);
 162         diff_tree_release_paths(&opt);
 163
 164         return 0;
 165 }
 166
 167 static void set_reflog_message(struct strbuf *sb, const char *action,
 168                                const char *rev)
 169 {
 170         const char *rla = getenv("GIT_REFLOG_ACTION");
 171
 172         strbuf_reset(sb);
 173         if (rla)
 174                 strbuf_addf(sb, "%s: %s", rla, action);
 175         else if (rev)
 176                 strbuf_addf(sb, "reset: moving to %s", rev);
 177         else
 178                 strbuf_addf(sb, "reset: %s", action);
 179 }
 180
 181 static void die_if_unmerged_cache(int reset_type)
 182 {
 183         if (is_merge() || read_cache() < 0 || unmerged_cache())
 184                 die(_("Cannot do a %s reset in the middle of a merge."),
 185                     _(reset_type_names[reset_type]));
 186
 187 }
 188
 189 static const char **parse_args(const char **argv, const char *prefix, const char **rev_ret)
 190 {
 191         const char *rev = "HEAD";
 192         unsigned char unused[20];
 193         /*
 194          * Possible arguments are:
 195          *
 196          * git reset [-opts] <rev> <paths>...
 197          * git reset [-opts] <rev> -- <paths>...
 198          * git reset [-opts] -- <paths>...
 199          * git reset [-opts] <paths>...
 200          *
 201          * At this point, argv points immediately after [-opts].
 202          */
 203
 204         if (argv[0]) {
 205                 if (!strcmp(argv[0], "--")) {
 206                         argv++; /* reset to HEAD, possibly with paths */
 207                 } else if (argv[1] && !strcmp(argv[1], "--")) {
 208                         rev = argv[0];
 209                         argv += 2;
 210                 }
 211                 /*
 212                  * Otherwise, argv[0] could be either <rev> or <paths> and
 213                  * has to be unambiguous.
 214                  */
 215                 else if (!get_sha1_committish(argv[0], unused)) {
 216                         /*
 217                          * Ok, argv[0] looks like a rev; it should not
 218                          * be a filename.
 219                          */
 220                         verify_non_filename(prefix, argv[0]);
 221                         rev = *argv++;
 222                 } else {
 223                         /* Otherwise we treat this as a filename */
 224                         verify_filename(prefix, argv[0], 1);
 225                 }
 226         }
 227         *rev_ret = rev;
 228         return argv[0] ? get_pathspec(prefix, argv) : NULL;
 229 }
 230
 231 static int update_refs(const char *rev, const unsigned char *sha1)
 232 {
 233         int update_ref_status;
 234         struct strbuf msg = STRBUF_INIT;
 235         unsigned char *orig = NULL, sha1_orig[20],
 236                 *old_orig = NULL, sha1_old_orig[20];
 237
 238         if (!get_sha1("ORIG_HEAD", sha1_old_orig))
 239                 old_orig = sha1_old_orig;
 240         if (!get_sha1("HEAD", sha1_orig)) {
 241                 orig = sha1_orig;
 242                 set_reflog_message(&msg, "updating ORIG_HEAD", NULL);
 243                 update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR);
 244         } else if (old_orig)
 245                 delete_ref("ORIG_HEAD", old_orig, 0);
 246         set_reflog_message(&msg, "updating HEAD", rev);
 247         update_ref_status = update_ref(msg.buf, "HEAD", sha1, orig, 0, MSG_ON_ERR);
 248         strbuf_release(&msg);
 249         return update_ref_status;
 250 }
 251
 252 int cmd_reset(int argc, const char **argv, const char *prefix)
 253 {
 254         int reset_type = NONE, update_ref_status = 0, quiet = 0;
 255         int patch_mode = 0;
 256         const char *rev;
 257         unsigned char sha1[20];
 258         const char **pathspec = NULL;
 259         struct commit *commit;
 260         const struct option options[] = {
 261                 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 262                 OPT_SET_INT(0, "mixed", &reset_type,
 263                                                 N_("reset HEAD and index"), MIXED),
 264                 OPT_SET_INT(0, "soft", &reset_type, N_("reset only HEAD"), SOFT),
 265                 OPT_SET_INT(0, "hard", &reset_type,
 266                                 N_("reset HEAD, index and working tree"), HARD),
 267                 OPT_SET_INT(0, "merge", &reset_type,
 268                                 N_("reset HEAD, index and working tree"), MERGE),
 269                 OPT_SET_INT(0, "keep", &reset_type,
 270                                 N_("reset HEAD but keep local changes"), KEEP),
 271                 OPT_BOOLEAN('p', "patch", &patch_mode, N_("select hunks interactively")),
 272                 OPT_END()
 273         };
 274
 275         git_config(git_default_config, NULL);
 276
 277         argc = parse_options(argc, argv, prefix, options, git_reset_usage,
 278                                                 PARSE_OPT_KEEP_DASHDASH);
 279         pathspec = parse_args(argv, prefix, &rev);
 280
 281         if (get_sha1_committish(rev, sha1))
 282                 die(_("Failed to resolve '%s' as a valid ref."), rev);
 283
 284         /*
 285          * NOTE: As "git reset $treeish -- $path" should be usable on
 286          * any tree-ish, this is not strictly correct. We are not
 287          * moving the HEAD to any commit; we are merely resetting the
 288          * entries in the index to that of a treeish.
 289          */
 290         commit = lookup_commit_reference(sha1);
 291         if (!commit)
 292                 die(_("Could not parse object '%s'."), rev);
 293         hashcpy(sha1, commit->object.sha1);
 294
 295         if (patch_mode) {
 296                 if (reset_type != NONE)
 297                         die(_("--patch is incompatible with --{hard,mixed,soft}"));
 298                 return run_add_interactive(rev, "--patch=reset", pathspec);
 299         }
 300
 301         /* git reset tree [--] paths... can be used to
 302          * load chosen paths from the tree into the index without
 303          * affecting the working tree nor HEAD. */
 304         if (pathspec) {
 305                 if (reset_type == MIXED)
 306                         warning(_("--mixed with paths is deprecated; use 'git reset -- <paths>' instead."));
 307                 else if (reset_type != NONE)
 308                         die(_("Cannot do %s reset with paths."),
 309                                         _(reset_type_names[reset_type]));
 310         }
 311         if (reset_type == NONE)
 312                 reset_type = MIXED; /* by default */
 313
 314         if (reset_type != SOFT && reset_type != MIXED)
 315                 setup_work_tree();
 316
 317         if (reset_type == MIXED && is_bare_repository())
 318                 die(_("%s reset is not allowed in a bare repository"),
 319                     _(reset_type_names[reset_type]));
 320
 321         if (pathspec) {
 322                 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
 323                 int index_fd = hold_locked_index(lock, 1);
 324                 return read_from_tree(pathspec, sha1) ||
 325                         update_index_refresh(index_fd, lock,
 326                                         quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
 327         }
 328
 329         /* Soft reset does not touch the index file nor the working tree
 330          * at all, but requires them in a good order.  Other resets reset
 331          * the index file to the tree object we are switching to. */
 332         if (reset_type == SOFT || reset_type == KEEP)
 333                 die_if_unmerged_cache(reset_type);
 334
 335         if (reset_type != SOFT) {
 336                 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
 337                 int newfd = hold_locked_index(lock, 1);
 338                 int err = reset_index(sha1, reset_type, quiet);
 339                 if (reset_type == KEEP && !err)
 340                         err = reset_index(sha1, MIXED, quiet);
 341                 if (err)
 342                         die(_("Could not reset index file to revision '%s'."), rev);
 343                 if (write_cache(newfd, active_cache, active_nr) ||
 344                     commit_locked_index(lock))
 345                         die(_("Could not write new index file."));
 346         }
 347
 348         /* Any resets update HEAD to the head being switched to,
 349          * saving the previous head in ORIG_HEAD before. */
 350         update_ref_status = update_refs(rev, sha1);
 351
 352         if (reset_type == HARD && !update_ref_status && !quiet)
 353                 print_new_head_line(commit);
 354         else if (reset_type == MIXED) /* Report what has not been updated. */
 355                 update_index_refresh(0, NULL,
 356                                 quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
 357
 358         remove_branch_state();
 359
 360         return update_ref_status;
 361 }