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