Merge branch 'ps/stash-in-c'
[git/git.git] / builtin / stash.c
1 #define USE_THE_INDEX_COMPATIBILITY_MACROS
2 #include "builtin.h"
3 #include "config.h"
4 #include "parse-options.h"
5 #include "refs.h"
6 #include "lockfile.h"
7 #include "cache-tree.h"
8 #include "unpack-trees.h"
9 #include "merge-recursive.h"
10 #include "argv-array.h"
11 #include "run-command.h"
12 #include "dir.h"
13 #include "rerere.h"
14 #include "revision.h"
15 #include "log-tree.h"
16 #include "diffcore.h"
17 #include "exec-cmd.h"
18
19 #define INCLUDE_ALL_FILES 2
20
21 static const char * const git_stash_usage[] = {
22 N_("git stash list [<options>]"),
23 N_("git stash show [<options>] [<stash>]"),
24 N_("git stash drop [-q|--quiet] [<stash>]"),
25 N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
26 N_("git stash branch <branchname> [<stash>]"),
27 N_("git stash clear"),
28 N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
29 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
30 " [--] [<pathspec>...]]"),
31 N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
32 " [-u|--include-untracked] [-a|--all] [<message>]"),
33 NULL
34 };
35
36 static const char * const git_stash_list_usage[] = {
37 N_("git stash list [<options>]"),
38 NULL
39 };
40
41 static const char * const git_stash_show_usage[] = {
42 N_("git stash show [<options>] [<stash>]"),
43 NULL
44 };
45
46 static const char * const git_stash_drop_usage[] = {
47 N_("git stash drop [-q|--quiet] [<stash>]"),
48 NULL
49 };
50
51 static const char * const git_stash_pop_usage[] = {
52 N_("git stash pop [--index] [-q|--quiet] [<stash>]"),
53 NULL
54 };
55
56 static const char * const git_stash_apply_usage[] = {
57 N_("git stash apply [--index] [-q|--quiet] [<stash>]"),
58 NULL
59 };
60
61 static const char * const git_stash_branch_usage[] = {
62 N_("git stash branch <branchname> [<stash>]"),
63 NULL
64 };
65
66 static const char * const git_stash_clear_usage[] = {
67 N_("git stash clear"),
68 NULL
69 };
70
71 static const char * const git_stash_store_usage[] = {
72 N_("git stash store [-m|--message <message>] [-q|--quiet] <commit>"),
73 NULL
74 };
75
76 static const char * const git_stash_push_usage[] = {
77 N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
78 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
79 " [--] [<pathspec>...]]"),
80 NULL
81 };
82
83 static const char * const git_stash_save_usage[] = {
84 N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
85 " [-u|--include-untracked] [-a|--all] [<message>]"),
86 NULL
87 };
88
89 static const char *ref_stash = "refs/stash";
90 static struct strbuf stash_index_path = STRBUF_INIT;
91
92 /*
93 * w_commit is set to the commit containing the working tree
94 * b_commit is set to the base commit
95 * i_commit is set to the commit containing the index tree
96 * u_commit is set to the commit containing the untracked files tree
97 * w_tree is set to the working tree
98 * b_tree is set to the base tree
99 * i_tree is set to the index tree
100 * u_tree is set to the untracked files tree
101 */
102 struct stash_info {
103 struct object_id w_commit;
104 struct object_id b_commit;
105 struct object_id i_commit;
106 struct object_id u_commit;
107 struct object_id w_tree;
108 struct object_id b_tree;
109 struct object_id i_tree;
110 struct object_id u_tree;
111 struct strbuf revision;
112 int is_stash_ref;
113 int has_u;
114 };
115
116 static void free_stash_info(struct stash_info *info)
117 {
118 strbuf_release(&info->revision);
119 }
120
121 static void assert_stash_like(struct stash_info *info, const char *revision)
122 {
123 if (get_oidf(&info->b_commit, "%s^1", revision) ||
124 get_oidf(&info->w_tree, "%s:", revision) ||
125 get_oidf(&info->b_tree, "%s^1:", revision) ||
126 get_oidf(&info->i_tree, "%s^2:", revision))
127 die(_("'%s' is not a stash-like commit"), revision);
128 }
129
130 static int get_stash_info(struct stash_info *info, int argc, const char **argv)
131 {
132 int ret;
133 char *end_of_rev;
134 char *expanded_ref;
135 const char *revision;
136 const char *commit = NULL;
137 struct object_id dummy;
138 struct strbuf symbolic = STRBUF_INIT;
139
140 if (argc > 1) {
141 int i;
142 struct strbuf refs_msg = STRBUF_INIT;
143
144 for (i = 0; i < argc; i++)
145 strbuf_addf(&refs_msg, " '%s'", argv[i]);
146
147 fprintf_ln(stderr, _("Too many revisions specified:%s"),
148 refs_msg.buf);
149 strbuf_release(&refs_msg);
150
151 return -1;
152 }
153
154 if (argc == 1)
155 commit = argv[0];
156
157 strbuf_init(&info->revision, 0);
158 if (!commit) {
159 if (!ref_exists(ref_stash)) {
160 free_stash_info(info);
161 fprintf_ln(stderr, _("No stash entries found."));
162 return -1;
163 }
164
165 strbuf_addf(&info->revision, "%s@{0}", ref_stash);
166 } else if (strspn(commit, "0123456789") == strlen(commit)) {
167 strbuf_addf(&info->revision, "%s@{%s}", ref_stash, commit);
168 } else {
169 strbuf_addstr(&info->revision, commit);
170 }
171
172 revision = info->revision.buf;
173
174 if (get_oid(revision, &info->w_commit)) {
175 error(_("%s is not a valid reference"), revision);
176 free_stash_info(info);
177 return -1;
178 }
179
180 assert_stash_like(info, revision);
181
182 info->has_u = !get_oidf(&info->u_tree, "%s^3:", revision);
183
184 end_of_rev = strchrnul(revision, '@');
185 strbuf_add(&symbolic, revision, end_of_rev - revision);
186
187 ret = dwim_ref(symbolic.buf, symbolic.len, &dummy, &expanded_ref);
188 strbuf_release(&symbolic);
189 switch (ret) {
190 case 0: /* Not found, but valid ref */
191 info->is_stash_ref = 0;
192 break;
193 case 1:
194 info->is_stash_ref = !strcmp(expanded_ref, ref_stash);
195 break;
196 default: /* Invalid or ambiguous */
197 free_stash_info(info);
198 }
199
200 free(expanded_ref);
201 return !(ret == 0 || ret == 1);
202 }
203
204 static int do_clear_stash(void)
205 {
206 struct object_id obj;
207 if (get_oid(ref_stash, &obj))
208 return 0;
209
210 return delete_ref(NULL, ref_stash, &obj, 0);
211 }
212
213 static int clear_stash(int argc, const char **argv, const char *prefix)
214 {
215 struct option options[] = {
216 OPT_END()
217 };
218
219 argc = parse_options(argc, argv, prefix, options,
220 git_stash_clear_usage,
221 PARSE_OPT_STOP_AT_NON_OPTION);
222
223 if (argc)
224 return error(_("git stash clear with parameters is "
225 "unimplemented"));
226
227 return do_clear_stash();
228 }
229
230 static int reset_tree(struct object_id *i_tree, int update, int reset)
231 {
232 int nr_trees = 1;
233 struct unpack_trees_options opts;
234 struct tree_desc t[MAX_UNPACK_TREES];
235 struct tree *tree;
236 struct lock_file lock_file = LOCK_INIT;
237
238 read_cache_preload(NULL);
239 if (refresh_cache(REFRESH_QUIET))
240 return -1;
241
242 hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
243
244 memset(&opts, 0, sizeof(opts));
245
246 tree = parse_tree_indirect(i_tree);
247 if (parse_tree(tree))
248 return -1;
249
250 init_tree_desc(t, tree->buffer, tree->size);
251
252 opts.head_idx = 1;
253 opts.src_index = &the_index;
254 opts.dst_index = &the_index;
255 opts.merge = 1;
256 opts.reset = reset;
257 opts.update = update;
258 opts.fn = oneway_merge;
259
260 if (unpack_trees(nr_trees, t, &opts))
261 return -1;
262
263 if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
264 return error(_("unable to write new index file"));
265
266 return 0;
267 }
268
269 static int diff_tree_binary(struct strbuf *out, struct object_id *w_commit)
270 {
271 struct child_process cp = CHILD_PROCESS_INIT;
272 const char *w_commit_hex = oid_to_hex(w_commit);
273
274 /*
275 * Diff-tree would not be very hard to replace with a native function,
276 * however it should be done together with apply_cached.
277 */
278 cp.git_cmd = 1;
279 argv_array_pushl(&cp.args, "diff-tree", "--binary", NULL);
280 argv_array_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex);
281
282 return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
283 }
284
285 static int apply_cached(struct strbuf *out)
286 {
287 struct child_process cp = CHILD_PROCESS_INIT;
288
289 /*
290 * Apply currently only reads either from stdin or a file, thus
291 * apply_all_patches would have to be updated to optionally take a
292 * buffer.
293 */
294 cp.git_cmd = 1;
295 argv_array_pushl(&cp.args, "apply", "--cached", NULL);
296 return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
297 }
298
299 static int reset_head(void)
300 {
301 struct child_process cp = CHILD_PROCESS_INIT;
302
303 /*
304 * Reset is overall quite simple, however there is no current public
305 * API for resetting.
306 */
307 cp.git_cmd = 1;
308 argv_array_push(&cp.args, "reset");
309
310 return run_command(&cp);
311 }
312
313 static void add_diff_to_buf(struct diff_queue_struct *q,
314 struct diff_options *options,
315 void *data)
316 {
317 int i;
318
319 for (i = 0; i < q->nr; i++) {
320 strbuf_addstr(data, q->queue[i]->one->path);
321
322 /* NUL-terminate: will be fed to update-index -z */
323 strbuf_addch(data, '\0');
324 }
325 }
326
327 static int get_newly_staged(struct strbuf *out, struct object_id *c_tree)
328 {
329 struct child_process cp = CHILD_PROCESS_INIT;
330 const char *c_tree_hex = oid_to_hex(c_tree);
331
332 /*
333 * diff-index is very similar to diff-tree above, and should be
334 * converted together with update_index.
335 */
336 cp.git_cmd = 1;
337 argv_array_pushl(&cp.args, "diff-index", "--cached", "--name-only",
338 "--diff-filter=A", NULL);
339 argv_array_push(&cp.args, c_tree_hex);
340 return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
341 }
342
343 static int update_index(struct strbuf *out)
344 {
345 struct child_process cp = CHILD_PROCESS_INIT;
346
347 /*
348 * Update-index is very complicated and may need to have a public
349 * function exposed in order to remove this forking.
350 */
351 cp.git_cmd = 1;
352 argv_array_pushl(&cp.args, "update-index", "--add", "--stdin", NULL);
353 return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
354 }
355
356 static int restore_untracked(struct object_id *u_tree)
357 {
358 int res;
359 struct child_process cp = CHILD_PROCESS_INIT;
360
361 /*
362 * We need to run restore files from a given index, but without
363 * affecting the current index, so we use GIT_INDEX_FILE with
364 * run_command to fork processes that will not interfere.
365 */
366 cp.git_cmd = 1;
367 argv_array_push(&cp.args, "read-tree");
368 argv_array_push(&cp.args, oid_to_hex(u_tree));
369 argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
370 stash_index_path.buf);
371 if (run_command(&cp)) {
372 remove_path(stash_index_path.buf);
373 return -1;
374 }
375
376 child_process_init(&cp);
377 cp.git_cmd = 1;
378 argv_array_pushl(&cp.args, "checkout-index", "--all", NULL);
379 argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
380 stash_index_path.buf);
381
382 res = run_command(&cp);
383 remove_path(stash_index_path.buf);
384 return res;
385 }
386
387 static int do_apply_stash(const char *prefix, struct stash_info *info,
388 int index, int quiet)
389 {
390 int ret;
391 int has_index = index;
392 struct merge_options o;
393 struct object_id c_tree;
394 struct object_id index_tree;
395 struct commit *result;
396 const struct object_id *bases[1];
397
398 read_cache_preload(NULL);
399 if (refresh_cache(REFRESH_QUIET))
400 return -1;
401
402 if (write_cache_as_tree(&c_tree, 0, NULL))
403 return error(_("cannot apply a stash in the middle of a merge"));
404
405 if (index) {
406 if (oideq(&info->b_tree, &info->i_tree) ||
407 oideq(&c_tree, &info->i_tree)) {
408 has_index = 0;
409 } else {
410 struct strbuf out = STRBUF_INIT;
411
412 if (diff_tree_binary(&out, &info->w_commit)) {
413 strbuf_release(&out);
414 return error(_("could not generate diff %s^!."),
415 oid_to_hex(&info->w_commit));
416 }
417
418 ret = apply_cached(&out);
419 strbuf_release(&out);
420 if (ret)
421 return error(_("conflicts in index."
422 "Try without --index."));
423
424 discard_cache();
425 read_cache();
426 if (write_cache_as_tree(&index_tree, 0, NULL))
427 return error(_("could not save index tree"));
428
429 reset_head();
430 }
431 }
432
433 if (info->has_u && restore_untracked(&info->u_tree))
434 return error(_("could not restore untracked files from stash"));
435
436 init_merge_options(&o, the_repository);
437
438 o.branch1 = "Updated upstream";
439 o.branch2 = "Stashed changes";
440
441 if (oideq(&info->b_tree, &c_tree))
442 o.branch1 = "Version stash was based on";
443
444 if (quiet)
445 o.verbosity = 0;
446
447 if (o.verbosity >= 3)
448 printf_ln(_("Merging %s with %s"), o.branch1, o.branch2);
449
450 bases[0] = &info->b_tree;
451
452 ret = merge_recursive_generic(&o, &c_tree, &info->w_tree, 1, bases,
453 &result);
454 if (ret) {
455 rerere(0);
456
457 if (index)
458 fprintf_ln(stderr, _("Index was not unstashed."));
459
460 return ret;
461 }
462
463 if (has_index) {
464 if (reset_tree(&index_tree, 0, 0))
465 return -1;
466 } else {
467 struct strbuf out = STRBUF_INIT;
468
469 if (get_newly_staged(&out, &c_tree)) {
470 strbuf_release(&out);
471 return -1;
472 }
473
474 if (reset_tree(&c_tree, 0, 1)) {
475 strbuf_release(&out);
476 return -1;
477 }
478
479 ret = update_index(&out);
480 strbuf_release(&out);
481 if (ret)
482 return -1;
483
484 discard_cache();
485 }
486
487 if (quiet) {
488 if (refresh_cache(REFRESH_QUIET))
489 warning("could not refresh index");
490 } else {
491 struct child_process cp = CHILD_PROCESS_INIT;
492
493 /*
494 * Status is quite simple and could be replaced with calls to
495 * wt_status in the future, but it adds complexities which may
496 * require more tests.
497 */
498 cp.git_cmd = 1;
499 cp.dir = prefix;
500 argv_array_push(&cp.args, "status");
501 run_command(&cp);
502 }
503
504 return 0;
505 }
506
507 static int apply_stash(int argc, const char **argv, const char *prefix)
508 {
509 int ret;
510 int quiet = 0;
511 int index = 0;
512 struct stash_info info;
513 struct option options[] = {
514 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
515 OPT_BOOL(0, "index", &index,
516 N_("attempt to recreate the index")),
517 OPT_END()
518 };
519
520 argc = parse_options(argc, argv, prefix, options,
521 git_stash_apply_usage, 0);
522
523 if (get_stash_info(&info, argc, argv))
524 return -1;
525
526 ret = do_apply_stash(prefix, &info, index, quiet);
527 free_stash_info(&info);
528 return ret;
529 }
530
531 static int do_drop_stash(const char *prefix, struct stash_info *info, int quiet)
532 {
533 int ret;
534 struct child_process cp_reflog = CHILD_PROCESS_INIT;
535 struct child_process cp = CHILD_PROCESS_INIT;
536
537 /*
538 * reflog does not provide a simple function for deleting refs. One will
539 * need to be added to avoid implementing too much reflog code here
540 */
541
542 cp_reflog.git_cmd = 1;
543 argv_array_pushl(&cp_reflog.args, "reflog", "delete", "--updateref",
544 "--rewrite", NULL);
545 argv_array_push(&cp_reflog.args, info->revision.buf);
546 ret = run_command(&cp_reflog);
547 if (!ret) {
548 if (!quiet)
549 printf_ln(_("Dropped %s (%s)"), info->revision.buf,
550 oid_to_hex(&info->w_commit));
551 } else {
552 return error(_("%s: Could not drop stash entry"),
553 info->revision.buf);
554 }
555
556 /*
557 * This could easily be replaced by get_oid, but currently it will throw
558 * a fatal error when a reflog is empty, which we can not recover from.
559 */
560 cp.git_cmd = 1;
561 /* Even though --quiet is specified, rev-parse still outputs the hash */
562 cp.no_stdout = 1;
563 argv_array_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL);
564 argv_array_pushf(&cp.args, "%s@{0}", ref_stash);
565 ret = run_command(&cp);
566
567 /* do_clear_stash if we just dropped the last stash entry */
568 if (ret)
569 do_clear_stash();
570
571 return 0;
572 }
573
574 static void assert_stash_ref(struct stash_info *info)
575 {
576 if (!info->is_stash_ref) {
577 error(_("'%s' is not a stash reference"), info->revision.buf);
578 free_stash_info(info);
579 exit(1);
580 }
581 }
582
583 static int drop_stash(int argc, const char **argv, const char *prefix)
584 {
585 int ret;
586 int quiet = 0;
587 struct stash_info info;
588 struct option options[] = {
589 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
590 OPT_END()
591 };
592
593 argc = parse_options(argc, argv, prefix, options,
594 git_stash_drop_usage, 0);
595
596 if (get_stash_info(&info, argc, argv))
597 return -1;
598
599 assert_stash_ref(&info);
600
601 ret = do_drop_stash(prefix, &info, quiet);
602 free_stash_info(&info);
603 return ret;
604 }
605
606 static int pop_stash(int argc, const char **argv, const char *prefix)
607 {
608 int ret;
609 int index = 0;
610 int quiet = 0;
611 struct stash_info info;
612 struct option options[] = {
613 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
614 OPT_BOOL(0, "index", &index,
615 N_("attempt to recreate the index")),
616 OPT_END()
617 };
618
619 argc = parse_options(argc, argv, prefix, options,
620 git_stash_pop_usage, 0);
621
622 if (get_stash_info(&info, argc, argv))
623 return -1;
624
625 assert_stash_ref(&info);
626 if ((ret = do_apply_stash(prefix, &info, index, quiet)))
627 printf_ln(_("The stash entry is kept in case "
628 "you need it again."));
629 else
630 ret = do_drop_stash(prefix, &info, quiet);
631
632 free_stash_info(&info);
633 return ret;
634 }
635
636 static int branch_stash(int argc, const char **argv, const char *prefix)
637 {
638 int ret;
639 const char *branch = NULL;
640 struct stash_info info;
641 struct child_process cp = CHILD_PROCESS_INIT;
642 struct option options[] = {
643 OPT_END()
644 };
645
646 argc = parse_options(argc, argv, prefix, options,
647 git_stash_branch_usage, 0);
648
649 if (!argc) {
650 fprintf_ln(stderr, _("No branch name specified"));
651 return -1;
652 }
653
654 branch = argv[0];
655
656 if (get_stash_info(&info, argc - 1, argv + 1))
657 return -1;
658
659 cp.git_cmd = 1;
660 argv_array_pushl(&cp.args, "checkout", "-b", NULL);
661 argv_array_push(&cp.args, branch);
662 argv_array_push(&cp.args, oid_to_hex(&info.b_commit));
663 ret = run_command(&cp);
664 if (!ret)
665 ret = do_apply_stash(prefix, &info, 1, 0);
666 if (!ret && info.is_stash_ref)
667 ret = do_drop_stash(prefix, &info, 0);
668
669 free_stash_info(&info);
670
671 return ret;
672 }
673
674 static int list_stash(int argc, const char **argv, const char *prefix)
675 {
676 struct child_process cp = CHILD_PROCESS_INIT;
677 struct option options[] = {
678 OPT_END()
679 };
680
681 argc = parse_options(argc, argv, prefix, options,
682 git_stash_list_usage,
683 PARSE_OPT_KEEP_UNKNOWN);
684
685 if (!ref_exists(ref_stash))
686 return 0;
687
688 cp.git_cmd = 1;
689 argv_array_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
690 "--first-parent", "-m", NULL);
691 argv_array_pushv(&cp.args, argv);
692 argv_array_push(&cp.args, ref_stash);
693 argv_array_push(&cp.args, "--");
694 return run_command(&cp);
695 }
696
697 static int show_stat = 1;
698 static int show_patch;
699
700 static int git_stash_config(const char *var, const char *value, void *cb)
701 {
702 if (!strcmp(var, "stash.showstat")) {
703 show_stat = git_config_bool(var, value);
704 return 0;
705 }
706 if (!strcmp(var, "stash.showpatch")) {
707 show_patch = git_config_bool(var, value);
708 return 0;
709 }
710 return git_default_config(var, value, cb);
711 }
712
713 static int show_stash(int argc, const char **argv, const char *prefix)
714 {
715 int i;
716 int opts = 0;
717 int ret = 0;
718 struct stash_info info;
719 struct rev_info rev;
720 struct argv_array stash_args = ARGV_ARRAY_INIT;
721 struct option options[] = {
722 OPT_END()
723 };
724
725 init_diff_ui_defaults();
726 git_config(git_diff_ui_config, NULL);
727 init_revisions(&rev, prefix);
728
729 for (i = 1; i < argc; i++) {
730 if (argv[i][0] != '-')
731 argv_array_push(&stash_args, argv[i]);
732 else
733 opts++;
734 }
735
736 ret = get_stash_info(&info, stash_args.argc, stash_args.argv);
737 argv_array_clear(&stash_args);
738 if (ret)
739 return -1;
740
741 /*
742 * The config settings are applied only if there are not passed
743 * any options.
744 */
745 if (!opts) {
746 git_config(git_stash_config, NULL);
747 if (show_stat)
748 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT;
749
750 if (show_patch)
751 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
752
753 if (!show_stat && !show_patch) {
754 free_stash_info(&info);
755 return 0;
756 }
757 }
758
759 argc = setup_revisions(argc, argv, &rev, NULL);
760 if (argc > 1) {
761 free_stash_info(&info);
762 usage_with_options(git_stash_show_usage, options);
763 }
764
765 rev.diffopt.flags.recursive = 1;
766 setup_diff_pager(&rev.diffopt);
767 diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
768 log_tree_diff_flush(&rev);
769
770 free_stash_info(&info);
771 return diff_result_code(&rev.diffopt, 0);
772 }
773
774 static int do_store_stash(const struct object_id *w_commit, const char *stash_msg,
775 int quiet)
776 {
777 if (!stash_msg)
778 stash_msg = "Created via \"git stash store\".";
779
780 if (update_ref(stash_msg, ref_stash, w_commit, NULL,
781 REF_FORCE_CREATE_REFLOG,
782 quiet ? UPDATE_REFS_QUIET_ON_ERR :
783 UPDATE_REFS_MSG_ON_ERR)) {
784 if (!quiet) {
785 fprintf_ln(stderr, _("Cannot update %s with %s"),
786 ref_stash, oid_to_hex(w_commit));
787 }
788 return -1;
789 }
790
791 return 0;
792 }
793
794 static int store_stash(int argc, const char **argv, const char *prefix)
795 {
796 int quiet = 0;
797 const char *stash_msg = NULL;
798 struct object_id obj;
799 struct object_context dummy;
800 struct option options[] = {
801 OPT__QUIET(&quiet, N_("be quiet")),
802 OPT_STRING('m', "message", &stash_msg, "message",
803 N_("stash message")),
804 OPT_END()
805 };
806
807 argc = parse_options(argc, argv, prefix, options,
808 git_stash_store_usage,
809 PARSE_OPT_KEEP_UNKNOWN);
810
811 if (argc != 1) {
812 if (!quiet)
813 fprintf_ln(stderr, _("\"git stash store\" requires one "
814 "<commit> argument"));
815 return -1;
816 }
817
818 if (get_oid_with_context(the_repository,
819 argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
820 &dummy)) {
821 if (!quiet)
822 fprintf_ln(stderr, _("Cannot update %s with %s"),
823 ref_stash, argv[0]);
824 return -1;
825 }
826
827 return do_store_stash(&obj, stash_msg, quiet);
828 }
829
830 static void add_pathspecs(struct argv_array *args,
831 struct pathspec ps) {
832 int i;
833
834 for (i = 0; i < ps.nr; i++)
835 argv_array_push(args, ps.items[i].match);
836 }
837
838 /*
839 * `untracked_files` will be filled with the names of untracked files.
840 * The return value is:
841 *
842 * = 0 if there are not any untracked files
843 * > 0 if there are untracked files
844 */
845 static int get_untracked_files(struct pathspec ps, int include_untracked,
846 struct strbuf *untracked_files)
847 {
848 int i;
849 int max_len;
850 int found = 0;
851 char *seen;
852 struct dir_struct dir;
853
854 memset(&dir, 0, sizeof(dir));
855 if (include_untracked != INCLUDE_ALL_FILES)
856 setup_standard_excludes(&dir);
857
858 seen = xcalloc(ps.nr, 1);
859
860 max_len = fill_directory(&dir, the_repository->index, &ps);
861 for (i = 0; i < dir.nr; i++) {
862 struct dir_entry *ent = dir.entries[i];
863 if (dir_path_match(&the_index, ent, &ps, max_len, seen)) {
864 found++;
865 strbuf_addstr(untracked_files, ent->name);
866 /* NUL-terminate: will be fed to update-index -z */
867 strbuf_addch(untracked_files, '\0');
868 }
869 free(ent);
870 }
871
872 free(seen);
873 free(dir.entries);
874 free(dir.ignored);
875 clear_directory(&dir);
876 return found;
877 }
878
879 /*
880 * The return value of `check_changes_tracked_files()` can be:
881 *
882 * < 0 if there was an error
883 * = 0 if there are no changes.
884 * > 0 if there are changes.
885 */
886 static int check_changes_tracked_files(struct pathspec ps)
887 {
888 int result;
889 struct rev_info rev;
890 struct object_id dummy;
891
892 /* No initial commit. */
893 if (get_oid("HEAD", &dummy))
894 return -1;
895
896 if (read_cache() < 0)
897 return -1;
898
899 init_revisions(&rev, NULL);
900 rev.prune_data = ps;
901
902 rev.diffopt.flags.quick = 1;
903 rev.diffopt.flags.ignore_submodules = 1;
904 rev.abbrev = 0;
905
906 add_head_to_pending(&rev);
907 diff_setup_done(&rev.diffopt);
908
909 result = run_diff_index(&rev, 1);
910 if (diff_result_code(&rev.diffopt, result))
911 return 1;
912
913 object_array_clear(&rev.pending);
914 result = run_diff_files(&rev, 0);
915 if (diff_result_code(&rev.diffopt, result))
916 return 1;
917
918 return 0;
919 }
920
921 /*
922 * The function will fill `untracked_files` with the names of untracked files
923 * It will return 1 if there were any changes and 0 if there were not.
924 */
925 static int check_changes(struct pathspec ps, int include_untracked,
926 struct strbuf *untracked_files)
927 {
928 int ret = 0;
929 if (check_changes_tracked_files(ps))
930 ret = 1;
931
932 if (include_untracked && get_untracked_files(ps, include_untracked,
933 untracked_files))
934 ret = 1;
935
936 return ret;
937 }
938
939 static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
940 struct strbuf files)
941 {
942 int ret = 0;
943 struct strbuf untracked_msg = STRBUF_INIT;
944 struct child_process cp_upd_index = CHILD_PROCESS_INIT;
945 struct index_state istate = { NULL };
946
947 cp_upd_index.git_cmd = 1;
948 argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
949 "--remove", "--stdin", NULL);
950 argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
951 stash_index_path.buf);
952
953 strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf);
954 if (pipe_command(&cp_upd_index, files.buf, files.len, NULL, 0,
955 NULL, 0)) {
956 ret = -1;
957 goto done;
958 }
959
960 if (write_index_as_tree(&info->u_tree, &istate, stash_index_path.buf, 0,
961 NULL)) {
962 ret = -1;
963 goto done;
964 }
965
966 if (commit_tree(untracked_msg.buf, untracked_msg.len,
967 &info->u_tree, NULL, &info->u_commit, NULL, NULL)) {
968 ret = -1;
969 goto done;
970 }
971
972 done:
973 discard_index(&istate);
974 strbuf_release(&untracked_msg);
975 remove_path(stash_index_path.buf);
976 return ret;
977 }
978
979 static int stash_patch(struct stash_info *info, struct pathspec ps,
980 struct strbuf *out_patch, int quiet)
981 {
982 int ret = 0;
983 struct child_process cp_read_tree = CHILD_PROCESS_INIT;
984 struct child_process cp_add_i = CHILD_PROCESS_INIT;
985 struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
986 struct index_state istate = { NULL };
987
988 remove_path(stash_index_path.buf);
989
990 cp_read_tree.git_cmd = 1;
991 argv_array_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL);
992 argv_array_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s",
993 stash_index_path.buf);
994 if (run_command(&cp_read_tree)) {
995 ret = -1;
996 goto done;
997 }
998
999 /* Find out what the user wants. */
1000 cp_add_i.git_cmd = 1;
1001 argv_array_pushl(&cp_add_i.args, "add--interactive", "--patch=stash",
1002 "--", NULL);
1003 add_pathspecs(&cp_add_i.args, ps);
1004 argv_array_pushf(&cp_add_i.env_array, "GIT_INDEX_FILE=%s",
1005 stash_index_path.buf);
1006 if (run_command(&cp_add_i)) {
1007 ret = -1;
1008 goto done;
1009 }
1010
1011 /* State of the working tree. */
1012 if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
1013 NULL)) {
1014 ret = -1;
1015 goto done;
1016 }
1017
1018 cp_diff_tree.git_cmd = 1;
1019 argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD",
1020 oid_to_hex(&info->w_tree), "--", NULL);
1021 if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) {
1022 ret = -1;
1023 goto done;
1024 }
1025
1026 if (!out_patch->len) {
1027 if (!quiet)
1028 fprintf_ln(stderr, _("No changes selected"));
1029 ret = 1;
1030 }
1031
1032 done:
1033 discard_index(&istate);
1034 remove_path(stash_index_path.buf);
1035 return ret;
1036 }
1037
1038 static int stash_working_tree(struct stash_info *info, struct pathspec ps)
1039 {
1040 int ret = 0;
1041 struct rev_info rev;
1042 struct child_process cp_upd_index = CHILD_PROCESS_INIT;
1043 struct strbuf diff_output = STRBUF_INIT;
1044 struct index_state istate = { NULL };
1045
1046 init_revisions(&rev, NULL);
1047
1048 set_alternate_index_output(stash_index_path.buf);
1049 if (reset_tree(&info->i_tree, 0, 0)) {
1050 ret = -1;
1051 goto done;
1052 }
1053 set_alternate_index_output(NULL);
1054
1055 rev.prune_data = ps;
1056 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
1057 rev.diffopt.format_callback = add_diff_to_buf;
1058 rev.diffopt.format_callback_data = &diff_output;
1059
1060 if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
1061 ret = -1;
1062 goto done;
1063 }
1064
1065 add_pending_object(&rev, parse_object(the_repository, &info->b_commit),
1066 "");
1067 if (run_diff_index(&rev, 0)) {
1068 ret = -1;
1069 goto done;
1070 }
1071
1072 cp_upd_index.git_cmd = 1;
1073 argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
1074 "--remove", "--stdin", NULL);
1075 argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
1076 stash_index_path.buf);
1077
1078 if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len,
1079 NULL, 0, NULL, 0)) {
1080 ret = -1;
1081 goto done;
1082 }
1083
1084 if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
1085 NULL)) {
1086 ret = -1;
1087 goto done;
1088 }
1089
1090 done:
1091 discard_index(&istate);
1092 UNLEAK(rev);
1093 object_array_clear(&rev.pending);
1094 strbuf_release(&diff_output);
1095 remove_path(stash_index_path.buf);
1096 return ret;
1097 }
1098
1099 static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
1100 int include_untracked, int patch_mode,
1101 struct stash_info *info, struct strbuf *patch,
1102 int quiet)
1103 {
1104 int ret = 0;
1105 int flags = 0;
1106 int untracked_commit_option = 0;
1107 const char *head_short_sha1 = NULL;
1108 const char *branch_ref = NULL;
1109 const char *branch_name = "(no branch)";
1110 struct commit *head_commit = NULL;
1111 struct commit_list *parents = NULL;
1112 struct strbuf msg = STRBUF_INIT;
1113 struct strbuf commit_tree_label = STRBUF_INIT;
1114 struct strbuf untracked_files = STRBUF_INIT;
1115
1116 prepare_fallback_ident("git stash", "git@stash");
1117
1118 read_cache_preload(NULL);
1119 refresh_cache(REFRESH_QUIET);
1120
1121 if (get_oid("HEAD", &info->b_commit)) {
1122 if (!quiet)
1123 fprintf_ln(stderr, _("You do not have "
1124 "the initial commit yet"));
1125 ret = -1;
1126 goto done;
1127 } else {
1128 head_commit = lookup_commit(the_repository, &info->b_commit);
1129 }
1130
1131 if (!check_changes(ps, include_untracked, &untracked_files)) {
1132 ret = 1;
1133 goto done;
1134 }
1135
1136 branch_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flags);
1137 if (flags & REF_ISSYMREF)
1138 branch_name = strrchr(branch_ref, '/') + 1;
1139 head_short_sha1 = find_unique_abbrev(&head_commit->object.oid,
1140 DEFAULT_ABBREV);
1141 strbuf_addf(&msg, "%s: %s ", branch_name, head_short_sha1);
1142 pp_commit_easy(CMIT_FMT_ONELINE, head_commit, &msg);
1143
1144 strbuf_addf(&commit_tree_label, "index on %s\n", msg.buf);
1145 commit_list_insert(head_commit, &parents);
1146 if (write_cache_as_tree(&info->i_tree, 0, NULL) ||
1147 commit_tree(commit_tree_label.buf, commit_tree_label.len,
1148 &info->i_tree, parents, &info->i_commit, NULL, NULL)) {
1149 if (!quiet)
1150 fprintf_ln(stderr, _("Cannot save the current "
1151 "index state"));
1152 ret = -1;
1153 goto done;
1154 }
1155
1156 if (include_untracked) {
1157 if (save_untracked_files(info, &msg, untracked_files)) {
1158 if (!quiet)
1159 fprintf_ln(stderr, _("Cannot save "
1160 "the untracked files"));
1161 ret = -1;
1162 goto done;
1163 }
1164 untracked_commit_option = 1;
1165 }
1166 if (patch_mode) {
1167 ret = stash_patch(info, ps, patch, quiet);
1168 if (ret < 0) {
1169 if (!quiet)
1170 fprintf_ln(stderr, _("Cannot save the current "
1171 "worktree state"));
1172 goto done;
1173 } else if (ret > 0) {
1174 goto done;
1175 }
1176 } else {
1177 if (stash_working_tree(info, ps)) {
1178 if (!quiet)
1179 fprintf_ln(stderr, _("Cannot save the current "
1180 "worktree state"));
1181 ret = -1;
1182 goto done;
1183 }
1184 }
1185
1186 if (!stash_msg_buf->len)
1187 strbuf_addf(stash_msg_buf, "WIP on %s", msg.buf);
1188 else
1189 strbuf_insertf(stash_msg_buf, 0, "On %s: ", branch_name);
1190
1191 /*
1192 * `parents` will be empty after calling `commit_tree()`, so there is
1193 * no need to call `free_commit_list()`
1194 */
1195 parents = NULL;
1196 if (untracked_commit_option)
1197 commit_list_insert(lookup_commit(the_repository,
1198 &info->u_commit),
1199 &parents);
1200 commit_list_insert(lookup_commit(the_repository, &info->i_commit),
1201 &parents);
1202 commit_list_insert(head_commit, &parents);
1203
1204 if (commit_tree(stash_msg_buf->buf, stash_msg_buf->len, &info->w_tree,
1205 parents, &info->w_commit, NULL, NULL)) {
1206 if (!quiet)
1207 fprintf_ln(stderr, _("Cannot record "
1208 "working tree state"));
1209 ret = -1;
1210 goto done;
1211 }
1212
1213 done:
1214 strbuf_release(&commit_tree_label);
1215 strbuf_release(&msg);
1216 strbuf_release(&untracked_files);
1217 return ret;
1218 }
1219
1220 static int create_stash(int argc, const char **argv, const char *prefix)
1221 {
1222 int ret = 0;
1223 struct strbuf stash_msg_buf = STRBUF_INIT;
1224 struct stash_info info;
1225 struct pathspec ps;
1226
1227 /* Starting with argv[1], since argv[0] is "create" */
1228 strbuf_join_argv(&stash_msg_buf, argc - 1, ++argv, ' ');
1229
1230 memset(&ps, 0, sizeof(ps));
1231 if (!check_changes_tracked_files(ps))
1232 return 0;
1233
1234 ret = do_create_stash(ps, &stash_msg_buf, 0, 0, &info,
1235 NULL, 0);
1236 if (!ret)
1237 printf_ln("%s", oid_to_hex(&info.w_commit));
1238
1239 strbuf_release(&stash_msg_buf);
1240 return ret;
1241 }
1242
1243 static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
1244 int keep_index, int patch_mode, int include_untracked)
1245 {
1246 int ret = 0;
1247 struct stash_info info;
1248 struct strbuf patch = STRBUF_INIT;
1249 struct strbuf stash_msg_buf = STRBUF_INIT;
1250 struct strbuf untracked_files = STRBUF_INIT;
1251
1252 if (patch_mode && keep_index == -1)
1253 keep_index = 1;
1254
1255 if (patch_mode && include_untracked) {
1256 fprintf_ln(stderr, _("Can't use --patch and --include-untracked"
1257 " or --all at the same time"));
1258 ret = -1;
1259 goto done;
1260 }
1261
1262 read_cache_preload(NULL);
1263 if (!include_untracked && ps.nr) {
1264 int i;
1265 char *ps_matched = xcalloc(ps.nr, 1);
1266
1267 for (i = 0; i < active_nr; i++)
1268 ce_path_match(&the_index, active_cache[i], &ps,
1269 ps_matched);
1270
1271 if (report_path_error(ps_matched, &ps, NULL)) {
1272 fprintf_ln(stderr, _("Did you forget to 'git add'?"));
1273 ret = -1;
1274 free(ps_matched);
1275 goto done;
1276 }
1277 free(ps_matched);
1278 }
1279
1280 if (refresh_cache(REFRESH_QUIET)) {
1281 ret = -1;
1282 goto done;
1283 }
1284
1285 if (!check_changes(ps, include_untracked, &untracked_files)) {
1286 if (!quiet)
1287 printf_ln(_("No local changes to save"));
1288 goto done;
1289 }
1290
1291 if (!reflog_exists(ref_stash) && do_clear_stash()) {
1292 ret = -1;
1293 if (!quiet)
1294 fprintf_ln(stderr, _("Cannot initialize stash"));
1295 goto done;
1296 }
1297
1298 if (stash_msg)
1299 strbuf_addstr(&stash_msg_buf, stash_msg);
1300 if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode,
1301 &info, &patch, quiet)) {
1302 ret = -1;
1303 goto done;
1304 }
1305
1306 if (do_store_stash(&info.w_commit, stash_msg_buf.buf, 1)) {
1307 ret = -1;
1308 if (!quiet)
1309 fprintf_ln(stderr, _("Cannot save the current status"));
1310 goto done;
1311 }
1312
1313 if (!quiet)
1314 printf_ln(_("Saved working directory and index state %s"),
1315 stash_msg_buf.buf);
1316
1317 if (!patch_mode) {
1318 if (include_untracked && !ps.nr) {
1319 struct child_process cp = CHILD_PROCESS_INIT;
1320
1321 cp.git_cmd = 1;
1322 argv_array_pushl(&cp.args, "clean", "--force",
1323 "--quiet", "-d", NULL);
1324 if (include_untracked == INCLUDE_ALL_FILES)
1325 argv_array_push(&cp.args, "-x");
1326 if (run_command(&cp)) {
1327 ret = -1;
1328 goto done;
1329 }
1330 }
1331 discard_cache();
1332 if (ps.nr) {
1333 struct child_process cp_add = CHILD_PROCESS_INIT;
1334 struct child_process cp_diff = CHILD_PROCESS_INIT;
1335 struct child_process cp_apply = CHILD_PROCESS_INIT;
1336 struct strbuf out = STRBUF_INIT;
1337
1338 cp_add.git_cmd = 1;
1339 argv_array_push(&cp_add.args, "add");
1340 if (!include_untracked)
1341 argv_array_push(&cp_add.args, "-u");
1342 if (include_untracked == INCLUDE_ALL_FILES)
1343 argv_array_push(&cp_add.args, "--force");
1344 argv_array_push(&cp_add.args, "--");
1345 add_pathspecs(&cp_add.args, ps);
1346 if (run_command(&cp_add)) {
1347 ret = -1;
1348 goto done;
1349 }
1350
1351 cp_diff.git_cmd = 1;
1352 argv_array_pushl(&cp_diff.args, "diff-index", "-p",
1353 "--cached", "--binary", "HEAD", "--",
1354 NULL);
1355 add_pathspecs(&cp_diff.args, ps);
1356 if (pipe_command(&cp_diff, NULL, 0, &out, 0, NULL, 0)) {
1357 ret = -1;
1358 goto done;
1359 }
1360
1361 cp_apply.git_cmd = 1;
1362 argv_array_pushl(&cp_apply.args, "apply", "--index",
1363 "-R", NULL);
1364 if (pipe_command(&cp_apply, out.buf, out.len, NULL, 0,
1365 NULL, 0)) {
1366 ret = -1;
1367 goto done;
1368 }
1369 } else {
1370 struct child_process cp = CHILD_PROCESS_INIT;
1371 cp.git_cmd = 1;
1372 argv_array_pushl(&cp.args, "reset", "--hard", "-q",
1373 NULL);
1374 if (run_command(&cp)) {
1375 ret = -1;
1376 goto done;
1377 }
1378 }
1379
1380 if (keep_index == 1 && !is_null_oid(&info.i_tree)) {
1381 struct child_process cp_ls = CHILD_PROCESS_INIT;
1382 struct child_process cp_checkout = CHILD_PROCESS_INIT;
1383 struct strbuf out = STRBUF_INIT;
1384
1385 if (reset_tree(&info.i_tree, 0, 1)) {
1386 ret = -1;
1387 goto done;
1388 }
1389
1390 cp_ls.git_cmd = 1;
1391 argv_array_pushl(&cp_ls.args, "ls-files", "-z",
1392 "--modified", "--", NULL);
1393
1394 add_pathspecs(&cp_ls.args, ps);
1395 if (pipe_command(&cp_ls, NULL, 0, &out, 0, NULL, 0)) {
1396 ret = -1;
1397 goto done;
1398 }
1399
1400 cp_checkout.git_cmd = 1;
1401 argv_array_pushl(&cp_checkout.args, "checkout-index",
1402 "-z", "--force", "--stdin", NULL);
1403 if (pipe_command(&cp_checkout, out.buf, out.len, NULL,
1404 0, NULL, 0)) {
1405 ret = -1;
1406 goto done;
1407 }
1408 }
1409 goto done;
1410 } else {
1411 struct child_process cp = CHILD_PROCESS_INIT;
1412
1413 cp.git_cmd = 1;
1414 argv_array_pushl(&cp.args, "apply", "-R", NULL);
1415
1416 if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) {
1417 if (!quiet)
1418 fprintf_ln(stderr, _("Cannot remove "
1419 "worktree changes"));
1420 ret = -1;
1421 goto done;
1422 }
1423
1424 if (keep_index < 1) {
1425 struct child_process cp = CHILD_PROCESS_INIT;
1426
1427 cp.git_cmd = 1;
1428 argv_array_pushl(&cp.args, "reset", "-q", "--", NULL);
1429 add_pathspecs(&cp.args, ps);
1430 if (run_command(&cp)) {
1431 ret = -1;
1432 goto done;
1433 }
1434 }
1435 goto done;
1436 }
1437
1438 done:
1439 strbuf_release(&stash_msg_buf);
1440 return ret;
1441 }
1442
1443 static int push_stash(int argc, const char **argv, const char *prefix)
1444 {
1445 int keep_index = -1;
1446 int patch_mode = 0;
1447 int include_untracked = 0;
1448 int quiet = 0;
1449 const char *stash_msg = NULL;
1450 struct pathspec ps;
1451 struct option options[] = {
1452 OPT_BOOL('k', "keep-index", &keep_index,
1453 N_("keep index")),
1454 OPT_BOOL('p', "patch", &patch_mode,
1455 N_("stash in patch mode")),
1456 OPT__QUIET(&quiet, N_("quiet mode")),
1457 OPT_BOOL('u', "include-untracked", &include_untracked,
1458 N_("include untracked files in stash")),
1459 OPT_SET_INT('a', "all", &include_untracked,
1460 N_("include ignore files"), 2),
1461 OPT_STRING('m', "message", &stash_msg, N_("message"),
1462 N_("stash message")),
1463 OPT_END()
1464 };
1465
1466 if (argc)
1467 argc = parse_options(argc, argv, prefix, options,
1468 git_stash_push_usage,
1469 0);
1470
1471 parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL, prefix, argv);
1472 return do_push_stash(ps, stash_msg, quiet, keep_index, patch_mode,
1473 include_untracked);
1474 }
1475
1476 static int save_stash(int argc, const char **argv, const char *prefix)
1477 {
1478 int keep_index = -1;
1479 int patch_mode = 0;
1480 int include_untracked = 0;
1481 int quiet = 0;
1482 int ret = 0;
1483 const char *stash_msg = NULL;
1484 struct pathspec ps;
1485 struct strbuf stash_msg_buf = STRBUF_INIT;
1486 struct option options[] = {
1487 OPT_BOOL('k', "keep-index", &keep_index,
1488 N_("keep index")),
1489 OPT_BOOL('p', "patch", &patch_mode,
1490 N_("stash in patch mode")),
1491 OPT__QUIET(&quiet, N_("quiet mode")),
1492 OPT_BOOL('u', "include-untracked", &include_untracked,
1493 N_("include untracked files in stash")),
1494 OPT_SET_INT('a', "all", &include_untracked,
1495 N_("include ignore files"), 2),
1496 OPT_STRING('m', "message", &stash_msg, "message",
1497 N_("stash message")),
1498 OPT_END()
1499 };
1500
1501 argc = parse_options(argc, argv, prefix, options,
1502 git_stash_save_usage,
1503 PARSE_OPT_KEEP_DASHDASH);
1504
1505 if (argc)
1506 stash_msg = strbuf_join_argv(&stash_msg_buf, argc, argv, ' ');
1507
1508 memset(&ps, 0, sizeof(ps));
1509 ret = do_push_stash(ps, stash_msg, quiet, keep_index,
1510 patch_mode, include_untracked);
1511
1512 strbuf_release(&stash_msg_buf);
1513 return ret;
1514 }
1515
1516 static int use_builtin_stash(void)
1517 {
1518 struct child_process cp = CHILD_PROCESS_INIT;
1519 struct strbuf out = STRBUF_INIT;
1520 int ret, env = git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1);
1521
1522 if (env != -1)
1523 return env;
1524
1525 argv_array_pushl(&cp.args,
1526 "config", "--bool", "stash.usebuiltin", NULL);
1527 cp.git_cmd = 1;
1528 if (capture_command(&cp, &out, 6)) {
1529 strbuf_release(&out);
1530 return 1;
1531 }
1532
1533 strbuf_trim(&out);
1534 ret = !strcmp("true", out.buf);
1535 strbuf_release(&out);
1536 return ret;
1537 }
1538
1539 int cmd_stash(int argc, const char **argv, const char *prefix)
1540 {
1541 int i = -1;
1542 pid_t pid = getpid();
1543 const char *index_file;
1544 struct argv_array args = ARGV_ARRAY_INIT;
1545
1546 struct option options[] = {
1547 OPT_END()
1548 };
1549
1550 if (!use_builtin_stash()) {
1551 const char *path = mkpath("%s/git-legacy-stash",
1552 git_exec_path());
1553
1554 if (sane_execvp(path, (char **)argv) < 0)
1555 die_errno(_("could not exec %s"), path);
1556 else
1557 BUG("sane_execvp() returned???");
1558 }
1559
1560 prefix = setup_git_directory();
1561 trace_repo_setup(prefix);
1562 setup_work_tree();
1563
1564 git_config(git_diff_basic_config, NULL);
1565
1566 argc = parse_options(argc, argv, prefix, options, git_stash_usage,
1567 PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
1568
1569 index_file = get_index_file();
1570 strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file,
1571 (uintmax_t)pid);
1572
1573 if (!argc)
1574 return !!push_stash(0, NULL, prefix);
1575 else if (!strcmp(argv[0], "apply"))
1576 return !!apply_stash(argc, argv, prefix);
1577 else if (!strcmp(argv[0], "clear"))
1578 return !!clear_stash(argc, argv, prefix);
1579 else if (!strcmp(argv[0], "drop"))
1580 return !!drop_stash(argc, argv, prefix);
1581 else if (!strcmp(argv[0], "pop"))
1582 return !!pop_stash(argc, argv, prefix);
1583 else if (!strcmp(argv[0], "branch"))
1584 return !!branch_stash(argc, argv, prefix);
1585 else if (!strcmp(argv[0], "list"))
1586 return !!list_stash(argc, argv, prefix);
1587 else if (!strcmp(argv[0], "show"))
1588 return !!show_stash(argc, argv, prefix);
1589 else if (!strcmp(argv[0], "store"))
1590 return !!store_stash(argc, argv, prefix);
1591 else if (!strcmp(argv[0], "create"))
1592 return !!create_stash(argc, argv, prefix);
1593 else if (!strcmp(argv[0], "push"))
1594 return !!push_stash(argc, argv, prefix);
1595 else if (!strcmp(argv[0], "save"))
1596 return !!save_stash(argc, argv, prefix);
1597 else if (*argv[0] != '-')
1598 usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
1599 git_stash_usage, options);
1600
1601 if (strcmp(argv[0], "-p")) {
1602 while (++i < argc && strcmp(argv[i], "--")) {
1603 /*
1604 * `akpqu` is a string which contains all short options,
1605 * except `-m` which is verified separately.
1606 */
1607 if ((strlen(argv[i]) == 2) && *argv[i] == '-' &&
1608 strchr("akpqu", argv[i][1]))
1609 continue;
1610
1611 if (!strcmp(argv[i], "--all") ||
1612 !strcmp(argv[i], "--keep-index") ||
1613 !strcmp(argv[i], "--no-keep-index") ||
1614 !strcmp(argv[i], "--patch") ||
1615 !strcmp(argv[i], "--quiet") ||
1616 !strcmp(argv[i], "--include-untracked"))
1617 continue;
1618
1619 /*
1620 * `-m` and `--message=` are verified separately because
1621 * they need to be immediately followed by a string
1622 * (i.e.`-m"foobar"` or `--message="foobar"`).
1623 */
1624 if (starts_with(argv[i], "-m") ||
1625 starts_with(argv[i], "--message="))
1626 continue;
1627
1628 usage_with_options(git_stash_usage, options);
1629 }
1630 }
1631
1632 argv_array_push(&args, "push");
1633 argv_array_pushv(&args, argv);
1634 return !!push_stash(args.argc, args.argv, prefix);
1635 }