]>
Commit | Line | Data |
---|---|---|
99370863 | 1 | #define USE_THE_INDEX_VARIABLE |
8a0fc8d1 | 2 | #include "builtin.h" |
0b027f6c | 3 | #include "abspath.h" |
8a0fc8d1 | 4 | #include "config.h" |
32a8f510 | 5 | #include "environment.h" |
f394e093 | 6 | #include "gettext.h" |
df6e8744 | 7 | #include "hash.h" |
41771fa4 | 8 | #include "hex.h" |
dabab1d6 | 9 | #include "object-name.h" |
8a0fc8d1 JT |
10 | #include "parse-options.h" |
11 | #include "refs.h" | |
12 | #include "lockfile.h" | |
13 | #include "cache-tree.h" | |
14 | #include "unpack-trees.h" | |
15 | #include "merge-recursive.h" | |
874cf2a6 | 16 | #include "merge-ort-wrappers.h" |
dbbcd44f | 17 | #include "strvec.h" |
8a0fc8d1 JT |
18 | #include "run-command.h" |
19 | #include "dir.h" | |
c47679d0 | 20 | #include "entry.h" |
fbffdfb1 | 21 | #include "preload-index.h" |
08c46a49 | 22 | #include "read-cache.h" |
8a0fc8d1 | 23 | #include "rerere.h" |
dc7bd382 | 24 | #include "revision.h" |
e38da487 | 25 | #include "setup.h" |
baf889c2 | 26 | #include "sparse-index.h" |
dc7bd382 | 27 | #include "log-tree.h" |
d4788af8 | 28 | #include "diffcore.h" |
90a46272 | 29 | #include "exec-cmd.h" |
758b4d2b | 30 | #include "reflog.h" |
d21878f0 | 31 | #include "add-interactive.h" |
d4788af8 PSU |
32 | |
33 | #define INCLUDE_ALL_FILES 2 | |
8a0fc8d1 | 34 | |
951ec747 ÆAB |
35 | #define BUILTIN_STASH_LIST_USAGE \ |
36 | N_("git stash list [<log-options>]") | |
37 | #define BUILTIN_STASH_SHOW_USAGE \ | |
38 | N_("git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]") | |
39 | #define BUILTIN_STASH_DROP_USAGE \ | |
40 | N_("git stash drop [-q | --quiet] [<stash>]") | |
41 | #define BUILTIN_STASH_POP_USAGE \ | |
42 | N_("git stash pop [--index] [-q | --quiet] [<stash>]") | |
43 | #define BUILTIN_STASH_APPLY_USAGE \ | |
44 | N_("git stash apply [--index] [-q | --quiet] [<stash>]") | |
45 | #define BUILTIN_STASH_BRANCH_USAGE \ | |
46 | N_("git stash branch <branchname> [<stash>]") | |
47 | #define BUILTIN_STASH_STORE_USAGE \ | |
48 | N_("git stash store [(-m | --message) <message>] [-q | --quiet] <commit>") | |
49 | #define BUILTIN_STASH_PUSH_USAGE \ | |
50 | N_("git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n" \ | |
51 | " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n" \ | |
52 | " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" \ | |
53 | " [--] [<pathspec>...]]") | |
54 | #define BUILTIN_STASH_SAVE_USAGE \ | |
55 | N_("git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n" \ | |
56 | " [-u | --include-untracked] [-a | --all] [<message>]") | |
57 | #define BUILTIN_STASH_CREATE_USAGE \ | |
58 | N_("git stash create [<message>]") | |
59 | #define BUILTIN_STASH_CLEAR_USAGE \ | |
60 | "git stash clear" | |
61 | ||
40af1468 | 62 | static const char * const git_stash_usage[] = { |
951ec747 ÆAB |
63 | BUILTIN_STASH_LIST_USAGE, |
64 | BUILTIN_STASH_SHOW_USAGE, | |
65 | BUILTIN_STASH_DROP_USAGE, | |
66 | BUILTIN_STASH_POP_USAGE, | |
67 | BUILTIN_STASH_APPLY_USAGE, | |
68 | BUILTIN_STASH_BRANCH_USAGE, | |
69 | BUILTIN_STASH_PUSH_USAGE, | |
70 | BUILTIN_STASH_SAVE_USAGE, | |
71 | BUILTIN_STASH_CLEAR_USAGE, | |
72 | BUILTIN_STASH_CREATE_USAGE, | |
73 | BUILTIN_STASH_STORE_USAGE, | |
4e2dd393 JT |
74 | NULL |
75 | }; | |
76 | ||
40af1468 | 77 | static const char * const git_stash_list_usage[] = { |
951ec747 | 78 | BUILTIN_STASH_LIST_USAGE, |
130f2697 PSU |
79 | NULL |
80 | }; | |
81 | ||
40af1468 | 82 | static const char * const git_stash_show_usage[] = { |
951ec747 | 83 | BUILTIN_STASH_SHOW_USAGE, |
dc7bd382 PSU |
84 | NULL |
85 | }; | |
86 | ||
40af1468 | 87 | static const char * const git_stash_drop_usage[] = { |
951ec747 | 88 | BUILTIN_STASH_DROP_USAGE, |
8a0fc8d1 JT |
89 | NULL |
90 | }; | |
91 | ||
40af1468 | 92 | static const char * const git_stash_pop_usage[] = { |
951ec747 | 93 | BUILTIN_STASH_POP_USAGE, |
c4de61d7 JT |
94 | NULL |
95 | }; | |
96 | ||
40af1468 | 97 | static const char * const git_stash_apply_usage[] = { |
951ec747 | 98 | BUILTIN_STASH_APPLY_USAGE, |
8a0fc8d1 JT |
99 | NULL |
100 | }; | |
101 | ||
40af1468 | 102 | static const char * const git_stash_branch_usage[] = { |
951ec747 | 103 | BUILTIN_STASH_BRANCH_USAGE, |
577c1995 JT |
104 | NULL |
105 | }; | |
106 | ||
40af1468 | 107 | static const char * const git_stash_clear_usage[] = { |
951ec747 | 108 | BUILTIN_STASH_CLEAR_USAGE, |
4e2dd393 JT |
109 | NULL |
110 | }; | |
111 | ||
40af1468 | 112 | static const char * const git_stash_store_usage[] = { |
951ec747 | 113 | BUILTIN_STASH_STORE_USAGE, |
41e0dd55 PSU |
114 | NULL |
115 | }; | |
116 | ||
40af1468 | 117 | static const char * const git_stash_push_usage[] = { |
951ec747 | 118 | BUILTIN_STASH_PUSH_USAGE, |
d553f538 PSU |
119 | NULL |
120 | }; | |
121 | ||
40af1468 | 122 | static const char * const git_stash_save_usage[] = { |
951ec747 | 123 | BUILTIN_STASH_SAVE_USAGE, |
64fe9c26 PSU |
124 | NULL |
125 | }; | |
126 | ||
3e885f02 | 127 | static const char ref_stash[] = "refs/stash"; |
8a0fc8d1 JT |
128 | static struct strbuf stash_index_path = STRBUF_INIT; |
129 | ||
130 | /* | |
131 | * w_commit is set to the commit containing the working tree | |
132 | * b_commit is set to the base commit | |
133 | * i_commit is set to the commit containing the index tree | |
134 | * u_commit is set to the commit containing the untracked files tree | |
135 | * w_tree is set to the working tree | |
136 | * b_tree is set to the base tree | |
137 | * i_tree is set to the index tree | |
138 | * u_tree is set to the untracked files tree | |
139 | */ | |
140 | struct stash_info { | |
141 | struct object_id w_commit; | |
142 | struct object_id b_commit; | |
143 | struct object_id i_commit; | |
144 | struct object_id u_commit; | |
145 | struct object_id w_tree; | |
146 | struct object_id b_tree; | |
147 | struct object_id i_tree; | |
148 | struct object_id u_tree; | |
149 | struct strbuf revision; | |
150 | int is_stash_ref; | |
151 | int has_u; | |
152 | }; | |
153 | ||
5e480176 ÆAB |
154 | #define STASH_INFO_INIT { \ |
155 | .revision = STRBUF_INIT, \ | |
156 | } | |
157 | ||
8a0fc8d1 JT |
158 | static void free_stash_info(struct stash_info *info) |
159 | { | |
160 | strbuf_release(&info->revision); | |
161 | } | |
162 | ||
163 | static void assert_stash_like(struct stash_info *info, const char *revision) | |
164 | { | |
165 | if (get_oidf(&info->b_commit, "%s^1", revision) || | |
166 | get_oidf(&info->w_tree, "%s:", revision) || | |
167 | get_oidf(&info->b_tree, "%s^1:", revision) || | |
168 | get_oidf(&info->i_tree, "%s^2:", revision)) | |
169 | die(_("'%s' is not a stash-like commit"), revision); | |
170 | } | |
171 | ||
172 | static int get_stash_info(struct stash_info *info, int argc, const char **argv) | |
173 | { | |
174 | int ret; | |
175 | char *end_of_rev; | |
176 | char *expanded_ref; | |
177 | const char *revision; | |
178 | const char *commit = NULL; | |
179 | struct object_id dummy; | |
180 | struct strbuf symbolic = STRBUF_INIT; | |
181 | ||
182 | if (argc > 1) { | |
183 | int i; | |
184 | struct strbuf refs_msg = STRBUF_INIT; | |
185 | ||
186 | for (i = 0; i < argc; i++) | |
187 | strbuf_addf(&refs_msg, " '%s'", argv[i]); | |
188 | ||
189 | fprintf_ln(stderr, _("Too many revisions specified:%s"), | |
190 | refs_msg.buf); | |
191 | strbuf_release(&refs_msg); | |
192 | ||
193 | return -1; | |
194 | } | |
195 | ||
196 | if (argc == 1) | |
197 | commit = argv[0]; | |
198 | ||
8a0fc8d1 JT |
199 | if (!commit) { |
200 | if (!ref_exists(ref_stash)) { | |
8a0fc8d1 JT |
201 | fprintf_ln(stderr, _("No stash entries found.")); |
202 | return -1; | |
203 | } | |
204 | ||
205 | strbuf_addf(&info->revision, "%s@{0}", ref_stash); | |
206 | } else if (strspn(commit, "0123456789") == strlen(commit)) { | |
207 | strbuf_addf(&info->revision, "%s@{%s}", ref_stash, commit); | |
208 | } else { | |
209 | strbuf_addstr(&info->revision, commit); | |
210 | } | |
211 | ||
212 | revision = info->revision.buf; | |
213 | ||
d850b7a5 | 214 | if (repo_get_oid(the_repository, revision, &info->w_commit)) |
5e480176 | 215 | return error(_("%s is not a valid reference"), revision); |
8a0fc8d1 JT |
216 | |
217 | assert_stash_like(info, revision); | |
218 | ||
219 | info->has_u = !get_oidf(&info->u_tree, "%s^3:", revision); | |
220 | ||
221 | end_of_rev = strchrnul(revision, '@'); | |
222 | strbuf_add(&symbolic, revision, end_of_rev - revision); | |
223 | ||
12cb1c10 ÆAB |
224 | ret = repo_dwim_ref(the_repository, symbolic.buf, symbolic.len, |
225 | &dummy, &expanded_ref, 0); | |
8a0fc8d1 JT |
226 | strbuf_release(&symbolic); |
227 | switch (ret) { | |
228 | case 0: /* Not found, but valid ref */ | |
229 | info->is_stash_ref = 0; | |
230 | break; | |
231 | case 1: | |
232 | info->is_stash_ref = !strcmp(expanded_ref, ref_stash); | |
233 | break; | |
234 | default: /* Invalid or ambiguous */ | |
5e480176 | 235 | break; |
8a0fc8d1 JT |
236 | } |
237 | ||
238 | free(expanded_ref); | |
239 | return !(ret == 0 || ret == 1); | |
240 | } | |
241 | ||
4e2dd393 JT |
242 | static int do_clear_stash(void) |
243 | { | |
244 | struct object_id obj; | |
d850b7a5 | 245 | if (repo_get_oid(the_repository, ref_stash, &obj)) |
4e2dd393 JT |
246 | return 0; |
247 | ||
248 | return delete_ref(NULL, ref_stash, &obj, 0); | |
249 | } | |
250 | ||
251 | static int clear_stash(int argc, const char **argv, const char *prefix) | |
252 | { | |
253 | struct option options[] = { | |
254 | OPT_END() | |
255 | }; | |
256 | ||
257 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 258 | git_stash_clear_usage, |
4e2dd393 JT |
259 | PARSE_OPT_STOP_AT_NON_OPTION); |
260 | ||
261 | if (argc) | |
b8657347 | 262 | return error(_("git stash clear with arguments is " |
4e2dd393 JT |
263 | "unimplemented")); |
264 | ||
265 | return do_clear_stash(); | |
266 | } | |
267 | ||
8a0fc8d1 JT |
268 | static int reset_tree(struct object_id *i_tree, int update, int reset) |
269 | { | |
270 | int nr_trees = 1; | |
271 | struct unpack_trees_options opts; | |
272 | struct tree_desc t[MAX_UNPACK_TREES]; | |
273 | struct tree *tree; | |
274 | struct lock_file lock_file = LOCK_INIT; | |
275 | ||
07047d68 ÆAB |
276 | repo_read_index_preload(the_repository, NULL, 0); |
277 | if (refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL)) | |
8a0fc8d1 JT |
278 | return -1; |
279 | ||
07047d68 | 280 | repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR); |
8a0fc8d1 JT |
281 | |
282 | memset(&opts, 0, sizeof(opts)); | |
283 | ||
284 | tree = parse_tree_indirect(i_tree); | |
285 | if (parse_tree(tree)) | |
286 | return -1; | |
287 | ||
288 | init_tree_desc(t, tree->buffer, tree->size); | |
289 | ||
290 | opts.head_idx = 1; | |
291 | opts.src_index = &the_index; | |
292 | opts.dst_index = &the_index; | |
293 | opts.merge = 1; | |
480d3d6b | 294 | opts.reset = reset ? UNPACK_RESET_PROTECT_UNTRACKED : 0; |
8a0fc8d1 | 295 | opts.update = update; |
480d3d6b | 296 | if (update) |
1b5f3733 | 297 | opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */ |
8a0fc8d1 JT |
298 | opts.fn = oneway_merge; |
299 | ||
300 | if (unpack_trees(nr_trees, t, &opts)) | |
301 | return -1; | |
302 | ||
303 | if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) | |
304 | return error(_("unable to write new index file")); | |
305 | ||
306 | return 0; | |
307 | } | |
308 | ||
309 | static int diff_tree_binary(struct strbuf *out, struct object_id *w_commit) | |
310 | { | |
311 | struct child_process cp = CHILD_PROCESS_INIT; | |
312 | const char *w_commit_hex = oid_to_hex(w_commit); | |
313 | ||
314 | /* | |
315 | * Diff-tree would not be very hard to replace with a native function, | |
316 | * however it should be done together with apply_cached. | |
317 | */ | |
318 | cp.git_cmd = 1; | |
22f9b7f3 JK |
319 | strvec_pushl(&cp.args, "diff-tree", "--binary", NULL); |
320 | strvec_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex); | |
8a0fc8d1 JT |
321 | |
322 | return pipe_command(&cp, NULL, 0, out, 0, NULL, 0); | |
323 | } | |
324 | ||
325 | static int apply_cached(struct strbuf *out) | |
326 | { | |
327 | struct child_process cp = CHILD_PROCESS_INIT; | |
328 | ||
329 | /* | |
330 | * Apply currently only reads either from stdin or a file, thus | |
331 | * apply_all_patches would have to be updated to optionally take a | |
332 | * buffer. | |
333 | */ | |
334 | cp.git_cmd = 1; | |
22f9b7f3 | 335 | strvec_pushl(&cp.args, "apply", "--cached", NULL); |
8a0fc8d1 JT |
336 | return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0); |
337 | } | |
338 | ||
339 | static int reset_head(void) | |
340 | { | |
341 | struct child_process cp = CHILD_PROCESS_INIT; | |
342 | ||
343 | /* | |
344 | * Reset is overall quite simple, however there is no current public | |
345 | * API for resetting. | |
346 | */ | |
347 | cp.git_cmd = 1; | |
4b8b0f6f | 348 | strvec_pushl(&cp.args, "reset", "--quiet", "--refresh", NULL); |
8a0fc8d1 JT |
349 | |
350 | return run_command(&cp); | |
351 | } | |
352 | ||
3d40e372 EN |
353 | static int is_path_a_directory(const char *path) |
354 | { | |
355 | /* | |
356 | * This function differs from abspath.c:is_directory() in that | |
357 | * here we use lstat() instead of stat(); we do not want to | |
358 | * follow symbolic links here. | |
359 | */ | |
360 | struct stat st; | |
361 | return (!lstat(path, &st) && S_ISDIR(st.st_mode)); | |
362 | } | |
363 | ||
d4788af8 | 364 | static void add_diff_to_buf(struct diff_queue_struct *q, |
71006d77 | 365 | struct diff_options *options UNUSED, |
d4788af8 PSU |
366 | void *data) |
367 | { | |
368 | int i; | |
369 | ||
370 | for (i = 0; i < q->nr; i++) { | |
3d40e372 EN |
371 | if (is_path_a_directory(q->queue[i]->one->path)) |
372 | continue; | |
373 | ||
d4788af8 PSU |
374 | strbuf_addstr(data, q->queue[i]->one->path); |
375 | ||
376 | /* NUL-terminate: will be fed to update-index -z */ | |
377 | strbuf_addch(data, '\0'); | |
378 | } | |
379 | } | |
380 | ||
8a0fc8d1 JT |
381 | static int restore_untracked(struct object_id *u_tree) |
382 | { | |
383 | int res; | |
384 | struct child_process cp = CHILD_PROCESS_INIT; | |
385 | ||
386 | /* | |
387 | * We need to run restore files from a given index, but without | |
388 | * affecting the current index, so we use GIT_INDEX_FILE with | |
389 | * run_command to fork processes that will not interfere. | |
390 | */ | |
391 | cp.git_cmd = 1; | |
22f9b7f3 JK |
392 | strvec_push(&cp.args, "read-tree"); |
393 | strvec_push(&cp.args, oid_to_hex(u_tree)); | |
29fda24d | 394 | strvec_pushf(&cp.env, "GIT_INDEX_FILE=%s", |
f6d8942b | 395 | stash_index_path.buf); |
8a0fc8d1 JT |
396 | if (run_command(&cp)) { |
397 | remove_path(stash_index_path.buf); | |
398 | return -1; | |
399 | } | |
400 | ||
401 | child_process_init(&cp); | |
402 | cp.git_cmd = 1; | |
22f9b7f3 | 403 | strvec_pushl(&cp.args, "checkout-index", "--all", NULL); |
29fda24d | 404 | strvec_pushf(&cp.env, "GIT_INDEX_FILE=%s", |
f6d8942b | 405 | stash_index_path.buf); |
8a0fc8d1 JT |
406 | |
407 | res = run_command(&cp); | |
408 | remove_path(stash_index_path.buf); | |
409 | return res; | |
410 | } | |
411 | ||
b34ab4a4 EN |
412 | static void unstage_changes_unless_new(struct object_id *orig_tree) |
413 | { | |
414 | /* | |
415 | * When we enter this function, there has been a clean merge of | |
416 | * relevant trees, and the merge logic always stages whatever merges | |
417 | * cleanly. We want to unstage those changes, unless it corresponds | |
418 | * to a file that didn't exist as of orig_tree. | |
ba359fd5 EN |
419 | * |
420 | * However, if any SKIP_WORKTREE path is modified relative to | |
421 | * orig_tree, then we want to clear the SKIP_WORKTREE bit and write | |
422 | * it to the worktree before unstaging. | |
b34ab4a4 EN |
423 | */ |
424 | ||
ba359fd5 | 425 | struct checkout state = CHECKOUT_INIT; |
b34ab4a4 EN |
426 | struct diff_options diff_opts; |
427 | struct lock_file lock = LOCK_INIT; | |
428 | int i; | |
429 | ||
ba359fd5 EN |
430 | /* If any entries have skip_worktree set, we'll have to check 'em out */ |
431 | state.force = 1; | |
432 | state.quiet = 1; | |
433 | state.refresh_cache = 1; | |
434 | state.istate = &the_index; | |
435 | ||
b34ab4a4 EN |
436 | /* |
437 | * Step 1: get a difference between orig_tree (which corresponding | |
438 | * to the index before a merge was run) and the current index | |
439 | * (reflecting the changes brought in by the merge). | |
440 | */ | |
08539032 | 441 | repo_diff_setup(the_repository, &diff_opts); |
b34ab4a4 EN |
442 | diff_opts.flags.recursive = 1; |
443 | diff_opts.detect_rename = 0; | |
444 | diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
445 | diff_setup_done(&diff_opts); | |
446 | ||
447 | do_diff_cache(orig_tree, &diff_opts); | |
448 | diffcore_std(&diff_opts); | |
449 | ||
450 | /* Iterate over the paths that changed due to the merge... */ | |
451 | for (i = 0; i < diff_queued_diff.nr; i++) { | |
452 | struct diff_filepair *p; | |
453 | struct cache_entry *ce; | |
454 | int pos; | |
455 | ||
456 | /* Look up the path's position in the current index. */ | |
457 | p = diff_queued_diff.queue[i]; | |
458 | pos = index_name_pos(&the_index, p->two->path, | |
459 | strlen(p->two->path)); | |
460 | ||
461 | /* | |
ba359fd5 EN |
462 | * Step 2: Place changes in the working tree |
463 | * | |
464 | * Stash is about restoring changes *to the working tree*. | |
465 | * So if the merge successfully got a new version of some | |
466 | * path, but left it out of the working tree, then clear the | |
467 | * SKIP_WORKTREE bit and write it to the working tree. | |
468 | */ | |
dc594180 | 469 | if (pos >= 0 && ce_skip_worktree(the_index.cache[pos])) { |
ba359fd5 EN |
470 | struct stat st; |
471 | ||
dc594180 | 472 | ce = the_index.cache[pos]; |
ba359fd5 EN |
473 | if (!lstat(ce->name, &st)) { |
474 | /* Conflicting path present; relocate it */ | |
475 | struct strbuf new_path = STRBUF_INIT; | |
476 | int fd; | |
477 | ||
478 | strbuf_addf(&new_path, | |
479 | "%s.stash.XXXXXX", ce->name); | |
480 | fd = xmkstemp(new_path.buf); | |
481 | close(fd); | |
482 | printf(_("WARNING: Untracked file in way of " | |
483 | "tracked file! Renaming\n " | |
484 | " %s -> %s\n" | |
485 | " to make room.\n"), | |
486 | ce->name, new_path.buf); | |
487 | if (rename(ce->name, new_path.buf)) | |
488 | die("Failed to move %s to %s\n", | |
489 | ce->name, new_path.buf); | |
490 | strbuf_release(&new_path); | |
491 | } | |
492 | checkout_entry(ce, &state, NULL, NULL); | |
493 | ce->ce_flags &= ~CE_SKIP_WORKTREE; | |
494 | } | |
495 | ||
496 | /* | |
497 | * Step 3: "unstage" changes, as long as they are still tracked | |
b34ab4a4 EN |
498 | */ |
499 | if (p->one->oid_valid) { | |
500 | /* | |
501 | * Path existed in orig_tree; restore index entry | |
502 | * from that tree in order to "unstage" the changes. | |
503 | */ | |
504 | int option = ADD_CACHE_OK_TO_REPLACE; | |
505 | if (pos < 0) | |
506 | option = ADD_CACHE_OK_TO_ADD; | |
507 | ||
508 | ce = make_cache_entry(&the_index, | |
509 | p->one->mode, | |
510 | &p->one->oid, | |
511 | p->one->path, | |
512 | 0, 0); | |
513 | add_index_entry(&the_index, ce, option); | |
514 | } | |
515 | } | |
516 | diff_flush(&diff_opts); | |
517 | ||
518 | /* | |
ba359fd5 | 519 | * Step 4: write the new index to disk |
b34ab4a4 EN |
520 | */ |
521 | repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR); | |
522 | if (write_locked_index(&the_index, &lock, | |
523 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) | |
524 | die(_("Unable to write index.")); | |
525 | } | |
526 | ||
8a0fc8d1 JT |
527 | static int do_apply_stash(const char *prefix, struct stash_info *info, |
528 | int index, int quiet) | |
529 | { | |
874cf2a6 | 530 | int clean, ret; |
8a0fc8d1 JT |
531 | int has_index = index; |
532 | struct merge_options o; | |
533 | struct object_id c_tree; | |
534 | struct object_id index_tree; | |
874cf2a6 VD |
535 | struct tree *head, *merge, *merge_base; |
536 | struct lock_file lock = LOCK_INIT; | |
8a0fc8d1 | 537 | |
07047d68 ÆAB |
538 | repo_read_index_preload(the_repository, NULL, 0); |
539 | if (repo_refresh_and_write_index(the_repository, REFRESH_QUIET, 0, 0, | |
540 | NULL, NULL, NULL)) | |
8a0fc8d1 JT |
541 | return -1; |
542 | ||
99370863 ÆAB |
543 | if (write_index_as_tree(&c_tree, &the_index, get_index_file(), 0, |
544 | NULL)) | |
8a0fc8d1 JT |
545 | return error(_("cannot apply a stash in the middle of a merge")); |
546 | ||
547 | if (index) { | |
548 | if (oideq(&info->b_tree, &info->i_tree) || | |
549 | oideq(&c_tree, &info->i_tree)) { | |
550 | has_index = 0; | |
551 | } else { | |
552 | struct strbuf out = STRBUF_INIT; | |
553 | ||
554 | if (diff_tree_binary(&out, &info->w_commit)) { | |
555 | strbuf_release(&out); | |
556 | return error(_("could not generate diff %s^!."), | |
557 | oid_to_hex(&info->w_commit)); | |
558 | } | |
559 | ||
560 | ret = apply_cached(&out); | |
561 | strbuf_release(&out); | |
562 | if (ret) | |
eaf53415 | 563 | return error(_("conflicts in index. " |
8a0fc8d1 JT |
564 | "Try without --index.")); |
565 | ||
07047d68 ÆAB |
566 | discard_index(&the_index); |
567 | repo_read_index(the_repository); | |
99370863 ÆAB |
568 | if (write_index_as_tree(&index_tree, &the_index, |
569 | get_index_file(), 0, NULL)) | |
8a0fc8d1 JT |
570 | return error(_("could not save index tree")); |
571 | ||
572 | reset_head(); | |
07047d68 ÆAB |
573 | discard_index(&the_index); |
574 | repo_read_index(the_repository); | |
8a0fc8d1 JT |
575 | } |
576 | } | |
577 | ||
e36adf71 | 578 | init_merge_options(&o, the_repository); |
8a0fc8d1 JT |
579 | |
580 | o.branch1 = "Updated upstream"; | |
581 | o.branch2 = "Stashed changes"; | |
874cf2a6 | 582 | o.ancestor = "Stash base"; |
8a0fc8d1 JT |
583 | |
584 | if (oideq(&info->b_tree, &c_tree)) | |
585 | o.branch1 = "Version stash was based on"; | |
586 | ||
587 | if (quiet) | |
588 | o.verbosity = 0; | |
589 | ||
590 | if (o.verbosity >= 3) | |
591 | printf_ln(_("Merging %s with %s"), o.branch1, o.branch2); | |
592 | ||
874cf2a6 VD |
593 | head = lookup_tree(o.repo, &c_tree); |
594 | merge = lookup_tree(o.repo, &info->w_tree); | |
595 | merge_base = lookup_tree(o.repo, &info->b_tree); | |
596 | ||
597 | repo_hold_locked_index(o.repo, &lock, LOCK_DIE_ON_ERROR); | |
598 | clean = merge_ort_nonrecursive(&o, head, merge, merge_base); | |
599 | ||
600 | /* | |
601 | * If 'clean' >= 0, reverse the value for 'ret' so 'ret' is 0 when the | |
602 | * merge was clean, and nonzero if the merge was unclean or encountered | |
603 | * an error. | |
604 | */ | |
605 | ret = clean >= 0 ? !clean : clean; | |
606 | ||
607 | if (ret < 0) | |
608 | rollback_lock_file(&lock); | |
609 | else if (write_locked_index(o.repo->index, &lock, | |
610 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) | |
611 | ret = error(_("could not write index")); | |
8a0fc8d1 | 612 | |
8a0fc8d1 | 613 | if (ret) { |
b26a71b1 | 614 | repo_rerere(the_repository, 0); |
8a0fc8d1 JT |
615 | |
616 | if (index) | |
617 | fprintf_ln(stderr, _("Index was not unstashed.")); | |
618 | ||
71cade5a | 619 | goto restore_untracked; |
8a0fc8d1 JT |
620 | } |
621 | ||
622 | if (has_index) { | |
623 | if (reset_tree(&index_tree, 0, 0)) | |
71cade5a | 624 | ret = -1; |
8a0fc8d1 | 625 | } else { |
b34ab4a4 | 626 | unstage_changes_unless_new(&c_tree); |
8a0fc8d1 JT |
627 | } |
628 | ||
71cade5a | 629 | restore_untracked: |
bee8691f | 630 | if (info->has_u && restore_untracked(&info->u_tree)) |
71cade5a | 631 | ret = error(_("could not restore untracked files from stash")); |
bee8691f | 632 | |
df53c808 | 633 | if (!quiet) { |
8a0fc8d1 JT |
634 | struct child_process cp = CHILD_PROCESS_INIT; |
635 | ||
636 | /* | |
637 | * Status is quite simple and could be replaced with calls to | |
638 | * wt_status in the future, but it adds complexities which may | |
639 | * require more tests. | |
640 | */ | |
641 | cp.git_cmd = 1; | |
642 | cp.dir = prefix; | |
29fda24d | 643 | strvec_pushf(&cp.env, GIT_WORK_TREE_ENVIRONMENT"=%s", |
f6d8942b | 644 | absolute_path(get_git_work_tree())); |
29fda24d | 645 | strvec_pushf(&cp.env, GIT_DIR_ENVIRONMENT"=%s", |
f6d8942b | 646 | absolute_path(get_git_dir())); |
22f9b7f3 | 647 | strvec_push(&cp.args, "status"); |
8a0fc8d1 JT |
648 | run_command(&cp); |
649 | } | |
650 | ||
71cade5a | 651 | return ret; |
8a0fc8d1 JT |
652 | } |
653 | ||
654 | static int apply_stash(int argc, const char **argv, const char *prefix) | |
655 | { | |
5e480176 | 656 | int ret = -1; |
8a0fc8d1 JT |
657 | int quiet = 0; |
658 | int index = 0; | |
5e480176 | 659 | struct stash_info info = STASH_INFO_INIT; |
8a0fc8d1 JT |
660 | struct option options[] = { |
661 | OPT__QUIET(&quiet, N_("be quiet, only report errors")), | |
662 | OPT_BOOL(0, "index", &index, | |
663 | N_("attempt to recreate the index")), | |
664 | OPT_END() | |
665 | }; | |
666 | ||
667 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 668 | git_stash_apply_usage, 0); |
8a0fc8d1 JT |
669 | |
670 | if (get_stash_info(&info, argc, argv)) | |
5e480176 | 671 | goto cleanup; |
8a0fc8d1 JT |
672 | |
673 | ret = do_apply_stash(prefix, &info, index, quiet); | |
5e480176 | 674 | cleanup: |
8a0fc8d1 JT |
675 | free_stash_info(&info); |
676 | return ret; | |
677 | } | |
678 | ||
5cf88fd8 ÆAB |
679 | static int reject_reflog_ent(struct object_id *ooid UNUSED, |
680 | struct object_id *noid UNUSED, | |
681 | const char *email UNUSED, | |
682 | timestamp_t timestamp UNUSED, | |
683 | int tz UNUSED, const char *message UNUSED, | |
684 | void *cb_data UNUSED) | |
4f44c565 RS |
685 | { |
686 | return 1; | |
687 | } | |
688 | ||
689 | static int reflog_is_empty(const char *refname) | |
690 | { | |
691 | return !for_each_reflog_ent(refname, reject_reflog_ent, NULL); | |
692 | } | |
693 | ||
eabf7405 | 694 | static int do_drop_stash(struct stash_info *info, int quiet) |
4e2dd393 | 695 | { |
758b4d2b JC |
696 | if (!reflog_delete(info->revision.buf, |
697 | EXPIRE_REFLOGS_REWRITE | EXPIRE_REFLOGS_UPDATE_REF, | |
698 | 0)) { | |
4e2dd393 JT |
699 | if (!quiet) |
700 | printf_ln(_("Dropped %s (%s)"), info->revision.buf, | |
701 | oid_to_hex(&info->w_commit)); | |
702 | } else { | |
703 | return error(_("%s: Could not drop stash entry"), | |
704 | info->revision.buf); | |
705 | } | |
706 | ||
4f44c565 | 707 | if (reflog_is_empty(ref_stash)) |
4e2dd393 JT |
708 | do_clear_stash(); |
709 | ||
710 | return 0; | |
711 | } | |
712 | ||
5e480176 ÆAB |
713 | static int get_stash_info_assert(struct stash_info *info, int argc, |
714 | const char **argv) | |
4e2dd393 | 715 | { |
5e480176 ÆAB |
716 | int ret = get_stash_info(info, argc, argv); |
717 | ||
718 | if (ret < 0) | |
719 | return ret; | |
720 | ||
721 | if (!info->is_stash_ref) | |
722 | return error(_("'%s' is not a stash reference"), info->revision.buf); | |
723 | ||
724 | return 0; | |
4e2dd393 JT |
725 | } |
726 | ||
727 | static int drop_stash(int argc, const char **argv, const char *prefix) | |
728 | { | |
5e480176 | 729 | int ret = -1; |
4e2dd393 | 730 | int quiet = 0; |
5e480176 | 731 | struct stash_info info = STASH_INFO_INIT; |
4e2dd393 JT |
732 | struct option options[] = { |
733 | OPT__QUIET(&quiet, N_("be quiet, only report errors")), | |
734 | OPT_END() | |
735 | }; | |
736 | ||
737 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 738 | git_stash_drop_usage, 0); |
4e2dd393 | 739 | |
5e480176 ÆAB |
740 | if (get_stash_info_assert(&info, argc, argv)) |
741 | goto cleanup; | |
4e2dd393 | 742 | |
eabf7405 | 743 | ret = do_drop_stash(&info, quiet); |
5e480176 | 744 | cleanup: |
4e2dd393 JT |
745 | free_stash_info(&info); |
746 | return ret; | |
747 | } | |
748 | ||
c4de61d7 JT |
749 | static int pop_stash(int argc, const char **argv, const char *prefix) |
750 | { | |
5e480176 | 751 | int ret = -1; |
c4de61d7 JT |
752 | int index = 0; |
753 | int quiet = 0; | |
5e480176 | 754 | struct stash_info info = STASH_INFO_INIT; |
c4de61d7 JT |
755 | struct option options[] = { |
756 | OPT__QUIET(&quiet, N_("be quiet, only report errors")), | |
757 | OPT_BOOL(0, "index", &index, | |
758 | N_("attempt to recreate the index")), | |
759 | OPT_END() | |
760 | }; | |
761 | ||
762 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 763 | git_stash_pop_usage, 0); |
c4de61d7 | 764 | |
5e480176 ÆAB |
765 | if (get_stash_info_assert(&info, argc, argv)) |
766 | goto cleanup; | |
c4de61d7 | 767 | |
c4de61d7 JT |
768 | if ((ret = do_apply_stash(prefix, &info, index, quiet))) |
769 | printf_ln(_("The stash entry is kept in case " | |
770 | "you need it again.")); | |
771 | else | |
eabf7405 | 772 | ret = do_drop_stash(&info, quiet); |
c4de61d7 | 773 | |
5e480176 | 774 | cleanup: |
c4de61d7 JT |
775 | free_stash_info(&info); |
776 | return ret; | |
777 | } | |
778 | ||
577c1995 JT |
779 | static int branch_stash(int argc, const char **argv, const char *prefix) |
780 | { | |
5e480176 | 781 | int ret = -1; |
577c1995 | 782 | const char *branch = NULL; |
5e480176 | 783 | struct stash_info info = STASH_INFO_INIT; |
577c1995 JT |
784 | struct child_process cp = CHILD_PROCESS_INIT; |
785 | struct option options[] = { | |
786 | OPT_END() | |
787 | }; | |
788 | ||
789 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 790 | git_stash_branch_usage, 0); |
577c1995 JT |
791 | |
792 | if (!argc) { | |
793 | fprintf_ln(stderr, _("No branch name specified")); | |
794 | return -1; | |
795 | } | |
796 | ||
797 | branch = argv[0]; | |
798 | ||
799 | if (get_stash_info(&info, argc - 1, argv + 1)) | |
5e480176 | 800 | goto cleanup; |
577c1995 JT |
801 | |
802 | cp.git_cmd = 1; | |
22f9b7f3 JK |
803 | strvec_pushl(&cp.args, "checkout", "-b", NULL); |
804 | strvec_push(&cp.args, branch); | |
805 | strvec_push(&cp.args, oid_to_hex(&info.b_commit)); | |
577c1995 JT |
806 | ret = run_command(&cp); |
807 | if (!ret) | |
808 | ret = do_apply_stash(prefix, &info, 1, 0); | |
809 | if (!ret && info.is_stash_ref) | |
eabf7405 | 810 | ret = do_drop_stash(&info, 0); |
577c1995 | 811 | |
5e480176 | 812 | cleanup: |
577c1995 | 813 | free_stash_info(&info); |
577c1995 JT |
814 | return ret; |
815 | } | |
816 | ||
130f2697 PSU |
817 | static int list_stash(int argc, const char **argv, const char *prefix) |
818 | { | |
819 | struct child_process cp = CHILD_PROCESS_INIT; | |
820 | struct option options[] = { | |
821 | OPT_END() | |
822 | }; | |
823 | ||
824 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 825 | git_stash_list_usage, |
99d86d60 | 826 | PARSE_OPT_KEEP_UNKNOWN_OPT); |
130f2697 PSU |
827 | |
828 | if (!ref_exists(ref_stash)) | |
829 | return 0; | |
830 | ||
831 | cp.git_cmd = 1; | |
22f9b7f3 | 832 | strvec_pushl(&cp.args, "log", "--format=%gd: %gs", "-g", |
1e20a407 | 833 | "--first-parent", NULL); |
22f9b7f3 JK |
834 | strvec_pushv(&cp.args, argv); |
835 | strvec_push(&cp.args, ref_stash); | |
836 | strvec_push(&cp.args, "--"); | |
130f2697 PSU |
837 | return run_command(&cp); |
838 | } | |
839 | ||
dc7bd382 PSU |
840 | static int show_stat = 1; |
841 | static int show_patch; | |
0af760e2 | 842 | static int show_include_untracked; |
dc7bd382 | 843 | |
a4e7e317 GC |
844 | static int git_stash_config(const char *var, const char *value, |
845 | const struct config_context *ctx, void *cb) | |
dc7bd382 PSU |
846 | { |
847 | if (!strcmp(var, "stash.showstat")) { | |
848 | show_stat = git_config_bool(var, value); | |
849 | return 0; | |
850 | } | |
851 | if (!strcmp(var, "stash.showpatch")) { | |
852 | show_patch = git_config_bool(var, value); | |
853 | return 0; | |
854 | } | |
0af760e2 DL |
855 | if (!strcmp(var, "stash.showincludeuntracked")) { |
856 | show_include_untracked = git_config_bool(var, value); | |
857 | return 0; | |
858 | } | |
a4e7e317 | 859 | return git_diff_basic_config(var, value, ctx, cb); |
dc7bd382 PSU |
860 | } |
861 | ||
d3c7bf73 DL |
862 | static void diff_include_untracked(const struct stash_info *info, struct diff_options *diff_opt) |
863 | { | |
864 | const struct object_id *oid[] = { &info->w_commit, &info->u_tree }; | |
865 | struct tree *tree[ARRAY_SIZE(oid)]; | |
866 | struct tree_desc tree_desc[ARRAY_SIZE(oid)]; | |
867 | struct unpack_trees_options unpack_tree_opt = { 0 }; | |
868 | int i; | |
869 | ||
870 | for (i = 0; i < ARRAY_SIZE(oid); i++) { | |
871 | tree[i] = parse_tree_indirect(oid[i]); | |
872 | if (parse_tree(tree[i]) < 0) | |
873 | die(_("failed to parse tree")); | |
874 | init_tree_desc(&tree_desc[i], tree[i]->buffer, tree[i]->size); | |
875 | } | |
876 | ||
877 | unpack_tree_opt.head_idx = -1; | |
878 | unpack_tree_opt.src_index = &the_index; | |
879 | unpack_tree_opt.dst_index = &the_index; | |
880 | unpack_tree_opt.merge = 1; | |
881 | unpack_tree_opt.fn = stash_worktree_untracked_merge; | |
882 | ||
883 | if (unpack_trees(ARRAY_SIZE(tree_desc), tree_desc, &unpack_tree_opt)) | |
884 | die(_("failed to unpack trees")); | |
885 | ||
886 | do_diff_cache(&info->b_commit, diff_opt); | |
887 | } | |
888 | ||
dc7bd382 PSU |
889 | static int show_stash(int argc, const char **argv, const char *prefix) |
890 | { | |
891 | int i; | |
5e480176 ÆAB |
892 | int ret = -1; |
893 | struct stash_info info = STASH_INFO_INIT; | |
dc7bd382 | 894 | struct rev_info rev; |
22f9b7f3 JK |
895 | struct strvec stash_args = STRVEC_INIT; |
896 | struct strvec revision_args = STRVEC_INIT; | |
d3c7bf73 DL |
897 | enum { |
898 | UNTRACKED_NONE, | |
899 | UNTRACKED_INCLUDE, | |
900 | UNTRACKED_ONLY | |
af5cd44b | 901 | } show_untracked = show_include_untracked ? UNTRACKED_INCLUDE : UNTRACKED_NONE; |
dc7bd382 | 902 | struct option options[] = { |
d3c7bf73 DL |
903 | OPT_SET_INT('u', "include-untracked", &show_untracked, |
904 | N_("include untracked files in the stash"), | |
905 | UNTRACKED_INCLUDE), | |
906 | OPT_SET_INT_F(0, "only-untracked", &show_untracked, | |
907 | N_("only show untracked files in the stash"), | |
908 | UNTRACKED_ONLY, PARSE_OPT_NONEG), | |
dc7bd382 PSU |
909 | OPT_END() |
910 | }; | |
5e480176 | 911 | int do_usage = 0; |
dc7bd382 PSU |
912 | |
913 | init_diff_ui_defaults(); | |
914 | git_config(git_diff_ui_config, NULL); | |
035c7de9 | 915 | repo_init_revisions(the_repository, &rev, prefix); |
dc7bd382 | 916 | |
d3c7bf73 | 917 | argc = parse_options(argc, argv, prefix, options, git_stash_show_usage, |
99d86d60 | 918 | PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN_OPT | |
d3c7bf73 DL |
919 | PARSE_OPT_KEEP_DASHDASH); |
920 | ||
22f9b7f3 | 921 | strvec_push(&revision_args, argv[0]); |
dc7bd382 PSU |
922 | for (i = 1; i < argc; i++) { |
923 | if (argv[i][0] != '-') | |
22f9b7f3 | 924 | strvec_push(&stash_args, argv[i]); |
dc7bd382 | 925 | else |
22f9b7f3 | 926 | strvec_push(&revision_args, argv[i]); |
dc7bd382 PSU |
927 | } |
928 | ||
5e480176 ÆAB |
929 | if (get_stash_info(&info, stash_args.nr, stash_args.v)) |
930 | goto cleanup; | |
dc7bd382 PSU |
931 | |
932 | /* | |
933 | * The config settings are applied only if there are not passed | |
934 | * any options. | |
935 | */ | |
d70a9eb6 | 936 | if (revision_args.nr == 1) { |
dc7bd382 PSU |
937 | if (show_stat) |
938 | rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT; | |
939 | ||
940 | if (show_patch) | |
941 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; | |
942 | ||
943 | if (!show_stat && !show_patch) { | |
5e480176 ÆAB |
944 | ret = 0; |
945 | goto cleanup; | |
dc7bd382 PSU |
946 | } |
947 | } | |
948 | ||
d70a9eb6 | 949 | argc = setup_revisions(revision_args.nr, revision_args.v, &rev, NULL); |
5e480176 ÆAB |
950 | if (argc > 1) |
951 | goto usage; | |
8e407bc8 TG |
952 | if (!rev.diffopt.output_format) { |
953 | rev.diffopt.output_format = DIFF_FORMAT_PATCH; | |
954 | diff_setup_done(&rev.diffopt); | |
955 | } | |
dc7bd382 PSU |
956 | |
957 | rev.diffopt.flags.recursive = 1; | |
958 | setup_diff_pager(&rev.diffopt); | |
d3c7bf73 DL |
959 | switch (show_untracked) { |
960 | case UNTRACKED_NONE: | |
961 | diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt); | |
962 | break; | |
963 | case UNTRACKED_ONLY: | |
1ff595d2 DL |
964 | if (info.has_u) |
965 | diff_root_tree_oid(&info.u_tree, "", &rev.diffopt); | |
d3c7bf73 DL |
966 | break; |
967 | case UNTRACKED_INCLUDE: | |
1ff595d2 DL |
968 | if (info.has_u) |
969 | diff_include_untracked(&info, &rev.diffopt); | |
970 | else | |
971 | diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt); | |
d3c7bf73 DL |
972 | break; |
973 | } | |
dc7bd382 PSU |
974 | log_tree_diff_flush(&rev); |
975 | ||
5cc6b2d7 | 976 | ret = diff_result_code(&rev.diffopt); |
5e480176 ÆAB |
977 | cleanup: |
978 | strvec_clear(&stash_args); | |
dc7bd382 | 979 | free_stash_info(&info); |
0139c58a | 980 | release_revisions(&rev); |
5e480176 ÆAB |
981 | if (do_usage) |
982 | usage_with_options(git_stash_show_usage, options); | |
983 | return ret; | |
984 | usage: | |
985 | do_usage = 1; | |
986 | goto cleanup; | |
dc7bd382 PSU |
987 | } |
988 | ||
41e0dd55 PSU |
989 | static int do_store_stash(const struct object_id *w_commit, const char *stash_msg, |
990 | int quiet) | |
991 | { | |
d9b66345 JH |
992 | struct stash_info info; |
993 | char revision[GIT_MAX_HEXSZ]; | |
994 | ||
995 | oid_to_hex_r(revision, w_commit); | |
996 | assert_stash_like(&info, revision); | |
997 | ||
41e0dd55 PSU |
998 | if (!stash_msg) |
999 | stash_msg = "Created via \"git stash store\"."; | |
1000 | ||
1001 | if (update_ref(stash_msg, ref_stash, w_commit, NULL, | |
1002 | REF_FORCE_CREATE_REFLOG, | |
1003 | quiet ? UPDATE_REFS_QUIET_ON_ERR : | |
1004 | UPDATE_REFS_MSG_ON_ERR)) { | |
1005 | if (!quiet) { | |
1006 | fprintf_ln(stderr, _("Cannot update %s with %s"), | |
1007 | ref_stash, oid_to_hex(w_commit)); | |
1008 | } | |
1009 | return -1; | |
1010 | } | |
1011 | ||
1012 | return 0; | |
1013 | } | |
1014 | ||
1015 | static int store_stash(int argc, const char **argv, const char *prefix) | |
1016 | { | |
1017 | int quiet = 0; | |
1018 | const char *stash_msg = NULL; | |
1019 | struct object_id obj; | |
1020 | struct object_context dummy; | |
1021 | struct option options[] = { | |
1022 | OPT__QUIET(&quiet, N_("be quiet")), | |
1023 | OPT_STRING('m', "message", &stash_msg, "message", | |
1024 | N_("stash message")), | |
1025 | OPT_END() | |
1026 | }; | |
1027 | ||
1028 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 1029 | git_stash_store_usage, |
99d86d60 | 1030 | PARSE_OPT_KEEP_UNKNOWN_OPT); |
41e0dd55 PSU |
1031 | |
1032 | if (argc != 1) { | |
1033 | if (!quiet) | |
1034 | fprintf_ln(stderr, _("\"git stash store\" requires one " | |
1035 | "<commit> argument")); | |
1036 | return -1; | |
1037 | } | |
1038 | ||
e36adf71 JH |
1039 | if (get_oid_with_context(the_repository, |
1040 | argv[0], quiet ? GET_OID_QUIETLY : 0, &obj, | |
41e0dd55 PSU |
1041 | &dummy)) { |
1042 | if (!quiet) | |
1043 | fprintf_ln(stderr, _("Cannot update %s with %s"), | |
1044 | ref_stash, argv[0]); | |
1045 | return -1; | |
1046 | } | |
1047 | ||
1048 | return do_store_stash(&obj, stash_msg, quiet); | |
1049 | } | |
1050 | ||
22f9b7f3 | 1051 | static void add_pathspecs(struct strvec *args, |
7db9302d | 1052 | const struct pathspec *ps) { |
d4788af8 PSU |
1053 | int i; |
1054 | ||
7db9302d | 1055 | for (i = 0; i < ps->nr; i++) |
22f9b7f3 | 1056 | strvec_push(args, ps->items[i].original); |
d4788af8 PSU |
1057 | } |
1058 | ||
1059 | /* | |
1060 | * `untracked_files` will be filled with the names of untracked files. | |
1061 | * The return value is: | |
1062 | * | |
1063 | * = 0 if there are not any untracked files | |
1064 | * > 0 if there are untracked files | |
1065 | */ | |
7db9302d | 1066 | static int get_untracked_files(const struct pathspec *ps, int include_untracked, |
d4788af8 PSU |
1067 | struct strbuf *untracked_files) |
1068 | { | |
1069 | int i; | |
d4788af8 | 1070 | int found = 0; |
ce93a4c6 | 1071 | struct dir_struct dir = DIR_INIT; |
d4788af8 | 1072 | |
d4788af8 PSU |
1073 | if (include_untracked != INCLUDE_ALL_FILES) |
1074 | setup_standard_excludes(&dir); | |
1075 | ||
95c11ecc | 1076 | fill_directory(&dir, the_repository->index, ps); |
d4788af8 PSU |
1077 | for (i = 0; i < dir.nr; i++) { |
1078 | struct dir_entry *ent = dir.entries[i]; | |
95c11ecc EN |
1079 | found++; |
1080 | strbuf_addstr(untracked_files, ent->name); | |
1081 | /* NUL-terminate: will be fed to update-index -z */ | |
1082 | strbuf_addch(untracked_files, '\0'); | |
d4788af8 PSU |
1083 | } |
1084 | ||
eceba532 | 1085 | dir_clear(&dir); |
d4788af8 PSU |
1086 | return found; |
1087 | } | |
1088 | ||
1089 | /* | |
ef0f0b45 | 1090 | * The return value of `check_changes_tracked_files()` can be: |
d4788af8 PSU |
1091 | * |
1092 | * < 0 if there was an error | |
1093 | * = 0 if there are no changes. | |
1094 | * > 0 if there are changes. | |
1095 | */ | |
7db9302d | 1096 | static int check_changes_tracked_files(const struct pathspec *ps) |
d4788af8 | 1097 | { |
d4788af8 PSU |
1098 | struct rev_info rev; |
1099 | struct object_id dummy; | |
7db9302d | 1100 | int ret = 0; |
d4788af8 PSU |
1101 | |
1102 | /* No initial commit. */ | |
d850b7a5 | 1103 | if (repo_get_oid(the_repository, "HEAD", &dummy)) |
d4788af8 PSU |
1104 | return -1; |
1105 | ||
07047d68 | 1106 | if (repo_read_index(the_repository) < 0) |
d4788af8 PSU |
1107 | return -1; |
1108 | ||
035c7de9 | 1109 | repo_init_revisions(the_repository, &rev, NULL); |
7db9302d | 1110 | copy_pathspec(&rev.prune_data, ps); |
d4788af8 PSU |
1111 | |
1112 | rev.diffopt.flags.quick = 1; | |
1113 | rev.diffopt.flags.ignore_submodules = 1; | |
1114 | rev.abbrev = 0; | |
1115 | ||
1116 | add_head_to_pending(&rev); | |
1117 | diff_setup_done(&rev.diffopt); | |
1118 | ||
25bd3acd | 1119 | run_diff_index(&rev, DIFF_INDEX_CACHED); |
5cc6b2d7 | 1120 | if (diff_result_code(&rev.diffopt)) { |
7db9302d TG |
1121 | ret = 1; |
1122 | goto done; | |
1123 | } | |
d4788af8 | 1124 | |
25bd3acd | 1125 | run_diff_files(&rev, 0); |
5cc6b2d7 | 1126 | if (diff_result_code(&rev.diffopt)) { |
7db9302d TG |
1127 | ret = 1; |
1128 | goto done; | |
1129 | } | |
d4788af8 | 1130 | |
7db9302d | 1131 | done: |
1878b5ed | 1132 | release_revisions(&rev); |
7db9302d | 1133 | return ret; |
ef0f0b45 PSU |
1134 | } |
1135 | ||
1136 | /* | |
1137 | * The function will fill `untracked_files` with the names of untracked files | |
1138 | * It will return 1 if there were any changes and 0 if there were not. | |
1139 | */ | |
7db9302d | 1140 | static int check_changes(const struct pathspec *ps, int include_untracked, |
ef0f0b45 PSU |
1141 | struct strbuf *untracked_files) |
1142 | { | |
1143 | int ret = 0; | |
1144 | if (check_changes_tracked_files(ps)) | |
1145 | ret = 1; | |
1146 | ||
d4788af8 | 1147 | if (include_untracked && get_untracked_files(ps, include_untracked, |
ef0f0b45 PSU |
1148 | untracked_files)) |
1149 | ret = 1; | |
d4788af8 | 1150 | |
ef0f0b45 | 1151 | return ret; |
d4788af8 PSU |
1152 | } |
1153 | ||
1154 | static int save_untracked_files(struct stash_info *info, struct strbuf *msg, | |
1155 | struct strbuf files) | |
1156 | { | |
1157 | int ret = 0; | |
1158 | struct strbuf untracked_msg = STRBUF_INIT; | |
d4788af8 | 1159 | struct child_process cp_upd_index = CHILD_PROCESS_INIT; |
6269f8ea | 1160 | struct index_state istate = INDEX_STATE_INIT(the_repository); |
d4788af8 PSU |
1161 | |
1162 | cp_upd_index.git_cmd = 1; | |
22f9b7f3 | 1163 | strvec_pushl(&cp_upd_index.args, "update-index", "-z", "--add", |
f6d8942b | 1164 | "--remove", "--stdin", NULL); |
29fda24d | 1165 | strvec_pushf(&cp_upd_index.env, "GIT_INDEX_FILE=%s", |
d4788af8 PSU |
1166 | stash_index_path.buf); |
1167 | ||
1168 | strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf); | |
1169 | if (pipe_command(&cp_upd_index, files.buf, files.len, NULL, 0, | |
1170 | NULL, 0)) { | |
1171 | ret = -1; | |
1172 | goto done; | |
1173 | } | |
1174 | ||
48ee24ab PSU |
1175 | if (write_index_as_tree(&info->u_tree, &istate, stash_index_path.buf, 0, |
1176 | NULL)) { | |
d4788af8 PSU |
1177 | ret = -1; |
1178 | goto done; | |
1179 | } | |
d4788af8 PSU |
1180 | |
1181 | if (commit_tree(untracked_msg.buf, untracked_msg.len, | |
1182 | &info->u_tree, NULL, &info->u_commit, NULL, NULL)) { | |
1183 | ret = -1; | |
1184 | goto done; | |
1185 | } | |
1186 | ||
1187 | done: | |
2f6b1eb7 | 1188 | release_index(&istate); |
d4788af8 | 1189 | strbuf_release(&untracked_msg); |
d4788af8 PSU |
1190 | remove_path(stash_index_path.buf); |
1191 | return ret; | |
1192 | } | |
1193 | ||
a8a6e068 SO |
1194 | static int stash_staged(struct stash_info *info, struct strbuf *out_patch, |
1195 | int quiet) | |
41a28eb6 SO |
1196 | { |
1197 | int ret = 0; | |
1198 | struct child_process cp_diff_tree = CHILD_PROCESS_INIT; | |
6269f8ea | 1199 | struct index_state istate = INDEX_STATE_INIT(the_repository); |
41a28eb6 SO |
1200 | |
1201 | if (write_index_as_tree(&info->w_tree, &istate, the_repository->index_file, | |
1202 | 0, NULL)) { | |
1203 | ret = -1; | |
1204 | goto done; | |
1205 | } | |
1206 | ||
1207 | cp_diff_tree.git_cmd = 1; | |
1208 | strvec_pushl(&cp_diff_tree.args, "diff-tree", "-p", "-U1", "HEAD", | |
1209 | oid_to_hex(&info->w_tree), "--", NULL); | |
1210 | if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) { | |
1211 | ret = -1; | |
1212 | goto done; | |
1213 | } | |
1214 | ||
1215 | if (!out_patch->len) { | |
1216 | if (!quiet) | |
1217 | fprintf_ln(stderr, _("No staged changes")); | |
1218 | ret = 1; | |
1219 | } | |
1220 | ||
1221 | done: | |
2f6b1eb7 | 1222 | release_index(&istate); |
41a28eb6 SO |
1223 | return ret; |
1224 | } | |
1225 | ||
7db9302d | 1226 | static int stash_patch(struct stash_info *info, const struct pathspec *ps, |
1ac528c0 | 1227 | struct strbuf *out_patch, int quiet) |
d4788af8 PSU |
1228 | { |
1229 | int ret = 0; | |
d4788af8 | 1230 | struct child_process cp_read_tree = CHILD_PROCESS_INIT; |
d4788af8 | 1231 | struct child_process cp_diff_tree = CHILD_PROCESS_INIT; |
6269f8ea | 1232 | struct index_state istate = INDEX_STATE_INIT(the_repository); |
6610e462 | 1233 | char *old_index_env = NULL, *old_repo_index_file; |
d4788af8 PSU |
1234 | |
1235 | remove_path(stash_index_path.buf); | |
1236 | ||
1237 | cp_read_tree.git_cmd = 1; | |
22f9b7f3 | 1238 | strvec_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL); |
29fda24d | 1239 | strvec_pushf(&cp_read_tree.env, "GIT_INDEX_FILE=%s", |
f6d8942b | 1240 | stash_index_path.buf); |
d4788af8 PSU |
1241 | if (run_command(&cp_read_tree)) { |
1242 | ret = -1; | |
1243 | goto done; | |
1244 | } | |
1245 | ||
1246 | /* Find out what the user wants. */ | |
6610e462 JS |
1247 | old_repo_index_file = the_repository->index_file; |
1248 | the_repository->index_file = stash_index_path.buf; | |
1249 | old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT)); | |
1250 | setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1); | |
1251 | ||
d21878f0 | 1252 | ret = !!run_add_p(the_repository, ADD_P_STASH, NULL, ps); |
6610e462 JS |
1253 | |
1254 | the_repository->index_file = old_repo_index_file; | |
1255 | if (old_index_env && *old_index_env) | |
1256 | setenv(INDEX_ENVIRONMENT, old_index_env, 1); | |
1257 | else | |
1258 | unsetenv(INDEX_ENVIRONMENT); | |
1259 | FREE_AND_NULL(old_index_env); | |
d4788af8 PSU |
1260 | |
1261 | /* State of the working tree. */ | |
48ee24ab PSU |
1262 | if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0, |
1263 | NULL)) { | |
d4788af8 PSU |
1264 | ret = -1; |
1265 | goto done; | |
1266 | } | |
1267 | ||
d4788af8 | 1268 | cp_diff_tree.git_cmd = 1; |
22f9b7f3 | 1269 | strvec_pushl(&cp_diff_tree.args, "diff-tree", "-p", "-U1", "HEAD", |
f6d8942b | 1270 | oid_to_hex(&info->w_tree), "--", NULL); |
d4788af8 PSU |
1271 | if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) { |
1272 | ret = -1; | |
1273 | goto done; | |
1274 | } | |
1275 | ||
1276 | if (!out_patch->len) { | |
1ac528c0 PSU |
1277 | if (!quiet) |
1278 | fprintf_ln(stderr, _("No changes selected")); | |
d4788af8 PSU |
1279 | ret = 1; |
1280 | } | |
1281 | ||
1282 | done: | |
2f6b1eb7 | 1283 | release_index(&istate); |
d4788af8 PSU |
1284 | remove_path(stash_index_path.buf); |
1285 | return ret; | |
1286 | } | |
1287 | ||
7db9302d | 1288 | static int stash_working_tree(struct stash_info *info, const struct pathspec *ps) |
d4788af8 PSU |
1289 | { |
1290 | int ret = 0; | |
1291 | struct rev_info rev; | |
1292 | struct child_process cp_upd_index = CHILD_PROCESS_INIT; | |
d4788af8 | 1293 | struct strbuf diff_output = STRBUF_INIT; |
6269f8ea | 1294 | struct index_state istate = INDEX_STATE_INIT(the_repository); |
d4788af8 | 1295 | |
035c7de9 | 1296 | repo_init_revisions(the_repository, &rev, NULL); |
7db9302d | 1297 | copy_pathspec(&rev.prune_data, ps); |
d4788af8 PSU |
1298 | |
1299 | set_alternate_index_output(stash_index_path.buf); | |
1300 | if (reset_tree(&info->i_tree, 0, 0)) { | |
1301 | ret = -1; | |
1302 | goto done; | |
1303 | } | |
1304 | set_alternate_index_output(NULL); | |
1305 | ||
d4788af8 PSU |
1306 | rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; |
1307 | rev.diffopt.format_callback = add_diff_to_buf; | |
1308 | rev.diffopt.format_callback_data = &diff_output; | |
1309 | ||
07047d68 | 1310 | if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0) { |
d4788af8 PSU |
1311 | ret = -1; |
1312 | goto done; | |
1313 | } | |
1314 | ||
1315 | add_pending_object(&rev, parse_object(the_repository, &info->b_commit), | |
1316 | ""); | |
25bd3acd | 1317 | run_diff_index(&rev, 0); |
d4788af8 PSU |
1318 | |
1319 | cp_upd_index.git_cmd = 1; | |
22f9b7f3 | 1320 | strvec_pushl(&cp_upd_index.args, "update-index", |
f6d8942b JK |
1321 | "--ignore-skip-worktree-entries", |
1322 | "-z", "--add", "--remove", "--stdin", NULL); | |
29fda24d | 1323 | strvec_pushf(&cp_upd_index.env, "GIT_INDEX_FILE=%s", |
f6d8942b | 1324 | stash_index_path.buf); |
d4788af8 PSU |
1325 | |
1326 | if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len, | |
1327 | NULL, 0, NULL, 0)) { | |
1328 | ret = -1; | |
1329 | goto done; | |
1330 | } | |
1331 | ||
48ee24ab PSU |
1332 | if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0, |
1333 | NULL)) { | |
d4788af8 PSU |
1334 | ret = -1; |
1335 | goto done; | |
1336 | } | |
1337 | ||
d4788af8 | 1338 | done: |
2f6b1eb7 | 1339 | release_index(&istate); |
1878b5ed | 1340 | release_revisions(&rev); |
d4788af8 PSU |
1341 | strbuf_release(&diff_output); |
1342 | remove_path(stash_index_path.buf); | |
1343 | return ret; | |
1344 | } | |
1345 | ||
7db9302d | 1346 | static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf, |
41a28eb6 | 1347 | int include_untracked, int patch_mode, int only_staged, |
1ac528c0 PSU |
1348 | struct stash_info *info, struct strbuf *patch, |
1349 | int quiet) | |
d4788af8 PSU |
1350 | { |
1351 | int ret = 0; | |
1352 | int flags = 0; | |
1353 | int untracked_commit_option = 0; | |
1354 | const char *head_short_sha1 = NULL; | |
1355 | const char *branch_ref = NULL; | |
1356 | const char *branch_name = "(no branch)"; | |
1357 | struct commit *head_commit = NULL; | |
1358 | struct commit_list *parents = NULL; | |
1359 | struct strbuf msg = STRBUF_INIT; | |
1360 | struct strbuf commit_tree_label = STRBUF_INIT; | |
1361 | struct strbuf untracked_files = STRBUF_INIT; | |
d4788af8 PSU |
1362 | |
1363 | prepare_fallback_ident("git stash", "git@stash"); | |
1364 | ||
07047d68 ÆAB |
1365 | repo_read_index_preload(the_repository, NULL, 0); |
1366 | if (repo_refresh_and_write_index(the_repository, REFRESH_QUIET, 0, 0, | |
1367 | NULL, NULL, NULL) < 0) { | |
34933d0e TG |
1368 | ret = -1; |
1369 | goto done; | |
1370 | } | |
d4788af8 | 1371 | |
d850b7a5 | 1372 | if (repo_get_oid(the_repository, "HEAD", &info->b_commit)) { |
1ac528c0 PSU |
1373 | if (!quiet) |
1374 | fprintf_ln(stderr, _("You do not have " | |
1375 | "the initial commit yet")); | |
d4788af8 PSU |
1376 | ret = -1; |
1377 | goto done; | |
1378 | } else { | |
1379 | head_commit = lookup_commit(the_repository, &info->b_commit); | |
1380 | } | |
1381 | ||
ef0f0b45 | 1382 | if (!check_changes(ps, include_untracked, &untracked_files)) { |
d4788af8 PSU |
1383 | ret = 1; |
1384 | goto done; | |
1385 | } | |
1386 | ||
1387 | branch_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flags); | |
1388 | if (flags & REF_ISSYMREF) | |
ceaf037f | 1389 | skip_prefix(branch_ref, "refs/heads/", &branch_name); |
d850b7a5 ÆAB |
1390 | head_short_sha1 = repo_find_unique_abbrev(the_repository, |
1391 | &head_commit->object.oid, | |
1392 | DEFAULT_ABBREV); | |
d4788af8 PSU |
1393 | strbuf_addf(&msg, "%s: %s ", branch_name, head_short_sha1); |
1394 | pp_commit_easy(CMIT_FMT_ONELINE, head_commit, &msg); | |
1395 | ||
1396 | strbuf_addf(&commit_tree_label, "index on %s\n", msg.buf); | |
1397 | commit_list_insert(head_commit, &parents); | |
99370863 ÆAB |
1398 | if (write_index_as_tree(&info->i_tree, &the_index, get_index_file(), 0, |
1399 | NULL) || | |
d4788af8 PSU |
1400 | commit_tree(commit_tree_label.buf, commit_tree_label.len, |
1401 | &info->i_tree, parents, &info->i_commit, NULL, NULL)) { | |
1ac528c0 PSU |
1402 | if (!quiet) |
1403 | fprintf_ln(stderr, _("Cannot save the current " | |
1404 | "index state")); | |
d4788af8 PSU |
1405 | ret = -1; |
1406 | goto done; | |
1407 | } | |
1408 | ||
ef0f0b45 | 1409 | if (include_untracked) { |
d4788af8 | 1410 | if (save_untracked_files(info, &msg, untracked_files)) { |
1ac528c0 PSU |
1411 | if (!quiet) |
1412 | fprintf_ln(stderr, _("Cannot save " | |
1413 | "the untracked files")); | |
d4788af8 PSU |
1414 | ret = -1; |
1415 | goto done; | |
1416 | } | |
1417 | untracked_commit_option = 1; | |
1418 | } | |
1419 | if (patch_mode) { | |
1ac528c0 | 1420 | ret = stash_patch(info, ps, patch, quiet); |
d4788af8 | 1421 | if (ret < 0) { |
1ac528c0 PSU |
1422 | if (!quiet) |
1423 | fprintf_ln(stderr, _("Cannot save the current " | |
1424 | "worktree state")); | |
d4788af8 PSU |
1425 | goto done; |
1426 | } else if (ret > 0) { | |
1427 | goto done; | |
1428 | } | |
41a28eb6 | 1429 | } else if (only_staged) { |
a8a6e068 | 1430 | ret = stash_staged(info, patch, quiet); |
41a28eb6 SO |
1431 | if (ret < 0) { |
1432 | if (!quiet) | |
1433 | fprintf_ln(stderr, _("Cannot save the current " | |
1434 | "staged state")); | |
1435 | goto done; | |
1436 | } else if (ret > 0) { | |
1437 | goto done; | |
1438 | } | |
d4788af8 PSU |
1439 | } else { |
1440 | if (stash_working_tree(info, ps)) { | |
1ac528c0 PSU |
1441 | if (!quiet) |
1442 | fprintf_ln(stderr, _("Cannot save the current " | |
1443 | "worktree state")); | |
d4788af8 PSU |
1444 | ret = -1; |
1445 | goto done; | |
1446 | } | |
1447 | } | |
1448 | ||
1449 | if (!stash_msg_buf->len) | |
1450 | strbuf_addf(stash_msg_buf, "WIP on %s", msg.buf); | |
1451 | else | |
1452 | strbuf_insertf(stash_msg_buf, 0, "On %s: ", branch_name); | |
1453 | ||
1454 | /* | |
1455 | * `parents` will be empty after calling `commit_tree()`, so there is | |
1456 | * no need to call `free_commit_list()` | |
1457 | */ | |
1458 | parents = NULL; | |
1459 | if (untracked_commit_option) | |
1460 | commit_list_insert(lookup_commit(the_repository, | |
1461 | &info->u_commit), | |
1462 | &parents); | |
1463 | commit_list_insert(lookup_commit(the_repository, &info->i_commit), | |
1464 | &parents); | |
1465 | commit_list_insert(head_commit, &parents); | |
1466 | ||
1467 | if (commit_tree(stash_msg_buf->buf, stash_msg_buf->len, &info->w_tree, | |
1468 | parents, &info->w_commit, NULL, NULL)) { | |
1ac528c0 PSU |
1469 | if (!quiet) |
1470 | fprintf_ln(stderr, _("Cannot record " | |
1471 | "working tree state")); | |
d4788af8 PSU |
1472 | ret = -1; |
1473 | goto done; | |
1474 | } | |
1475 | ||
1476 | done: | |
1477 | strbuf_release(&commit_tree_label); | |
1478 | strbuf_release(&msg); | |
1479 | strbuf_release(&untracked_files); | |
1480 | return ret; | |
1481 | } | |
1482 | ||
5247b762 | 1483 | static int create_stash(int argc, const char **argv, const char *prefix UNUSED) |
d4788af8 | 1484 | { |
5e480176 | 1485 | int ret; |
d4788af8 | 1486 | struct strbuf stash_msg_buf = STRBUF_INIT; |
5e480176 | 1487 | struct stash_info info = STASH_INFO_INIT; |
d4788af8 | 1488 | struct pathspec ps; |
d4788af8 | 1489 | |
40af1468 PSU |
1490 | /* Starting with argv[1], since argv[0] is "create" */ |
1491 | strbuf_join_argv(&stash_msg_buf, argc - 1, ++argv, ' '); | |
d4788af8 PSU |
1492 | |
1493 | memset(&ps, 0, sizeof(ps)); | |
7db9302d | 1494 | if (!check_changes_tracked_files(&ps)) |
ef0f0b45 PSU |
1495 | return 0; |
1496 | ||
41a28eb6 | 1497 | ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, 0, &info, |
1ac528c0 | 1498 | NULL, 0); |
d4788af8 PSU |
1499 | if (!ret) |
1500 | printf_ln("%s", oid_to_hex(&info.w_commit)); | |
1501 | ||
5e480176 | 1502 | free_stash_info(&info); |
d4788af8 | 1503 | strbuf_release(&stash_msg_buf); |
ef0f0b45 | 1504 | return ret; |
d4788af8 PSU |
1505 | } |
1506 | ||
7db9302d | 1507 | static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet, |
41a28eb6 | 1508 | int keep_index, int patch_mode, int include_untracked, int only_staged) |
d553f538 PSU |
1509 | { |
1510 | int ret = 0; | |
5e480176 | 1511 | struct stash_info info = STASH_INFO_INIT; |
d553f538 PSU |
1512 | struct strbuf patch = STRBUF_INIT; |
1513 | struct strbuf stash_msg_buf = STRBUF_INIT; | |
ef0f0b45 | 1514 | struct strbuf untracked_files = STRBUF_INIT; |
d553f538 PSU |
1515 | |
1516 | if (patch_mode && keep_index == -1) | |
1517 | keep_index = 1; | |
1518 | ||
1519 | if (patch_mode && include_untracked) { | |
1520 | fprintf_ln(stderr, _("Can't use --patch and --include-untracked" | |
1521 | " or --all at the same time")); | |
1522 | ret = -1; | |
1523 | goto done; | |
1524 | } | |
1525 | ||
41a28eb6 SO |
1526 | /* --patch overrides --staged */ |
1527 | if (patch_mode) | |
1528 | only_staged = 0; | |
1529 | ||
1530 | if (only_staged && include_untracked) { | |
1531 | fprintf_ln(stderr, _("Can't use --staged and --include-untracked" | |
1532 | " or --all at the same time")); | |
1533 | ret = -1; | |
1534 | goto done; | |
1535 | } | |
1536 | ||
07047d68 | 1537 | repo_read_index_preload(the_repository, NULL, 0); |
7db9302d | 1538 | if (!include_untracked && ps->nr) { |
d553f538 | 1539 | int i; |
7db9302d | 1540 | char *ps_matched = xcalloc(ps->nr, 1); |
d553f538 | 1541 | |
a0291201 DS |
1542 | /* TODO: audit for interaction with sparse-index. */ |
1543 | ensure_full_index(&the_index); | |
dc594180 ÆAB |
1544 | for (i = 0; i < the_index.cache_nr; i++) |
1545 | ce_path_match(&the_index, the_index.cache[i], ps, | |
d553f538 PSU |
1546 | ps_matched); |
1547 | ||
42844973 | 1548 | if (report_path_error(ps_matched, ps)) { |
d553f538 PSU |
1549 | fprintf_ln(stderr, _("Did you forget to 'git add'?")); |
1550 | ret = -1; | |
1551 | free(ps_matched); | |
1552 | goto done; | |
1553 | } | |
1554 | free(ps_matched); | |
1555 | } | |
1556 | ||
07047d68 ÆAB |
1557 | if (repo_refresh_and_write_index(the_repository, REFRESH_QUIET, 0, 0, |
1558 | NULL, NULL, NULL)) { | |
d553f538 PSU |
1559 | ret = -1; |
1560 | goto done; | |
1561 | } | |
1562 | ||
ef0f0b45 | 1563 | if (!check_changes(ps, include_untracked, &untracked_files)) { |
d553f538 PSU |
1564 | if (!quiet) |
1565 | printf_ln(_("No local changes to save")); | |
1566 | goto done; | |
1567 | } | |
1568 | ||
1569 | if (!reflog_exists(ref_stash) && do_clear_stash()) { | |
1570 | ret = -1; | |
1ac528c0 PSU |
1571 | if (!quiet) |
1572 | fprintf_ln(stderr, _("Cannot initialize stash")); | |
d553f538 PSU |
1573 | goto done; |
1574 | } | |
1575 | ||
1576 | if (stash_msg) | |
1577 | strbuf_addstr(&stash_msg_buf, stash_msg); | |
41a28eb6 | 1578 | if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode, only_staged, |
1ac528c0 | 1579 | &info, &patch, quiet)) { |
d553f538 PSU |
1580 | ret = -1; |
1581 | goto done; | |
1582 | } | |
1583 | ||
1584 | if (do_store_stash(&info.w_commit, stash_msg_buf.buf, 1)) { | |
1585 | ret = -1; | |
1ac528c0 PSU |
1586 | if (!quiet) |
1587 | fprintf_ln(stderr, _("Cannot save the current status")); | |
d553f538 PSU |
1588 | goto done; |
1589 | } | |
1590 | ||
1ac528c0 PSU |
1591 | if (!quiet) |
1592 | printf_ln(_("Saved working directory and index state %s"), | |
1593 | stash_msg_buf.buf); | |
d553f538 | 1594 | |
41a28eb6 | 1595 | if (!(patch_mode || only_staged)) { |
7db9302d | 1596 | if (include_untracked && !ps->nr) { |
d553f538 PSU |
1597 | struct child_process cp = CHILD_PROCESS_INIT; |
1598 | ||
1599 | cp.git_cmd = 1; | |
ff5b7913 | 1600 | if (startup_info->original_cwd) { |
0fce211c | 1601 | cp.dir = startup_info->original_cwd; |
29fda24d | 1602 | strvec_pushf(&cp.env, "%s=%s", |
ff5b7913 EN |
1603 | GIT_WORK_TREE_ENVIRONMENT, |
1604 | the_repository->worktree); | |
1605 | } | |
22f9b7f3 | 1606 | strvec_pushl(&cp.args, "clean", "--force", |
0fce211c | 1607 | "--quiet", "-d", ":/", NULL); |
d553f538 | 1608 | if (include_untracked == INCLUDE_ALL_FILES) |
22f9b7f3 | 1609 | strvec_push(&cp.args, "-x"); |
d553f538 PSU |
1610 | if (run_command(&cp)) { |
1611 | ret = -1; | |
1612 | goto done; | |
1613 | } | |
1614 | } | |
07047d68 | 1615 | discard_index(&the_index); |
7db9302d | 1616 | if (ps->nr) { |
d553f538 PSU |
1617 | struct child_process cp_add = CHILD_PROCESS_INIT; |
1618 | struct child_process cp_diff = CHILD_PROCESS_INIT; | |
1619 | struct child_process cp_apply = CHILD_PROCESS_INIT; | |
1620 | struct strbuf out = STRBUF_INIT; | |
1621 | ||
1622 | cp_add.git_cmd = 1; | |
22f9b7f3 | 1623 | strvec_push(&cp_add.args, "add"); |
d553f538 | 1624 | if (!include_untracked) |
22f9b7f3 | 1625 | strvec_push(&cp_add.args, "-u"); |
d553f538 | 1626 | if (include_untracked == INCLUDE_ALL_FILES) |
22f9b7f3 JK |
1627 | strvec_push(&cp_add.args, "--force"); |
1628 | strvec_push(&cp_add.args, "--"); | |
d553f538 PSU |
1629 | add_pathspecs(&cp_add.args, ps); |
1630 | if (run_command(&cp_add)) { | |
1631 | ret = -1; | |
1632 | goto done; | |
1633 | } | |
1634 | ||
1635 | cp_diff.git_cmd = 1; | |
22f9b7f3 | 1636 | strvec_pushl(&cp_diff.args, "diff-index", "-p", |
f6d8942b JK |
1637 | "--cached", "--binary", "HEAD", "--", |
1638 | NULL); | |
d553f538 PSU |
1639 | add_pathspecs(&cp_diff.args, ps); |
1640 | if (pipe_command(&cp_diff, NULL, 0, &out, 0, NULL, 0)) { | |
1641 | ret = -1; | |
1642 | goto done; | |
1643 | } | |
1644 | ||
1645 | cp_apply.git_cmd = 1; | |
22f9b7f3 | 1646 | strvec_pushl(&cp_apply.args, "apply", "--index", |
f6d8942b | 1647 | "-R", NULL); |
d553f538 PSU |
1648 | if (pipe_command(&cp_apply, out.buf, out.len, NULL, 0, |
1649 | NULL, 0)) { | |
1650 | ret = -1; | |
1651 | goto done; | |
1652 | } | |
1653 | } else { | |
1654 | struct child_process cp = CHILD_PROCESS_INIT; | |
1655 | cp.git_cmd = 1; | |
94b7f156 | 1656 | /* BUG: this nukes untracked files in the way */ |
22f9b7f3 | 1657 | strvec_pushl(&cp.args, "reset", "--hard", "-q", |
f6d8942b | 1658 | "--no-recurse-submodules", NULL); |
d553f538 PSU |
1659 | if (run_command(&cp)) { |
1660 | ret = -1; | |
1661 | goto done; | |
1662 | } | |
1663 | } | |
1664 | ||
1665 | if (keep_index == 1 && !is_null_oid(&info.i_tree)) { | |
b932f6a5 | 1666 | struct child_process cp = CHILD_PROCESS_INIT; |
d553f538 | 1667 | |
b932f6a5 | 1668 | cp.git_cmd = 1; |
22f9b7f3 | 1669 | strvec_pushl(&cp.args, "checkout", "--no-overlay", |
f6d8942b | 1670 | oid_to_hex(&info.i_tree), "--", NULL); |
b932f6a5 | 1671 | if (!ps->nr) |
22f9b7f3 | 1672 | strvec_push(&cp.args, ":/"); |
b932f6a5 TG |
1673 | else |
1674 | add_pathspecs(&cp.args, ps); | |
1675 | if (run_command(&cp)) { | |
d553f538 PSU |
1676 | ret = -1; |
1677 | goto done; | |
1678 | } | |
1679 | } | |
1680 | goto done; | |
1681 | } else { | |
1682 | struct child_process cp = CHILD_PROCESS_INIT; | |
1683 | ||
1684 | cp.git_cmd = 1; | |
22f9b7f3 | 1685 | strvec_pushl(&cp.args, "apply", "-R", NULL); |
d553f538 PSU |
1686 | |
1687 | if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) { | |
1ac528c0 PSU |
1688 | if (!quiet) |
1689 | fprintf_ln(stderr, _("Cannot remove " | |
1690 | "worktree changes")); | |
d553f538 PSU |
1691 | ret = -1; |
1692 | goto done; | |
1693 | } | |
1694 | ||
1695 | if (keep_index < 1) { | |
1696 | struct child_process cp = CHILD_PROCESS_INIT; | |
1697 | ||
1698 | cp.git_cmd = 1; | |
4b8b0f6f VD |
1699 | strvec_pushl(&cp.args, "reset", "-q", "--refresh", "--", |
1700 | NULL); | |
d553f538 PSU |
1701 | add_pathspecs(&cp.args, ps); |
1702 | if (run_command(&cp)) { | |
1703 | ret = -1; | |
1704 | goto done; | |
1705 | } | |
1706 | } | |
1707 | goto done; | |
1708 | } | |
1709 | ||
1710 | done: | |
b6046abc | 1711 | strbuf_release(&patch); |
5e480176 | 1712 | free_stash_info(&info); |
d553f538 | 1713 | strbuf_release(&stash_msg_buf); |
b6046abc | 1714 | strbuf_release(&untracked_files); |
d553f538 PSU |
1715 | return ret; |
1716 | } | |
1717 | ||
8c3713ce AM |
1718 | static int push_stash(int argc, const char **argv, const char *prefix, |
1719 | int push_assumed) | |
d553f538 | 1720 | { |
8c3713ce | 1721 | int force_assume = 0; |
d553f538 | 1722 | int keep_index = -1; |
41a28eb6 | 1723 | int only_staged = 0; |
d553f538 PSU |
1724 | int patch_mode = 0; |
1725 | int include_untracked = 0; | |
1726 | int quiet = 0; | |
8a98758a | 1727 | int pathspec_file_nul = 0; |
d553f538 | 1728 | const char *stash_msg = NULL; |
8a98758a | 1729 | const char *pathspec_from_file = NULL; |
d553f538 PSU |
1730 | struct pathspec ps; |
1731 | struct option options[] = { | |
1732 | OPT_BOOL('k', "keep-index", &keep_index, | |
1733 | N_("keep index")), | |
41a28eb6 SO |
1734 | OPT_BOOL('S', "staged", &only_staged, |
1735 | N_("stash staged changes only")), | |
d553f538 PSU |
1736 | OPT_BOOL('p', "patch", &patch_mode, |
1737 | N_("stash in patch mode")), | |
1738 | OPT__QUIET(&quiet, N_("quiet mode")), | |
1739 | OPT_BOOL('u', "include-untracked", &include_untracked, | |
1740 | N_("include untracked files in stash")), | |
1741 | OPT_SET_INT('a', "all", &include_untracked, | |
1742 | N_("include ignore files"), 2), | |
1743 | OPT_STRING('m', "message", &stash_msg, N_("message"), | |
1744 | N_("stash message")), | |
8a98758a AM |
1745 | OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), |
1746 | OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), | |
d553f538 PSU |
1747 | OPT_END() |
1748 | }; | |
7615cf94 | 1749 | int ret; |
d553f538 | 1750 | |
8c3713ce AM |
1751 | if (argc) { |
1752 | force_assume = !strcmp(argv[0], "-p"); | |
40af1468 | 1753 | argc = parse_options(argc, argv, prefix, options, |
ca7990ce | 1754 | push_assumed ? git_stash_usage : |
40af1468 | 1755 | git_stash_push_usage, |
8c3713ce AM |
1756 | PARSE_OPT_KEEP_DASHDASH); |
1757 | } | |
1758 | ||
1759 | if (argc) { | |
1760 | if (!strcmp(argv[0], "--")) { | |
1761 | argc--; | |
1762 | argv++; | |
1763 | } else if (push_assumed && !force_assume) { | |
1764 | die("subcommand wasn't specified; 'push' can't be assumed due to unexpected token '%s'", | |
1765 | argv[0]); | |
1766 | } | |
1767 | } | |
d553f538 | 1768 | |
1366c78c JS |
1769 | parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN, |
1770 | prefix, argv); | |
8a98758a AM |
1771 | |
1772 | if (pathspec_from_file) { | |
1773 | if (patch_mode) | |
12909b6b | 1774 | die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch"); |
8a98758a | 1775 | |
41a28eb6 | 1776 | if (only_staged) |
12909b6b | 1777 | die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--staged"); |
41a28eb6 | 1778 | |
8a98758a | 1779 | if (ps.nr) |
246cac85 | 1780 | die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file"); |
8a98758a AM |
1781 | |
1782 | parse_pathspec_file(&ps, 0, | |
1783 | PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN, | |
1784 | prefix, pathspec_from_file, pathspec_file_nul); | |
1785 | } else if (pathspec_file_nul) { | |
6fa00ee8 | 1786 | die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file"); |
8a98758a AM |
1787 | } |
1788 | ||
7615cf94 ÆAB |
1789 | ret = do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode, |
1790 | include_untracked, only_staged); | |
1791 | clear_pathspec(&ps); | |
1792 | return ret; | |
d553f538 PSU |
1793 | } |
1794 | ||
2b057d97 SG |
1795 | static int push_stash_unassumed(int argc, const char **argv, const char *prefix) |
1796 | { | |
1797 | return push_stash(argc, argv, prefix, 0); | |
1798 | } | |
1799 | ||
64fe9c26 PSU |
1800 | static int save_stash(int argc, const char **argv, const char *prefix) |
1801 | { | |
1802 | int keep_index = -1; | |
41a28eb6 | 1803 | int only_staged = 0; |
64fe9c26 PSU |
1804 | int patch_mode = 0; |
1805 | int include_untracked = 0; | |
1806 | int quiet = 0; | |
1807 | int ret = 0; | |
1808 | const char *stash_msg = NULL; | |
1809 | struct pathspec ps; | |
1810 | struct strbuf stash_msg_buf = STRBUF_INIT; | |
1811 | struct option options[] = { | |
1812 | OPT_BOOL('k', "keep-index", &keep_index, | |
1813 | N_("keep index")), | |
41a28eb6 SO |
1814 | OPT_BOOL('S', "staged", &only_staged, |
1815 | N_("stash staged changes only")), | |
64fe9c26 PSU |
1816 | OPT_BOOL('p', "patch", &patch_mode, |
1817 | N_("stash in patch mode")), | |
1818 | OPT__QUIET(&quiet, N_("quiet mode")), | |
1819 | OPT_BOOL('u', "include-untracked", &include_untracked, | |
1820 | N_("include untracked files in stash")), | |
1821 | OPT_SET_INT('a', "all", &include_untracked, | |
1822 | N_("include ignore files"), 2), | |
1823 | OPT_STRING('m', "message", &stash_msg, "message", | |
1824 | N_("stash message")), | |
1825 | OPT_END() | |
1826 | }; | |
1827 | ||
1828 | argc = parse_options(argc, argv, prefix, options, | |
40af1468 | 1829 | git_stash_save_usage, |
64fe9c26 PSU |
1830 | PARSE_OPT_KEEP_DASHDASH); |
1831 | ||
1832 | if (argc) | |
1833 | stash_msg = strbuf_join_argv(&stash_msg_buf, argc, argv, ' '); | |
1834 | ||
1835 | memset(&ps, 0, sizeof(ps)); | |
7db9302d | 1836 | ret = do_push_stash(&ps, stash_msg, quiet, keep_index, |
41a28eb6 | 1837 | patch_mode, include_untracked, only_staged); |
64fe9c26 PSU |
1838 | |
1839 | strbuf_release(&stash_msg_buf); | |
1840 | return ret; | |
1841 | } | |
1842 | ||
40af1468 | 1843 | int cmd_stash(int argc, const char **argv, const char *prefix) |
8a0fc8d1 JT |
1844 | { |
1845 | pid_t pid = getpid(); | |
1846 | const char *index_file; | |
22f9b7f3 | 1847 | struct strvec args = STRVEC_INIT; |
2b057d97 | 1848 | parse_opt_subcommand_fn *fn = NULL; |
8a0fc8d1 | 1849 | struct option options[] = { |
2b057d97 SG |
1850 | OPT_SUBCOMMAND("apply", &fn, apply_stash), |
1851 | OPT_SUBCOMMAND("clear", &fn, clear_stash), | |
1852 | OPT_SUBCOMMAND("drop", &fn, drop_stash), | |
1853 | OPT_SUBCOMMAND("pop", &fn, pop_stash), | |
1854 | OPT_SUBCOMMAND("branch", &fn, branch_stash), | |
1855 | OPT_SUBCOMMAND("list", &fn, list_stash), | |
1856 | OPT_SUBCOMMAND("show", &fn, show_stash), | |
1857 | OPT_SUBCOMMAND("store", &fn, store_stash), | |
1858 | OPT_SUBCOMMAND("create", &fn, create_stash), | |
1859 | OPT_SUBCOMMAND("push", &fn, push_stash_unassumed), | |
1860 | OPT_SUBCOMMAND_F("save", &fn, save_stash, PARSE_OPT_NOCOMPLETE), | |
8a0fc8d1 JT |
1861 | OPT_END() |
1862 | }; | |
1863 | ||
b0c7362d | 1864 | git_config(git_stash_config, NULL); |
90a46272 | 1865 | |
40af1468 | 1866 | argc = parse_options(argc, argv, prefix, options, git_stash_usage, |
2b057d97 SG |
1867 | PARSE_OPT_SUBCOMMAND_OPTIONAL | |
1868 | PARSE_OPT_KEEP_UNKNOWN_OPT | | |
1869 | PARSE_OPT_KEEP_DASHDASH); | |
8a0fc8d1 | 1870 | |
3a58792a VD |
1871 | prepare_repo_settings(the_repository); |
1872 | the_repository->settings.command_requires_full_index = 0; | |
1873 | ||
8a0fc8d1 JT |
1874 | index_file = get_index_file(); |
1875 | strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file, | |
1876 | (uintmax_t)pid); | |
1877 | ||
2b057d97 SG |
1878 | if (fn) |
1879 | return !!fn(argc, argv, prefix); | |
1880 | else if (!argc) | |
1881 | return !!push_stash_unassumed(0, NULL, prefix); | |
40af1468 | 1882 | |
8c3713ce | 1883 | /* Assume 'stash push' */ |
22f9b7f3 JK |
1884 | strvec_push(&args, "push"); |
1885 | strvec_pushv(&args, argv); | |
d70a9eb6 | 1886 | return !!push_stash(args.nr, args.v, prefix, 1); |
8a0fc8d1 | 1887 | } |