]>
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 | */ | |
10 | #include "cache.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" | |
c369e7b8 | 19 | #include "branch.h" |
0e5a7faa CR |
20 | |
21 | static const char builtin_reset_usage[] = | |
521b53e5 | 22 | "git-reset [--mixed | --soft | --hard] [-q] [<commit-ish>] [ [--] <paths>...]"; |
0e5a7faa CR |
23 | |
24 | static char *args_to_str(const char **argv) | |
25 | { | |
26 | char *buf = NULL; | |
27 | unsigned long len, space = 0, nr = 0; | |
28 | ||
29 | for (; *argv; argv++) { | |
30 | len = strlen(*argv); | |
31 | ALLOC_GROW(buf, nr + 1 + len, space); | |
32 | if (nr) | |
33 | buf[nr++] = ' '; | |
34 | memcpy(buf + nr, *argv, len); | |
35 | nr += len; | |
36 | } | |
37 | ALLOC_GROW(buf, nr + 1, space); | |
38 | buf[nr] = '\0'; | |
39 | ||
40 | return buf; | |
41 | } | |
42 | ||
43 | static inline int is_merge(void) | |
44 | { | |
45 | return !access(git_path("MERGE_HEAD"), F_OK); | |
46 | } | |
47 | ||
0e5a7faa CR |
48 | static int reset_index_file(const unsigned char *sha1, int is_hard_reset) |
49 | { | |
50 | int i = 0; | |
51 | const char *args[6]; | |
52 | ||
53 | args[i++] = "read-tree"; | |
54 | args[i++] = "-v"; | |
55 | args[i++] = "--reset"; | |
56 | if (is_hard_reset) | |
57 | args[i++] = "-u"; | |
58 | args[i++] = sha1_to_hex(sha1); | |
59 | args[i] = NULL; | |
60 | ||
61 | return run_command_v_opt(args, RUN_GIT_CMD); | |
62 | } | |
63 | ||
64 | static void print_new_head_line(struct commit *commit) | |
65 | { | |
66 | const char *hex, *dots = "...", *body; | |
67 | ||
68 | hex = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); | |
69 | if (!hex) { | |
70 | hex = sha1_to_hex(commit->object.sha1); | |
71 | dots = ""; | |
72 | } | |
73 | printf("HEAD is now at %s%s", hex, dots); | |
74 | body = strstr(commit->buffer, "\n\n"); | |
75 | if (body) { | |
76 | const char *eol; | |
77 | size_t len; | |
78 | body += 2; | |
79 | eol = strchr(body, '\n'); | |
80 | len = eol ? eol - body : strlen(body); | |
81 | printf(" %.*s\n", (int) len, body); | |
82 | } | |
83 | else | |
84 | printf("\n"); | |
85 | } | |
86 | ||
620a6cd4 | 87 | static int update_index_refresh(int fd, struct lock_file *index_lock) |
0e5a7faa | 88 | { |
620a6cd4 | 89 | int result; |
0e5a7faa | 90 | |
620a6cd4 JS |
91 | if (!index_lock) { |
92 | index_lock = xcalloc(1, sizeof(struct lock_file)); | |
93 | fd = hold_locked_index(index_lock, 1); | |
94 | } | |
0e5a7faa | 95 | |
620a6cd4 JS |
96 | if (read_cache() < 0) |
97 | return error("Could not read index"); | |
98 | result = refresh_cache(0) ? 1 : 0; | |
99 | if (write_cache(fd, active_cache, active_nr) || | |
620a6cd4 JS |
100 | commit_locked_index(index_lock)) |
101 | return error ("Could not refresh index"); | |
102 | return result; | |
103 | } | |
2e7a9785 | 104 | |
0e5a7faa CR |
105 | static void update_index_from_diff(struct diff_queue_struct *q, |
106 | struct diff_options *opt, void *data) | |
107 | { | |
108 | int i; | |
620a6cd4 | 109 | int *discard_flag = data; |
0e5a7faa CR |
110 | |
111 | /* do_diff_cache() mangled the index */ | |
112 | discard_cache(); | |
620a6cd4 | 113 | *discard_flag = 1; |
0e5a7faa CR |
114 | read_cache(); |
115 | ||
116 | for (i = 0; i < q->nr; i++) { | |
117 | struct diff_filespec *one = q->queue[i]->one; | |
118 | if (one->mode) { | |
119 | struct cache_entry *ce; | |
120 | ce = make_cache_entry(one->mode, one->sha1, one->path, | |
121 | 0, 0); | |
122 | add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | | |
123 | ADD_CACHE_OK_TO_REPLACE); | |
124 | } else | |
125 | remove_file_from_cache(one->path); | |
126 | } | |
127 | } | |
128 | ||
129 | static int read_from_tree(const char *prefix, const char **argv, | |
130 | unsigned char *tree_sha1) | |
131 | { | |
620a6cd4 JS |
132 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); |
133 | int index_fd, index_was_discarded = 0; | |
0e5a7faa CR |
134 | struct diff_options opt; |
135 | ||
136 | memset(&opt, 0, sizeof(opt)); | |
137 | diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt); | |
138 | opt.output_format = DIFF_FORMAT_CALLBACK; | |
139 | opt.format_callback = update_index_from_diff; | |
620a6cd4 | 140 | opt.format_callback_data = &index_was_discarded; |
0e5a7faa | 141 | |
620a6cd4 JS |
142 | index_fd = hold_locked_index(lock, 1); |
143 | index_was_discarded = 0; | |
0e5a7faa CR |
144 | read_cache(); |
145 | if (do_diff_cache(tree_sha1, &opt)) | |
146 | return 1; | |
147 | diffcore_std(&opt); | |
148 | diff_flush(&opt); | |
03b69c76 | 149 | diff_tree_release_paths(&opt); |
2e7a9785 | 150 | |
620a6cd4 JS |
151 | if (!index_was_discarded) |
152 | /* The index is still clobbered from do_diff_cache() */ | |
153 | discard_cache(); | |
154 | return update_index_refresh(index_fd, lock); | |
0e5a7faa CR |
155 | } |
156 | ||
157 | static void prepend_reflog_action(const char *action, char *buf, size_t size) | |
158 | { | |
159 | const char *sep = ": "; | |
160 | const char *rla = getenv("GIT_REFLOG_ACTION"); | |
161 | if (!rla) | |
162 | rla = sep = ""; | |
163 | if (snprintf(buf, size, "%s%s%s", rla, sep, action) >= size) | |
164 | warning("Reflog action message too long: %.*s...", 50, buf); | |
165 | } | |
166 | ||
167 | enum reset_type { MIXED, SOFT, HARD, NONE }; | |
538dfe73 | 168 | static const char *reset_type_names[] = { "mixed", "soft", "hard", NULL }; |
0e5a7faa CR |
169 | |
170 | int cmd_reset(int argc, const char **argv, const char *prefix) | |
171 | { | |
521b53e5 | 172 | int i = 1, reset_type = NONE, update_ref_status = 0, quiet = 0; |
0e5a7faa CR |
173 | const char *rev = "HEAD"; |
174 | unsigned char sha1[20], *orig = NULL, sha1_orig[20], | |
175 | *old_orig = NULL, sha1_old_orig[20]; | |
176 | struct commit *commit; | |
177 | char *reflog_action, msg[1024]; | |
178 | ||
179 | git_config(git_default_config); | |
180 | ||
181 | reflog_action = args_to_str(argv); | |
182 | setenv("GIT_REFLOG_ACTION", reflog_action, 0); | |
183 | ||
521b53e5 | 184 | while (i < argc) { |
0e5a7faa CR |
185 | if (!strcmp(argv[i], "--mixed")) { |
186 | reset_type = MIXED; | |
187 | i++; | |
188 | } | |
189 | else if (!strcmp(argv[i], "--soft")) { | |
190 | reset_type = SOFT; | |
191 | i++; | |
192 | } | |
193 | else if (!strcmp(argv[i], "--hard")) { | |
194 | reset_type = HARD; | |
195 | i++; | |
196 | } | |
521b53e5 GP |
197 | else if (!strcmp(argv[i], "-q")) { |
198 | quiet = 1; | |
199 | i++; | |
200 | } | |
201 | else | |
202 | break; | |
0e5a7faa CR |
203 | } |
204 | ||
205 | if (i < argc && argv[i][0] != '-') | |
206 | rev = argv[i++]; | |
207 | ||
208 | if (get_sha1(rev, sha1)) | |
209 | die("Failed to resolve '%s' as a valid ref.", rev); | |
210 | ||
211 | commit = lookup_commit_reference(sha1); | |
212 | if (!commit) | |
213 | die("Could not parse object '%s'.", rev); | |
214 | hashcpy(sha1, commit->object.sha1); | |
215 | ||
216 | if (i < argc && !strcmp(argv[i], "--")) | |
217 | i++; | |
218 | else if (i < argc && argv[i][0] == '-') | |
219 | usage(builtin_reset_usage); | |
220 | ||
221 | /* git reset tree [--] paths... can be used to | |
222 | * load chosen paths from the tree into the index without | |
223 | * affecting the working tree nor HEAD. */ | |
224 | if (i < argc) { | |
225 | if (reset_type == MIXED) | |
226 | warning("--mixed option is deprecated with paths."); | |
227 | else if (reset_type != NONE) | |
228 | die("Cannot do %s reset with paths.", | |
229 | reset_type_names[reset_type]); | |
620a6cd4 | 230 | return read_from_tree(prefix, argv + i, sha1); |
0e5a7faa CR |
231 | } |
232 | if (reset_type == NONE) | |
233 | reset_type = MIXED; /* by default */ | |
234 | ||
49b9362f JK |
235 | if (reset_type == HARD && is_bare_repository()) |
236 | die("hard reset makes no sense in a bare repository"); | |
237 | ||
0e5a7faa CR |
238 | /* Soft reset does not touch the index file nor the working tree |
239 | * at all, but requires them in a good order. Other resets reset | |
240 | * the index file to the tree object we are switching to. */ | |
241 | if (reset_type == SOFT) { | |
94a5728c | 242 | if (is_merge() || read_cache() < 0 || unmerged_cache()) |
0e5a7faa CR |
243 | die("Cannot do a soft reset in the middle of a merge."); |
244 | } | |
245 | else if (reset_index_file(sha1, (reset_type == HARD))) | |
246 | die("Could not reset index file to revision '%s'.", rev); | |
247 | ||
248 | /* Any resets update HEAD to the head being switched to, | |
249 | * saving the previous head in ORIG_HEAD before. */ | |
250 | if (!get_sha1("ORIG_HEAD", sha1_old_orig)) | |
251 | old_orig = sha1_old_orig; | |
252 | if (!get_sha1("HEAD", sha1_orig)) { | |
253 | orig = sha1_orig; | |
254 | prepend_reflog_action("updating ORIG_HEAD", msg, sizeof(msg)); | |
255 | update_ref(msg, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR); | |
256 | } | |
257 | else if (old_orig) | |
258 | delete_ref("ORIG_HEAD", old_orig); | |
259 | prepend_reflog_action("updating HEAD", msg, sizeof(msg)); | |
260 | update_ref_status = update_ref(msg, "HEAD", sha1, orig, 0, MSG_ON_ERR); | |
261 | ||
262 | switch (reset_type) { | |
263 | case HARD: | |
521b53e5 | 264 | if (!update_ref_status && !quiet) |
0e5a7faa CR |
265 | print_new_head_line(commit); |
266 | break; | |
267 | case SOFT: /* Nothing else to do. */ | |
268 | break; | |
269 | case MIXED: /* Report what has not been updated. */ | |
620a6cd4 | 270 | update_index_refresh(0, NULL); |
0e5a7faa CR |
271 | break; |
272 | } | |
273 | ||
c369e7b8 | 274 | remove_branch_state(); |
0e5a7faa CR |
275 | |
276 | free(reflog_action); | |
277 | ||
278 | return update_ref_status; | |
279 | } |