2 * "git reset" builtin command
4 * Copyright (c) 2007 Carlos Rica
6 * Based on git-reset.sh, which is
8 * Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
14 #include "run-command.h"
20 static const char builtin_reset_usage[] =
21 "git-reset [--mixed | --soft | --hard] [<commit-ish>] [ [--] <paths>...]";
23 static char *args_to_str(const char **argv)
26 unsigned long len, space = 0, nr = 0;
28 for (; *argv; argv++) {
30 ALLOC_GROW(buf, nr + 1 + len, space);
33 memcpy(buf + nr, *argv, len);
36 ALLOC_GROW(buf, nr + 1, space);
42 static inline int is_merge(void)
44 return !access(git_path("MERGE_HEAD"), F_OK);
47 static int unmerged_files(void)
51 for (i = 0; i < active_nr; i++) {
52 struct cache_entry *ce = active_cache[i];
59 static int reset_index_file(const unsigned char *sha1, int is_hard_reset)
64 args[i++] = "read-tree";
66 args[i++] = "--reset";
69 args[i++] = sha1_to_hex(sha1);
72 return run_command_v_opt(args, RUN_GIT_CMD);
75 static void print_new_head_line(struct commit *commit)
77 const char *hex, *dots = "...", *body;
79 hex = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
81 hex = sha1_to_hex(commit->object.sha1);
84 printf("HEAD is now at %s%s", hex, dots);
85 body = strstr(commit->buffer, "\n\n");
90 eol = strchr(body, '\n');
91 len = eol ? eol - body : strlen(body);
92 printf(" %.*s\n", (int) len, body);
98 static int update_index_refresh(int fd, struct lock_file *index_lock)
103 index_lock = xcalloc(1, sizeof(struct lock_file));
104 fd = hold_locked_index(index_lock, 1);
107 if (read_cache() < 0)
108 return error("Could not read index");
109 result = refresh_cache(0) ? 1 : 0;
110 if (write_cache(fd, active_cache, active_nr) ||
112 commit_locked_index(index_lock))
113 return error ("Could not refresh index");
117 static void update_index_from_diff(struct diff_queue_struct *q,
118 struct diff_options *opt, void *data)
121 int *discard_flag = data;
123 /* do_diff_cache() mangled the index */
128 for (i = 0; i < q->nr; i++) {
129 struct diff_filespec *one = q->queue[i]->one;
131 struct cache_entry *ce;
132 ce = make_cache_entry(one->mode, one->sha1, one->path,
134 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD |
135 ADD_CACHE_OK_TO_REPLACE);
137 remove_file_from_cache(one->path);
141 static int read_from_tree(const char *prefix, const char **argv,
142 unsigned char *tree_sha1)
144 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
145 int index_fd, index_was_discarded = 0;
146 struct diff_options opt;
148 memset(&opt, 0, sizeof(opt));
149 diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt);
150 opt.output_format = DIFF_FORMAT_CALLBACK;
151 opt.format_callback = update_index_from_diff;
152 opt.format_callback_data = &index_was_discarded;
154 index_fd = hold_locked_index(lock, 1);
155 index_was_discarded = 0;
157 if (do_diff_cache(tree_sha1, &opt))
162 if (!index_was_discarded)
163 /* The index is still clobbered from do_diff_cache() */
165 return update_index_refresh(index_fd, lock);
168 static void prepend_reflog_action(const char *action, char *buf, size_t size)
170 const char *sep = ": ";
171 const char *rla = getenv("GIT_REFLOG_ACTION");
174 if (snprintf(buf, size, "%s%s%s", rla, sep, action) >= size)
175 warning("Reflog action message too long: %.*s...", 50, buf);
178 enum reset_type { MIXED, SOFT, HARD, NONE };
179 static const char *reset_type_names[] = { "mixed", "soft", "hard", NULL };
181 int cmd_reset(int argc, const char **argv, const char *prefix)
183 int i = 1, reset_type = NONE, update_ref_status = 0;
184 const char *rev = "HEAD";
185 unsigned char sha1[20], *orig = NULL, sha1_orig[20],
186 *old_orig = NULL, sha1_old_orig[20];
187 struct commit *commit;
188 char *reflog_action, msg[1024];
190 git_config(git_default_config);
192 reflog_action = args_to_str(argv);
193 setenv("GIT_REFLOG_ACTION", reflog_action, 0);
196 if (!strcmp(argv[i], "--mixed")) {
200 else if (!strcmp(argv[i], "--soft")) {
204 else if (!strcmp(argv[i], "--hard")) {
210 if (i < argc && argv[i][0] != '-')
213 if (get_sha1(rev, sha1))
214 die("Failed to resolve '%s' as a valid ref.", rev);
216 commit = lookup_commit_reference(sha1);
218 die("Could not parse object '%s'.", rev);
219 hashcpy(sha1, commit->object.sha1);
221 if (i < argc && !strcmp(argv[i], "--"))
223 else if (i < argc && argv[i][0] == '-')
224 usage(builtin_reset_usage);
226 /* git reset tree [--] paths... can be used to
227 * load chosen paths from the tree into the index without
228 * affecting the working tree nor HEAD. */
230 if (reset_type == MIXED)
231 warning("--mixed option is deprecated with paths.");
232 else if (reset_type != NONE)
233 die("Cannot do %s reset with paths.",
234 reset_type_names[reset_type]);
235 return read_from_tree(prefix, argv + i, sha1);
237 if (reset_type == NONE)
238 reset_type = MIXED; /* by default */
240 /* Soft reset does not touch the index file nor the working tree
241 * at all, but requires them in a good order. Other resets reset
242 * the index file to the tree object we are switching to. */
243 if (reset_type == SOFT) {
244 if (is_merge() || unmerged_files())
245 die("Cannot do a soft reset in the middle of a merge.");
247 else if (reset_index_file(sha1, (reset_type == HARD)))
248 die("Could not reset index file to revision '%s'.", rev);
250 /* Any resets update HEAD to the head being switched to,
251 * saving the previous head in ORIG_HEAD before. */
252 if (!get_sha1("ORIG_HEAD", sha1_old_orig))
253 old_orig = sha1_old_orig;
254 if (!get_sha1("HEAD", sha1_orig)) {
256 prepend_reflog_action("updating ORIG_HEAD", msg, sizeof(msg));
257 update_ref(msg, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR);
260 delete_ref("ORIG_HEAD", old_orig);
261 prepend_reflog_action("updating HEAD", msg, sizeof(msg));
262 update_ref_status = update_ref(msg, "HEAD", sha1, orig, 0, MSG_ON_ERR);
264 switch (reset_type) {
266 if (!update_ref_status)
267 print_new_head_line(commit);
269 case SOFT: /* Nothing else to do. */
271 case MIXED: /* Report what has not been updated. */
272 update_index_refresh(0, NULL);
276 unlink(git_path("MERGE_HEAD"));
277 unlink(git_path("rr-cache/MERGE_RR"));
278 unlink(git_path("MERGE_MSG"));
279 unlink(git_path("SQUASH_MSG"));
283 return update_ref_status;