refs: convert delete_ref and refs_delete_ref to struct object_id
[git/git.git] / builtin / reset.c
CommitLineData
0e5a7faa
CR
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 */
c2e86add 10#include "builtin.h"
b2141fc1 11#include "config.h"
697cc8ef 12#include "lockfile.h"
0e5a7faa
CR
13#include "tag.h"
14#include "object.h"
15#include "commit.h"
16#include "run-command.h"
17#include "refs.h"
18#include "diff.h"
19#include "diffcore.h"
20#include "tree.h"
c369e7b8 21#include "branch.h"
5eee6b28 22#include "parse-options.h"
d0f379c2
SB
23#include "unpack-trees.h"
24#include "cache-tree.h"
35b96d1d
SB
25#include "submodule.h"
26#include "submodule-config.h"
27
5eee6b28 28static const char * const git_reset_usage[] = {
c1e9c2a7 29 N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
641c900b 30 N_("git reset [-q] [<tree-ish>] [--] <paths>..."),
bf44142f 31 N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
5eee6b28
CR
32 NULL
33};
0e5a7faa 34
9bc454df
CC
35enum reset_type { MIXED, SOFT, HARD, MERGE, KEEP, NONE };
36static const char *reset_type_names[] = {
8b2a57b6 37 N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
9bc454df 38};
9e8eceab 39
0e5a7faa
CR
40static inline int is_merge(void)
41{
f932729c 42 return !access(git_path_merge_head(), F_OK);
0e5a7faa
CR
43}
44
3a5d7c55 45static int reset_index(const struct object_id *oid, int reset_type, int quiet)
0e5a7faa 46{
afbb8838 47 int i, nr = 0;
d0f379c2 48 struct tree_desc desc[2];
6c52ec8a 49 struct tree *tree;
d0f379c2 50 struct unpack_trees_options opts;
afbb8838 51 int ret = -1;
0e5a7faa 52
d0f379c2
SB
53 memset(&opts, 0, sizeof(opts));
54 opts.head_idx = 1;
55 opts.src_index = &the_index;
56 opts.dst_index = &the_index;
57 opts.fn = oneway_merge;
58 opts.merge = 1;
5aa965a0 59 if (!quiet)
d0f379c2 60 opts.verbose_update = 1;
9e8eceab 61 switch (reset_type) {
9bc454df 62 case KEEP:
9e8eceab 63 case MERGE:
d0f379c2 64 opts.update = 1;
9e8eceab
LT
65 break;
66 case HARD:
d0f379c2 67 opts.update = 1;
9e8eceab
LT
68 /* fallthrough */
69 default:
d0f379c2 70 opts.reset = 1;
9e8eceab 71 }
0e5a7faa 72
d0f379c2
SB
73 read_cache_unmerged();
74
9bc454df 75 if (reset_type == KEEP) {
3a5d7c55 76 struct object_id head_oid;
77 if (get_oid("HEAD", &head_oid))
b50a64e8 78 return error(_("You do not have a valid HEAD."));
e9ce897b 79 if (!fill_tree_descriptor(desc + nr, &head_oid))
b50a64e8 80 return error(_("Failed to find tree of HEAD."));
9bc454df
CC
81 nr++;
82 opts.fn = twoway_merge;
83 }
84
afbb8838
JK
85 if (!fill_tree_descriptor(desc + nr, oid)) {
86 error(_("Failed to find tree of %s."), oid_to_hex(oid));
87 goto out;
88 }
e9ce897b
JK
89 nr++;
90
d0f379c2 91 if (unpack_trees(nr, desc, &opts))
afbb8838 92 goto out;
6c52ec8a
TR
93
94 if (reset_type == MIXED || reset_type == HARD) {
a9dbc179 95 tree = parse_tree_indirect(oid);
e6c286e8 96 prime_cache_tree(&the_index, tree);
6c52ec8a
TR
97 }
98
afbb8838
JK
99 ret = 0;
100
101out:
102 for (i = 0; i < nr; i++)
103 free((void *)desc[i].buffer);
104 return ret;
0e5a7faa
CR
105}
106
107static void print_new_head_line(struct commit *commit)
108{
2efb3b06 109 const char *hex, *body;
b000c59b 110 const char *msg;
0e5a7faa 111
ed1c9977 112 hex = find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
b50a64e8 113 printf(_("HEAD is now at %s"), hex);
ecaee805
AS
114 msg = logmsg_reencode(commit, NULL, get_log_output_encoding());
115 body = strstr(msg, "\n\n");
0e5a7faa
CR
116 if (body) {
117 const char *eol;
118 size_t len;
054a5aee 119 body = skip_blank_lines(body + 2);
0e5a7faa
CR
120 eol = strchr(body, '\n');
121 len = eol ? eol - body : strlen(body);
122 printf(" %.*s\n", (int) len, body);
123 }
124 else
125 printf("\n");
b66103c3 126 unuse_commit_buffer(commit, msg);
0e5a7faa
CR
127}
128
0e5a7faa
CR
129static void update_index_from_diff(struct diff_queue_struct *q,
130 struct diff_options *opt, void *data)
131{
132 int i;
b4b313f9 133 int intent_to_add = *(int *)data;
0e5a7faa
CR
134
135 for (i = 0; i < q->nr; i++) {
136 struct diff_filespec *one = q->queue[i]->one;
a0d12c44 137 int is_missing = !(one->mode && !is_null_oid(&one->oid));
b4b313f9
NTND
138 struct cache_entry *ce;
139
140 if (is_missing && !intent_to_add) {
0e5a7faa 141 remove_file_from_cache(one->path);
b4b313f9
NTND
142 continue;
143 }
144
a0d12c44 145 ce = make_cache_entry(one->mode, one->oid.hash, one->path,
b4b313f9
NTND
146 0, 0);
147 if (!ce)
148 die(_("make_cache_entry failed for path '%s'"),
149 one->path);
150 if (is_missing) {
151 ce->ce_flags |= CE_INTENT_TO_ADD;
152 set_object_name_for_intent_to_add_entry(ce);
153 }
154 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
0e5a7faa
CR
155 }
156}
157
bd1928df 158static int read_from_tree(const struct pathspec *pathspec,
3a5d7c55 159 struct object_id *tree_oid,
b4b313f9 160 int intent_to_add)
0e5a7faa 161{
0e5a7faa
CR
162 struct diff_options opt;
163
164 memset(&opt, 0, sizeof(opt));
bd1928df 165 copy_pathspec(&opt.pathspec, pathspec);
0e5a7faa
CR
166 opt.output_format = DIFF_FORMAT_CALLBACK;
167 opt.format_callback = update_index_from_diff;
b4b313f9 168 opt.format_callback_data = &intent_to_add;
55568086 169 opt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
0e5a7faa 170
944cffbd 171 if (do_diff_cache(tree_oid, &opt))
0e5a7faa
CR
172 return 1;
173 diffcore_std(&opt);
174 diff_flush(&opt);
ed6e8038 175 clear_pathspec(&opt.pathspec);
2e7a9785 176
bf883f30 177 return 0;
0e5a7faa
CR
178}
179
d04520e3
JK
180static void set_reflog_message(struct strbuf *sb, const char *action,
181 const char *rev)
0e5a7faa 182{
0e5a7faa 183 const char *rla = getenv("GIT_REFLOG_ACTION");
d04520e3
JK
184
185 strbuf_reset(sb);
186 if (rla)
187 strbuf_addf(sb, "%s: %s", rla, action);
188 else if (rev)
189 strbuf_addf(sb, "reset: moving to %s", rev);
190 else
191 strbuf_addf(sb, "reset: %s", action);
0e5a7faa
CR
192}
193
812d2a3d
CC
194static void die_if_unmerged_cache(int reset_type)
195{
2c63d6eb 196 if (is_merge() || unmerged_cache())
8b2a57b6
ÆAB
197 die(_("Cannot do a %s reset in the middle of a merge."),
198 _(reset_type_names[reset_type]));
812d2a3d
CC
199
200}
201
f8144c9f
NTND
202static void parse_args(struct pathspec *pathspec,
203 const char **argv, const char *prefix,
204 int patch_mode,
205 const char **rev_ret)
0e5a7faa 206{
0e5a7faa 207 const char *rev = "HEAD";
3a5d7c55 208 struct object_id unused;
dfc8f39e
JH
209 /*
210 * Possible arguments are:
211 *
2f328c3d
MZ
212 * git reset [-opts] [<rev>]
213 * git reset [-opts] <tree> [<paths>...]
214 * git reset [-opts] <tree> -- [<paths>...]
215 * git reset [-opts] -- [<paths>...]
dfc8f39e
JH
216 * git reset [-opts] <paths>...
217 *
dca48cf5 218 * At this point, argv points immediately after [-opts].
dfc8f39e
JH
219 */
220
dca48cf5
MZ
221 if (argv[0]) {
222 if (!strcmp(argv[0], "--")) {
223 argv++; /* reset to HEAD, possibly with paths */
224 } else if (argv[1] && !strcmp(argv[1], "--")) {
225 rev = argv[0];
226 argv += 2;
dfc8f39e
JH
227 }
228 /*
dca48cf5 229 * Otherwise, argv[0] could be either <rev> or <paths> and
2f328c3d
MZ
230 * has to be unambiguous. If there is a single argument, it
231 * can not be a tree
dfc8f39e 232 */
e82caf38 233 else if ((!argv[1] && !get_oid_committish(argv[0], &unused)) ||
234 (argv[1] && !get_oid_treeish(argv[0], &unused))) {
dfc8f39e 235 /*
2f328c3d 236 * Ok, argv[0] looks like a commit/tree; it should not
dfc8f39e
JH
237 * be a filename.
238 */
dca48cf5
MZ
239 verify_non_filename(prefix, argv[0]);
240 rev = *argv++;
dfc8f39e
JH
241 } else {
242 /* Otherwise we treat this as a filename */
dca48cf5 243 verify_filename(prefix, argv[0], 1);
dfc8f39e
JH
244 }
245 }
39ea722d 246 *rev_ret = rev;
2c63d6eb
JK
247
248 if (read_cache() < 0)
249 die(_("index file corrupt"));
250
480ca644
NTND
251 parse_pathspec(pathspec, 0,
252 PATHSPEC_PREFER_FULL |
253 (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
f8144c9f 254 prefix, argv);
39ea722d
MZ
255}
256
3a5d7c55 257static int reset_refs(const char *rev, const struct object_id *oid)
7bca0e45
MZ
258{
259 int update_ref_status;
260 struct strbuf msg = STRBUF_INIT;
3a5d7c55 261 struct object_id *orig = NULL, oid_orig,
262 *old_orig = NULL, oid_old_orig;
7bca0e45 263
3a5d7c55 264 if (!get_oid("ORIG_HEAD", &oid_old_orig))
265 old_orig = &oid_old_orig;
266 if (!get_oid("HEAD", &oid_orig)) {
267 orig = &oid_orig;
7bca0e45 268 set_reflog_message(&msg, "updating ORIG_HEAD", NULL);
3a5d7c55 269 update_ref_oid(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
f4124112 270 UPDATE_REFS_MSG_ON_ERR);
7bca0e45 271 } else if (old_orig)
2616a5e5 272 delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
7bca0e45 273 set_reflog_message(&msg, "updating HEAD", rev);
3a5d7c55 274 update_ref_status = update_ref_oid(msg.buf, "HEAD", oid, orig, 0,
f4124112 275 UPDATE_REFS_MSG_ON_ERR);
7bca0e45
MZ
276 strbuf_release(&msg);
277 return update_ref_status;
278}
279
046b4823
SB
280static int git_reset_config(const char *var, const char *value, void *cb)
281{
282 if (!strcmp(var, "submodule.recurse"))
283 return git_default_submodule_config(var, value, cb);
284
285 return git_default_config(var, value, cb);
286}
287
39ea722d
MZ
288int cmd_reset(int argc, const char **argv, const char *prefix)
289{
290 int reset_type = NONE, update_ref_status = 0, quiet = 0;
166ec2e9 291 int patch_mode = 0, unborn;
39ea722d 292 const char *rev;
f2fd0760 293 struct object_id oid;
f8144c9f 294 struct pathspec pathspec;
b4b313f9 295 int intent_to_add = 0;
39ea722d
MZ
296 const struct option options[] = {
297 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
298 OPT_SET_INT(0, "mixed", &reset_type,
299 N_("reset HEAD and index"), MIXED),
300 OPT_SET_INT(0, "soft", &reset_type, N_("reset only HEAD"), SOFT),
301 OPT_SET_INT(0, "hard", &reset_type,
302 N_("reset HEAD, index and working tree"), HARD),
303 OPT_SET_INT(0, "merge", &reset_type,
304 N_("reset HEAD, index and working tree"), MERGE),
305 OPT_SET_INT(0, "keep", &reset_type,
306 N_("reset HEAD but keep local changes"), KEEP),
58b75bd6 307 { OPTION_CALLBACK, 0, "recurse-submodules", NULL,
35b96d1d 308 "reset", "control recursive updating of submodules",
d7a3803f 309 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
d5d09d47 310 OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
b4b313f9
NTND
311 OPT_BOOL('N', "intent-to-add", &intent_to_add,
312 N_("record only the fact that removed paths will be added later")),
39ea722d
MZ
313 OPT_END()
314 };
315
046b4823 316 git_config(git_reset_config, NULL);
39ea722d
MZ
317
318 argc = parse_options(argc, argv, prefix, options, git_reset_usage,
319 PARSE_OPT_KEEP_DASHDASH);
f8144c9f 320 parse_args(&pathspec, argv, prefix, patch_mode, &rev);
0e5a7faa 321
e82caf38 322 unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
166ec2e9
MZ
323 if (unborn) {
324 /* reset on unborn branch: treat as reset to empty tree */
f2fd0760 325 hashcpy(oid.hash, EMPTY_TREE_SHA1_BIN);
f8144c9f 326 } else if (!pathspec.nr) {
2f328c3d 327 struct commit *commit;
e82caf38 328 if (get_oid_committish(rev, &oid))
2f328c3d 329 die(_("Failed to resolve '%s' as a valid revision."), rev);
bc83266a 330 commit = lookup_commit_reference(&oid);
2f328c3d
MZ
331 if (!commit)
332 die(_("Could not parse object '%s'."), rev);
f2fd0760 333 oidcpy(&oid, &commit->object.oid);
2f328c3d
MZ
334 } else {
335 struct tree *tree;
e82caf38 336 if (get_oid_treeish(rev, &oid))
2f328c3d 337 die(_("Failed to resolve '%s' as a valid tree."), rev);
a9dbc179 338 tree = parse_tree_indirect(&oid);
2f328c3d
MZ
339 if (!tree)
340 die(_("Could not parse object '%s'."), rev);
f2fd0760 341 oidcpy(&oid, &tree->object.oid);
2f328c3d 342 }
0e5a7faa 343
d002ef4d
TR
344 if (patch_mode) {
345 if (reset_type != NONE)
b50a64e8 346 die(_("--patch is incompatible with --{hard,mixed,soft}"));
b3e9ce13 347 return run_add_interactive(rev, "--patch=reset", &pathspec);
d002ef4d
TR
348 }
349
0e5a7faa
CR
350 /* git reset tree [--] paths... can be used to
351 * load chosen paths from the tree into the index without
352 * affecting the working tree nor HEAD. */
f8144c9f 353 if (pathspec.nr) {
0e5a7faa 354 if (reset_type == MIXED)
b50a64e8 355 warning(_("--mixed with paths is deprecated; use 'git reset -- <paths>' instead."));
0e5a7faa 356 else if (reset_type != NONE)
8b2a57b6
ÆAB
357 die(_("Cannot do %s reset with paths."),
358 _(reset_type_names[reset_type]));
0e5a7faa
CR
359 }
360 if (reset_type == NONE)
361 reset_type = MIXED; /* by default */
362
b7756d41 363 if (reset_type != SOFT && (reset_type != MIXED || get_git_work_tree()))
cd0f0f68 364 setup_work_tree();
49b9362f 365
2b06b0a0 366 if (reset_type == MIXED && is_bare_repository())
8b2a57b6
ÆAB
367 die(_("%s reset is not allowed in a bare repository"),
368 _(reset_type_names[reset_type]));
2b06b0a0 369
b4b313f9
NTND
370 if (intent_to_add && reset_type != MIXED)
371 die(_("-N can only be used with --mixed"));
372
0e5a7faa
CR
373 /* Soft reset does not touch the index file nor the working tree
374 * at all, but requires them in a good order. Other resets reset
375 * the index file to the tree object we are switching to. */
352f58a5 376 if (reset_type == SOFT || reset_type == KEEP)
812d2a3d 377 die_if_unmerged_cache(reset_type);
352f58a5
MZ
378
379 if (reset_type != SOFT) {
bfffb48c
JK
380 struct lock_file lock = LOCK_INIT;
381 hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
3fde386a 382 if (reset_type == MIXED) {
f38798f4 383 int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
3a5d7c55 384 if (read_from_tree(&pathspec, &oid, intent_to_add))
3bbf2f20 385 return 1;
b7756d41
NTND
386 if (get_git_work_tree())
387 refresh_index(&the_index, flags, NULL, NULL,
388 _("Unstaged changes after reset:"));
3bbf2f20 389 } else {
3a5d7c55 390 int err = reset_index(&oid, reset_type, quiet);
3bbf2f20 391 if (reset_type == KEEP && !err)
3a5d7c55 392 err = reset_index(&oid, MIXED, quiet);
3bbf2f20
MZ
393 if (err)
394 die(_("Could not reset index file to revision '%s'."), rev);
395 }
bc41bf42 396
bfffb48c 397 if (write_locked_index(&the_index, &lock, COMMIT_LOCK))
1ca38f85 398 die(_("Could not write new index file."));
0e5a7faa 399 }
0e5a7faa 400
f8144c9f 401 if (!pathspec.nr && !unborn) {
3bbf2f20
MZ
402 /* Any resets without paths update HEAD to the head being
403 * switched to, saving the previous head in ORIG_HEAD before. */
3a5d7c55 404 update_ref_status = reset_refs(rev, &oid);
0e5a7faa 405
3bbf2f20 406 if (reset_type == HARD && !update_ref_status && !quiet)
bc83266a 407 print_new_head_line(lookup_commit_reference(&oid));
3bbf2f20 408 }
f8144c9f 409 if (!pathspec.nr)
166ec2e9 410 remove_branch_state();
0e5a7faa 411
0e5a7faa
CR
412 return update_ref_status;
413}