1 #define USE_THE_INDEX_VARIABLE
5 #include "parse-options.h"
8 #include "cache-tree.h"
9 #include "unpack-trees.h"
10 #include "merge-recursive.h"
11 #include "merge-ort-wrappers.h"
13 #include "run-command.h"
22 #include "add-interactive.h"
24 #define INCLUDE_ALL_FILES 2
26 #define BUILTIN_STASH_LIST_USAGE \
27 N_("git stash list [<log-options>]")
28 #define BUILTIN_STASH_SHOW_USAGE \
29 N_("git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]")
30 #define BUILTIN_STASH_DROP_USAGE \
31 N_("git stash drop [-q | --quiet] [<stash>]")
32 #define BUILTIN_STASH_POP_USAGE \
33 N_("git stash pop [--index] [-q | --quiet] [<stash>]")
34 #define BUILTIN_STASH_APPLY_USAGE \
35 N_("git stash apply [--index] [-q | --quiet] [<stash>]")
36 #define BUILTIN_STASH_BRANCH_USAGE \
37 N_("git stash branch <branchname> [<stash>]")
38 #define BUILTIN_STASH_STORE_USAGE \
39 N_("git stash store [(-m | --message) <message>] [-q | --quiet] <commit>")
40 #define BUILTIN_STASH_PUSH_USAGE \
41 N_("git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n" \
42 " [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n" \
43 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" \
44 " [--] [<pathspec>...]]")
45 #define BUILTIN_STASH_SAVE_USAGE \
46 N_("git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n" \
47 " [-u | --include-untracked] [-a | --all] [<message>]")
48 #define BUILTIN_STASH_CREATE_USAGE \
49 N_("git stash create [<message>]")
50 #define BUILTIN_STASH_CLEAR_USAGE \
53 static const char * const git_stash_usage
[] = {
54 BUILTIN_STASH_LIST_USAGE
,
55 BUILTIN_STASH_SHOW_USAGE
,
56 BUILTIN_STASH_DROP_USAGE
,
57 BUILTIN_STASH_POP_USAGE
,
58 BUILTIN_STASH_APPLY_USAGE
,
59 BUILTIN_STASH_BRANCH_USAGE
,
60 BUILTIN_STASH_PUSH_USAGE
,
61 BUILTIN_STASH_SAVE_USAGE
,
62 BUILTIN_STASH_CLEAR_USAGE
,
63 BUILTIN_STASH_CREATE_USAGE
,
64 BUILTIN_STASH_STORE_USAGE
,
68 static const char * const git_stash_list_usage
[] = {
69 BUILTIN_STASH_LIST_USAGE
,
73 static const char * const git_stash_show_usage
[] = {
74 BUILTIN_STASH_SHOW_USAGE
,
78 static const char * const git_stash_drop_usage
[] = {
79 BUILTIN_STASH_DROP_USAGE
,
83 static const char * const git_stash_pop_usage
[] = {
84 BUILTIN_STASH_POP_USAGE
,
88 static const char * const git_stash_apply_usage
[] = {
89 BUILTIN_STASH_APPLY_USAGE
,
93 static const char * const git_stash_branch_usage
[] = {
94 BUILTIN_STASH_BRANCH_USAGE
,
98 static const char * const git_stash_clear_usage
[] = {
99 BUILTIN_STASH_CLEAR_USAGE
,
103 static const char * const git_stash_store_usage
[] = {
104 BUILTIN_STASH_STORE_USAGE
,
108 static const char * const git_stash_push_usage
[] = {
109 BUILTIN_STASH_PUSH_USAGE
,
113 static const char * const git_stash_save_usage
[] = {
114 BUILTIN_STASH_SAVE_USAGE
,
118 static const char ref_stash
[] = "refs/stash";
119 static struct strbuf stash_index_path
= STRBUF_INIT
;
122 * w_commit is set to the commit containing the working tree
123 * b_commit is set to the base commit
124 * i_commit is set to the commit containing the index tree
125 * u_commit is set to the commit containing the untracked files tree
126 * w_tree is set to the working tree
127 * b_tree is set to the base tree
128 * i_tree is set to the index tree
129 * u_tree is set to the untracked files tree
132 struct object_id w_commit
;
133 struct object_id b_commit
;
134 struct object_id i_commit
;
135 struct object_id u_commit
;
136 struct object_id w_tree
;
137 struct object_id b_tree
;
138 struct object_id i_tree
;
139 struct object_id u_tree
;
140 struct strbuf revision
;
145 #define STASH_INFO_INIT { \
146 .revision = STRBUF_INIT, \
149 static void free_stash_info(struct stash_info
*info
)
151 strbuf_release(&info
->revision
);
154 static void assert_stash_like(struct stash_info
*info
, const char *revision
)
156 if (get_oidf(&info
->b_commit
, "%s^1", revision
) ||
157 get_oidf(&info
->w_tree
, "%s:", revision
) ||
158 get_oidf(&info
->b_tree
, "%s^1:", revision
) ||
159 get_oidf(&info
->i_tree
, "%s^2:", revision
))
160 die(_("'%s' is not a stash-like commit"), revision
);
163 static int get_stash_info(struct stash_info
*info
, int argc
, const char **argv
)
168 const char *revision
;
169 const char *commit
= NULL
;
170 struct object_id dummy
;
171 struct strbuf symbolic
= STRBUF_INIT
;
175 struct strbuf refs_msg
= STRBUF_INIT
;
177 for (i
= 0; i
< argc
; i
++)
178 strbuf_addf(&refs_msg
, " '%s'", argv
[i
]);
180 fprintf_ln(stderr
, _("Too many revisions specified:%s"),
182 strbuf_release(&refs_msg
);
191 if (!ref_exists(ref_stash
)) {
192 fprintf_ln(stderr
, _("No stash entries found."));
196 strbuf_addf(&info
->revision
, "%s@{0}", ref_stash
);
197 } else if (strspn(commit
, "0123456789") == strlen(commit
)) {
198 strbuf_addf(&info
->revision
, "%s@{%s}", ref_stash
, commit
);
200 strbuf_addstr(&info
->revision
, commit
);
203 revision
= info
->revision
.buf
;
205 if (get_oid(revision
, &info
->w_commit
))
206 return error(_("%s is not a valid reference"), revision
);
208 assert_stash_like(info
, revision
);
210 info
->has_u
= !get_oidf(&info
->u_tree
, "%s^3:", revision
);
212 end_of_rev
= strchrnul(revision
, '@');
213 strbuf_add(&symbolic
, revision
, end_of_rev
- revision
);
215 ret
= dwim_ref(symbolic
.buf
, symbolic
.len
, &dummy
, &expanded_ref
, 0);
216 strbuf_release(&symbolic
);
218 case 0: /* Not found, but valid ref */
219 info
->is_stash_ref
= 0;
222 info
->is_stash_ref
= !strcmp(expanded_ref
, ref_stash
);
224 default: /* Invalid or ambiguous */
229 return !(ret
== 0 || ret
== 1);
232 static int do_clear_stash(void)
234 struct object_id obj
;
235 if (get_oid(ref_stash
, &obj
))
238 return delete_ref(NULL
, ref_stash
, &obj
, 0);
241 static int clear_stash(int argc
, const char **argv
, const char *prefix
)
243 struct option options
[] = {
247 argc
= parse_options(argc
, argv
, prefix
, options
,
248 git_stash_clear_usage
,
249 PARSE_OPT_STOP_AT_NON_OPTION
);
252 return error(_("git stash clear with arguments is "
255 return do_clear_stash();
258 static int reset_tree(struct object_id
*i_tree
, int update
, int reset
)
261 struct unpack_trees_options opts
;
262 struct tree_desc t
[MAX_UNPACK_TREES
];
264 struct lock_file lock_file
= LOCK_INIT
;
266 repo_read_index_preload(the_repository
, NULL
, 0);
267 if (refresh_index(&the_index
, REFRESH_QUIET
, NULL
, NULL
, NULL
))
270 repo_hold_locked_index(the_repository
, &lock_file
, LOCK_DIE_ON_ERROR
);
272 memset(&opts
, 0, sizeof(opts
));
274 tree
= parse_tree_indirect(i_tree
);
275 if (parse_tree(tree
))
278 init_tree_desc(t
, tree
->buffer
, tree
->size
);
281 opts
.src_index
= &the_index
;
282 opts
.dst_index
= &the_index
;
284 opts
.reset
= reset
? UNPACK_RESET_PROTECT_UNTRACKED
: 0;
285 opts
.update
= update
;
287 opts
.preserve_ignored
= 0; /* FIXME: !overwrite_ignore */
288 opts
.fn
= oneway_merge
;
290 if (unpack_trees(nr_trees
, t
, &opts
))
293 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
294 return error(_("unable to write new index file"));
299 static int diff_tree_binary(struct strbuf
*out
, struct object_id
*w_commit
)
301 struct child_process cp
= CHILD_PROCESS_INIT
;
302 const char *w_commit_hex
= oid_to_hex(w_commit
);
305 * Diff-tree would not be very hard to replace with a native function,
306 * however it should be done together with apply_cached.
309 strvec_pushl(&cp
.args
, "diff-tree", "--binary", NULL
);
310 strvec_pushf(&cp
.args
, "%s^2^..%s^2", w_commit_hex
, w_commit_hex
);
312 return pipe_command(&cp
, NULL
, 0, out
, 0, NULL
, 0);
315 static int apply_cached(struct strbuf
*out
)
317 struct child_process cp
= CHILD_PROCESS_INIT
;
320 * Apply currently only reads either from stdin or a file, thus
321 * apply_all_patches would have to be updated to optionally take a
325 strvec_pushl(&cp
.args
, "apply", "--cached", NULL
);
326 return pipe_command(&cp
, out
->buf
, out
->len
, NULL
, 0, NULL
, 0);
329 static int reset_head(void)
331 struct child_process cp
= CHILD_PROCESS_INIT
;
334 * Reset is overall quite simple, however there is no current public
338 strvec_pushl(&cp
.args
, "reset", "--quiet", "--refresh", NULL
);
340 return run_command(&cp
);
343 static int is_path_a_directory(const char *path
)
346 * This function differs from abspath.c:is_directory() in that
347 * here we use lstat() instead of stat(); we do not want to
348 * follow symbolic links here.
351 return (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
));
354 static void add_diff_to_buf(struct diff_queue_struct
*q
,
355 struct diff_options
*options
,
360 for (i
= 0; i
< q
->nr
; i
++) {
361 if (is_path_a_directory(q
->queue
[i
]->one
->path
))
364 strbuf_addstr(data
, q
->queue
[i
]->one
->path
);
366 /* NUL-terminate: will be fed to update-index -z */
367 strbuf_addch(data
, '\0');
371 static int restore_untracked(struct object_id
*u_tree
)
374 struct child_process cp
= CHILD_PROCESS_INIT
;
377 * We need to run restore files from a given index, but without
378 * affecting the current index, so we use GIT_INDEX_FILE with
379 * run_command to fork processes that will not interfere.
382 strvec_push(&cp
.args
, "read-tree");
383 strvec_push(&cp
.args
, oid_to_hex(u_tree
));
384 strvec_pushf(&cp
.env
, "GIT_INDEX_FILE=%s",
385 stash_index_path
.buf
);
386 if (run_command(&cp
)) {
387 remove_path(stash_index_path
.buf
);
391 child_process_init(&cp
);
393 strvec_pushl(&cp
.args
, "checkout-index", "--all", NULL
);
394 strvec_pushf(&cp
.env
, "GIT_INDEX_FILE=%s",
395 stash_index_path
.buf
);
397 res
= run_command(&cp
);
398 remove_path(stash_index_path
.buf
);
402 static void unstage_changes_unless_new(struct object_id
*orig_tree
)
405 * When we enter this function, there has been a clean merge of
406 * relevant trees, and the merge logic always stages whatever merges
407 * cleanly. We want to unstage those changes, unless it corresponds
408 * to a file that didn't exist as of orig_tree.
410 * However, if any SKIP_WORKTREE path is modified relative to
411 * orig_tree, then we want to clear the SKIP_WORKTREE bit and write
412 * it to the worktree before unstaging.
415 struct checkout state
= CHECKOUT_INIT
;
416 struct diff_options diff_opts
;
417 struct lock_file lock
= LOCK_INIT
;
420 /* If any entries have skip_worktree set, we'll have to check 'em out */
423 state
.refresh_cache
= 1;
424 state
.istate
= &the_index
;
427 * Step 1: get a difference between orig_tree (which corresponding
428 * to the index before a merge was run) and the current index
429 * (reflecting the changes brought in by the merge).
431 diff_setup(&diff_opts
);
432 diff_opts
.flags
.recursive
= 1;
433 diff_opts
.detect_rename
= 0;
434 diff_opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
435 diff_setup_done(&diff_opts
);
437 do_diff_cache(orig_tree
, &diff_opts
);
438 diffcore_std(&diff_opts
);
440 /* Iterate over the paths that changed due to the merge... */
441 for (i
= 0; i
< diff_queued_diff
.nr
; i
++) {
442 struct diff_filepair
*p
;
443 struct cache_entry
*ce
;
446 /* Look up the path's position in the current index. */
447 p
= diff_queued_diff
.queue
[i
];
448 pos
= index_name_pos(&the_index
, p
->two
->path
,
449 strlen(p
->two
->path
));
452 * Step 2: Place changes in the working tree
454 * Stash is about restoring changes *to the working tree*.
455 * So if the merge successfully got a new version of some
456 * path, but left it out of the working tree, then clear the
457 * SKIP_WORKTREE bit and write it to the working tree.
459 if (pos
>= 0 && ce_skip_worktree(the_index
.cache
[pos
])) {
462 ce
= the_index
.cache
[pos
];
463 if (!lstat(ce
->name
, &st
)) {
464 /* Conflicting path present; relocate it */
465 struct strbuf new_path
= STRBUF_INIT
;
468 strbuf_addf(&new_path
,
469 "%s.stash.XXXXXX", ce
->name
);
470 fd
= xmkstemp(new_path
.buf
);
472 printf(_("WARNING: Untracked file in way of "
473 "tracked file! Renaming\n "
476 ce
->name
, new_path
.buf
);
477 if (rename(ce
->name
, new_path
.buf
))
478 die("Failed to move %s to %s\n",
479 ce
->name
, new_path
.buf
);
480 strbuf_release(&new_path
);
482 checkout_entry(ce
, &state
, NULL
, NULL
);
483 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
487 * Step 3: "unstage" changes, as long as they are still tracked
489 if (p
->one
->oid_valid
) {
491 * Path existed in orig_tree; restore index entry
492 * from that tree in order to "unstage" the changes.
494 int option
= ADD_CACHE_OK_TO_REPLACE
;
496 option
= ADD_CACHE_OK_TO_ADD
;
498 ce
= make_cache_entry(&the_index
,
503 add_index_entry(&the_index
, ce
, option
);
506 diff_flush(&diff_opts
);
509 * Step 4: write the new index to disk
511 repo_hold_locked_index(the_repository
, &lock
, LOCK_DIE_ON_ERROR
);
512 if (write_locked_index(&the_index
, &lock
,
513 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
514 die(_("Unable to write index."));
517 static int do_apply_stash(const char *prefix
, struct stash_info
*info
,
518 int index
, int quiet
)
521 int has_index
= index
;
522 struct merge_options o
;
523 struct object_id c_tree
;
524 struct object_id index_tree
;
525 struct tree
*head
, *merge
, *merge_base
;
526 struct lock_file lock
= LOCK_INIT
;
528 repo_read_index_preload(the_repository
, NULL
, 0);
529 if (repo_refresh_and_write_index(the_repository
, REFRESH_QUIET
, 0, 0,
533 if (write_index_as_tree(&c_tree
, &the_index
, get_index_file(), 0,
535 return error(_("cannot apply a stash in the middle of a merge"));
538 if (oideq(&info
->b_tree
, &info
->i_tree
) ||
539 oideq(&c_tree
, &info
->i_tree
)) {
542 struct strbuf out
= STRBUF_INIT
;
544 if (diff_tree_binary(&out
, &info
->w_commit
)) {
545 strbuf_release(&out
);
546 return error(_("could not generate diff %s^!."),
547 oid_to_hex(&info
->w_commit
));
550 ret
= apply_cached(&out
);
551 strbuf_release(&out
);
553 return error(_("conflicts in index. "
554 "Try without --index."));
556 discard_index(&the_index
);
557 repo_read_index(the_repository
);
558 if (write_index_as_tree(&index_tree
, &the_index
,
559 get_index_file(), 0, NULL
))
560 return error(_("could not save index tree"));
563 discard_index(&the_index
);
564 repo_read_index(the_repository
);
568 init_merge_options(&o
, the_repository
);
570 o
.branch1
= "Updated upstream";
571 o
.branch2
= "Stashed changes";
572 o
.ancestor
= "Stash base";
574 if (oideq(&info
->b_tree
, &c_tree
))
575 o
.branch1
= "Version stash was based on";
580 if (o
.verbosity
>= 3)
581 printf_ln(_("Merging %s with %s"), o
.branch1
, o
.branch2
);
583 head
= lookup_tree(o
.repo
, &c_tree
);
584 merge
= lookup_tree(o
.repo
, &info
->w_tree
);
585 merge_base
= lookup_tree(o
.repo
, &info
->b_tree
);
587 repo_hold_locked_index(o
.repo
, &lock
, LOCK_DIE_ON_ERROR
);
588 clean
= merge_ort_nonrecursive(&o
, head
, merge
, merge_base
);
591 * If 'clean' >= 0, reverse the value for 'ret' so 'ret' is 0 when the
592 * merge was clean, and nonzero if the merge was unclean or encountered
595 ret
= clean
>= 0 ? !clean
: clean
;
598 rollback_lock_file(&lock
);
599 else if (write_locked_index(o
.repo
->index
, &lock
,
600 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
601 ret
= error(_("could not write index"));
607 fprintf_ln(stderr
, _("Index was not unstashed."));
609 goto restore_untracked
;
613 if (reset_tree(&index_tree
, 0, 0))
616 unstage_changes_unless_new(&c_tree
);
620 if (info
->has_u
&& restore_untracked(&info
->u_tree
))
621 ret
= error(_("could not restore untracked files from stash"));
624 struct child_process cp
= CHILD_PROCESS_INIT
;
627 * Status is quite simple and could be replaced with calls to
628 * wt_status in the future, but it adds complexities which may
629 * require more tests.
633 strvec_pushf(&cp
.env
, GIT_WORK_TREE_ENVIRONMENT
"=%s",
634 absolute_path(get_git_work_tree()));
635 strvec_pushf(&cp
.env
, GIT_DIR_ENVIRONMENT
"=%s",
636 absolute_path(get_git_dir()));
637 strvec_push(&cp
.args
, "status");
644 static int apply_stash(int argc
, const char **argv
, const char *prefix
)
649 struct stash_info info
= STASH_INFO_INIT
;
650 struct option options
[] = {
651 OPT__QUIET(&quiet
, N_("be quiet, only report errors")),
652 OPT_BOOL(0, "index", &index
,
653 N_("attempt to recreate the index")),
657 argc
= parse_options(argc
, argv
, prefix
, options
,
658 git_stash_apply_usage
, 0);
660 if (get_stash_info(&info
, argc
, argv
))
663 ret
= do_apply_stash(prefix
, &info
, index
, quiet
);
665 free_stash_info(&info
);
669 static int reject_reflog_ent(struct object_id
*ooid UNUSED
,
670 struct object_id
*noid UNUSED
,
671 const char *email UNUSED
,
672 timestamp_t timestamp UNUSED
,
673 int tz UNUSED
, const char *message UNUSED
,
674 void *cb_data UNUSED
)
679 static int reflog_is_empty(const char *refname
)
681 return !for_each_reflog_ent(refname
, reject_reflog_ent
, NULL
);
684 static int do_drop_stash(struct stash_info
*info
, int quiet
)
686 if (!reflog_delete(info
->revision
.buf
,
687 EXPIRE_REFLOGS_REWRITE
| EXPIRE_REFLOGS_UPDATE_REF
,
690 printf_ln(_("Dropped %s (%s)"), info
->revision
.buf
,
691 oid_to_hex(&info
->w_commit
));
693 return error(_("%s: Could not drop stash entry"),
697 if (reflog_is_empty(ref_stash
))
703 static int get_stash_info_assert(struct stash_info
*info
, int argc
,
706 int ret
= get_stash_info(info
, argc
, argv
);
711 if (!info
->is_stash_ref
)
712 return error(_("'%s' is not a stash reference"), info
->revision
.buf
);
717 static int drop_stash(int argc
, const char **argv
, const char *prefix
)
721 struct stash_info info
= STASH_INFO_INIT
;
722 struct option options
[] = {
723 OPT__QUIET(&quiet
, N_("be quiet, only report errors")),
727 argc
= parse_options(argc
, argv
, prefix
, options
,
728 git_stash_drop_usage
, 0);
730 if (get_stash_info_assert(&info
, argc
, argv
))
733 ret
= do_drop_stash(&info
, quiet
);
735 free_stash_info(&info
);
739 static int pop_stash(int argc
, const char **argv
, const char *prefix
)
744 struct stash_info info
= STASH_INFO_INIT
;
745 struct option options
[] = {
746 OPT__QUIET(&quiet
, N_("be quiet, only report errors")),
747 OPT_BOOL(0, "index", &index
,
748 N_("attempt to recreate the index")),
752 argc
= parse_options(argc
, argv
, prefix
, options
,
753 git_stash_pop_usage
, 0);
755 if (get_stash_info_assert(&info
, argc
, argv
))
758 if ((ret
= do_apply_stash(prefix
, &info
, index
, quiet
)))
759 printf_ln(_("The stash entry is kept in case "
760 "you need it again."));
762 ret
= do_drop_stash(&info
, quiet
);
765 free_stash_info(&info
);
769 static int branch_stash(int argc
, const char **argv
, const char *prefix
)
772 const char *branch
= NULL
;
773 struct stash_info info
= STASH_INFO_INIT
;
774 struct child_process cp
= CHILD_PROCESS_INIT
;
775 struct option options
[] = {
779 argc
= parse_options(argc
, argv
, prefix
, options
,
780 git_stash_branch_usage
, 0);
783 fprintf_ln(stderr
, _("No branch name specified"));
789 if (get_stash_info(&info
, argc
- 1, argv
+ 1))
793 strvec_pushl(&cp
.args
, "checkout", "-b", NULL
);
794 strvec_push(&cp
.args
, branch
);
795 strvec_push(&cp
.args
, oid_to_hex(&info
.b_commit
));
796 ret
= run_command(&cp
);
798 ret
= do_apply_stash(prefix
, &info
, 1, 0);
799 if (!ret
&& info
.is_stash_ref
)
800 ret
= do_drop_stash(&info
, 0);
803 free_stash_info(&info
);
807 static int list_stash(int argc
, const char **argv
, const char *prefix
)
809 struct child_process cp
= CHILD_PROCESS_INIT
;
810 struct option options
[] = {
814 argc
= parse_options(argc
, argv
, prefix
, options
,
815 git_stash_list_usage
,
816 PARSE_OPT_KEEP_UNKNOWN_OPT
);
818 if (!ref_exists(ref_stash
))
822 strvec_pushl(&cp
.args
, "log", "--format=%gd: %gs", "-g",
823 "--first-parent", NULL
);
824 strvec_pushv(&cp
.args
, argv
);
825 strvec_push(&cp
.args
, ref_stash
);
826 strvec_push(&cp
.args
, "--");
827 return run_command(&cp
);
830 static int show_stat
= 1;
831 static int show_patch
;
832 static int show_include_untracked
;
834 static int git_stash_config(const char *var
, const char *value
, void *cb
)
836 if (!strcmp(var
, "stash.showstat")) {
837 show_stat
= git_config_bool(var
, value
);
840 if (!strcmp(var
, "stash.showpatch")) {
841 show_patch
= git_config_bool(var
, value
);
844 if (!strcmp(var
, "stash.showincludeuntracked")) {
845 show_include_untracked
= git_config_bool(var
, value
);
848 return git_diff_basic_config(var
, value
, cb
);
851 static void diff_include_untracked(const struct stash_info
*info
, struct diff_options
*diff_opt
)
853 const struct object_id
*oid
[] = { &info
->w_commit
, &info
->u_tree
};
854 struct tree
*tree
[ARRAY_SIZE(oid
)];
855 struct tree_desc tree_desc
[ARRAY_SIZE(oid
)];
856 struct unpack_trees_options unpack_tree_opt
= { 0 };
859 for (i
= 0; i
< ARRAY_SIZE(oid
); i
++) {
860 tree
[i
] = parse_tree_indirect(oid
[i
]);
861 if (parse_tree(tree
[i
]) < 0)
862 die(_("failed to parse tree"));
863 init_tree_desc(&tree_desc
[i
], tree
[i
]->buffer
, tree
[i
]->size
);
866 unpack_tree_opt
.head_idx
= -1;
867 unpack_tree_opt
.src_index
= &the_index
;
868 unpack_tree_opt
.dst_index
= &the_index
;
869 unpack_tree_opt
.merge
= 1;
870 unpack_tree_opt
.fn
= stash_worktree_untracked_merge
;
872 if (unpack_trees(ARRAY_SIZE(tree_desc
), tree_desc
, &unpack_tree_opt
))
873 die(_("failed to unpack trees"));
875 do_diff_cache(&info
->b_commit
, diff_opt
);
878 static int show_stash(int argc
, const char **argv
, const char *prefix
)
882 struct stash_info info
= STASH_INFO_INIT
;
884 struct strvec stash_args
= STRVEC_INIT
;
885 struct strvec revision_args
= STRVEC_INIT
;
890 } show_untracked
= show_include_untracked
? UNTRACKED_INCLUDE
: UNTRACKED_NONE
;
891 struct option options
[] = {
892 OPT_SET_INT('u', "include-untracked", &show_untracked
,
893 N_("include untracked files in the stash"),
895 OPT_SET_INT_F(0, "only-untracked", &show_untracked
,
896 N_("only show untracked files in the stash"),
897 UNTRACKED_ONLY
, PARSE_OPT_NONEG
),
902 init_diff_ui_defaults();
903 git_config(git_diff_ui_config
, NULL
);
904 init_revisions(&rev
, prefix
);
906 argc
= parse_options(argc
, argv
, prefix
, options
, git_stash_show_usage
,
907 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN_OPT
|
908 PARSE_OPT_KEEP_DASHDASH
);
910 strvec_push(&revision_args
, argv
[0]);
911 for (i
= 1; i
< argc
; i
++) {
912 if (argv
[i
][0] != '-')
913 strvec_push(&stash_args
, argv
[i
]);
915 strvec_push(&revision_args
, argv
[i
]);
918 if (get_stash_info(&info
, stash_args
.nr
, stash_args
.v
))
922 * The config settings are applied only if there are not passed
925 if (revision_args
.nr
== 1) {
927 rev
.diffopt
.output_format
= DIFF_FORMAT_DIFFSTAT
;
930 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
932 if (!show_stat
&& !show_patch
) {
938 argc
= setup_revisions(revision_args
.nr
, revision_args
.v
, &rev
, NULL
);
941 if (!rev
.diffopt
.output_format
) {
942 rev
.diffopt
.output_format
= DIFF_FORMAT_PATCH
;
943 diff_setup_done(&rev
.diffopt
);
946 rev
.diffopt
.flags
.recursive
= 1;
947 setup_diff_pager(&rev
.diffopt
);
948 switch (show_untracked
) {
950 diff_tree_oid(&info
.b_commit
, &info
.w_commit
, "", &rev
.diffopt
);
954 diff_root_tree_oid(&info
.u_tree
, "", &rev
.diffopt
);
956 case UNTRACKED_INCLUDE
:
958 diff_include_untracked(&info
, &rev
.diffopt
);
960 diff_tree_oid(&info
.b_commit
, &info
.w_commit
, "", &rev
.diffopt
);
963 log_tree_diff_flush(&rev
);
965 ret
= diff_result_code(&rev
.diffopt
, 0);
967 strvec_clear(&stash_args
);
968 free_stash_info(&info
);
969 release_revisions(&rev
);
971 usage_with_options(git_stash_show_usage
, options
);
978 static int do_store_stash(const struct object_id
*w_commit
, const char *stash_msg
,
982 stash_msg
= "Created via \"git stash store\".";
984 if (update_ref(stash_msg
, ref_stash
, w_commit
, NULL
,
985 REF_FORCE_CREATE_REFLOG
,
986 quiet
? UPDATE_REFS_QUIET_ON_ERR
:
987 UPDATE_REFS_MSG_ON_ERR
)) {
989 fprintf_ln(stderr
, _("Cannot update %s with %s"),
990 ref_stash
, oid_to_hex(w_commit
));
998 static int store_stash(int argc
, const char **argv
, const char *prefix
)
1001 const char *stash_msg
= NULL
;
1002 struct object_id obj
;
1003 struct object_context dummy
;
1004 struct option options
[] = {
1005 OPT__QUIET(&quiet
, N_("be quiet")),
1006 OPT_STRING('m', "message", &stash_msg
, "message",
1007 N_("stash message")),
1011 argc
= parse_options(argc
, argv
, prefix
, options
,
1012 git_stash_store_usage
,
1013 PARSE_OPT_KEEP_UNKNOWN_OPT
);
1017 fprintf_ln(stderr
, _("\"git stash store\" requires one "
1018 "<commit> argument"));
1022 if (get_oid_with_context(the_repository
,
1023 argv
[0], quiet
? GET_OID_QUIETLY
: 0, &obj
,
1026 fprintf_ln(stderr
, _("Cannot update %s with %s"),
1027 ref_stash
, argv
[0]);
1031 return do_store_stash(&obj
, stash_msg
, quiet
);
1034 static void add_pathspecs(struct strvec
*args
,
1035 const struct pathspec
*ps
) {
1038 for (i
= 0; i
< ps
->nr
; i
++)
1039 strvec_push(args
, ps
->items
[i
].original
);
1043 * `untracked_files` will be filled with the names of untracked files.
1044 * The return value is:
1046 * = 0 if there are not any untracked files
1047 * > 0 if there are untracked files
1049 static int get_untracked_files(const struct pathspec
*ps
, int include_untracked
,
1050 struct strbuf
*untracked_files
)
1054 struct dir_struct dir
= DIR_INIT
;
1056 if (include_untracked
!= INCLUDE_ALL_FILES
)
1057 setup_standard_excludes(&dir
);
1059 fill_directory(&dir
, the_repository
->index
, ps
);
1060 for (i
= 0; i
< dir
.nr
; i
++) {
1061 struct dir_entry
*ent
= dir
.entries
[i
];
1063 strbuf_addstr(untracked_files
, ent
->name
);
1064 /* NUL-terminate: will be fed to update-index -z */
1065 strbuf_addch(untracked_files
, '\0');
1073 * The return value of `check_changes_tracked_files()` can be:
1075 * < 0 if there was an error
1076 * = 0 if there are no changes.
1077 * > 0 if there are changes.
1079 static int check_changes_tracked_files(const struct pathspec
*ps
)
1082 struct rev_info rev
;
1083 struct object_id dummy
;
1086 /* No initial commit. */
1087 if (get_oid("HEAD", &dummy
))
1090 if (repo_read_index(the_repository
) < 0)
1093 init_revisions(&rev
, NULL
);
1094 copy_pathspec(&rev
.prune_data
, ps
);
1096 rev
.diffopt
.flags
.quick
= 1;
1097 rev
.diffopt
.flags
.ignore_submodules
= 1;
1100 add_head_to_pending(&rev
);
1101 diff_setup_done(&rev
.diffopt
);
1103 result
= run_diff_index(&rev
, 1);
1104 if (diff_result_code(&rev
.diffopt
, result
)) {
1109 result
= run_diff_files(&rev
, 0);
1110 if (diff_result_code(&rev
.diffopt
, result
)) {
1116 release_revisions(&rev
);
1121 * The function will fill `untracked_files` with the names of untracked files
1122 * It will return 1 if there were any changes and 0 if there were not.
1124 static int check_changes(const struct pathspec
*ps
, int include_untracked
,
1125 struct strbuf
*untracked_files
)
1128 if (check_changes_tracked_files(ps
))
1131 if (include_untracked
&& get_untracked_files(ps
, include_untracked
,
1138 static int save_untracked_files(struct stash_info
*info
, struct strbuf
*msg
,
1139 struct strbuf files
)
1142 struct strbuf untracked_msg
= STRBUF_INIT
;
1143 struct child_process cp_upd_index
= CHILD_PROCESS_INIT
;
1144 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1146 cp_upd_index
.git_cmd
= 1;
1147 strvec_pushl(&cp_upd_index
.args
, "update-index", "-z", "--add",
1148 "--remove", "--stdin", NULL
);
1149 strvec_pushf(&cp_upd_index
.env
, "GIT_INDEX_FILE=%s",
1150 stash_index_path
.buf
);
1152 strbuf_addf(&untracked_msg
, "untracked files on %s\n", msg
->buf
);
1153 if (pipe_command(&cp_upd_index
, files
.buf
, files
.len
, NULL
, 0,
1159 if (write_index_as_tree(&info
->u_tree
, &istate
, stash_index_path
.buf
, 0,
1165 if (commit_tree(untracked_msg
.buf
, untracked_msg
.len
,
1166 &info
->u_tree
, NULL
, &info
->u_commit
, NULL
, NULL
)) {
1172 release_index(&istate
);
1173 strbuf_release(&untracked_msg
);
1174 remove_path(stash_index_path
.buf
);
1178 static int stash_staged(struct stash_info
*info
, struct strbuf
*out_patch
,
1182 struct child_process cp_diff_tree
= CHILD_PROCESS_INIT
;
1183 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1185 if (write_index_as_tree(&info
->w_tree
, &istate
, the_repository
->index_file
,
1191 cp_diff_tree
.git_cmd
= 1;
1192 strvec_pushl(&cp_diff_tree
.args
, "diff-tree", "-p", "-U1", "HEAD",
1193 oid_to_hex(&info
->w_tree
), "--", NULL
);
1194 if (pipe_command(&cp_diff_tree
, NULL
, 0, out_patch
, 0, NULL
, 0)) {
1199 if (!out_patch
->len
) {
1201 fprintf_ln(stderr
, _("No staged changes"));
1206 release_index(&istate
);
1210 static int stash_patch(struct stash_info
*info
, const struct pathspec
*ps
,
1211 struct strbuf
*out_patch
, int quiet
)
1214 struct child_process cp_read_tree
= CHILD_PROCESS_INIT
;
1215 struct child_process cp_diff_tree
= CHILD_PROCESS_INIT
;
1216 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1217 char *old_index_env
= NULL
, *old_repo_index_file
;
1219 remove_path(stash_index_path
.buf
);
1221 cp_read_tree
.git_cmd
= 1;
1222 strvec_pushl(&cp_read_tree
.args
, "read-tree", "HEAD", NULL
);
1223 strvec_pushf(&cp_read_tree
.env
, "GIT_INDEX_FILE=%s",
1224 stash_index_path
.buf
);
1225 if (run_command(&cp_read_tree
)) {
1230 /* Find out what the user wants. */
1231 old_repo_index_file
= the_repository
->index_file
;
1232 the_repository
->index_file
= stash_index_path
.buf
;
1233 old_index_env
= xstrdup_or_null(getenv(INDEX_ENVIRONMENT
));
1234 setenv(INDEX_ENVIRONMENT
, the_repository
->index_file
, 1);
1236 ret
= !!run_add_p(the_repository
, ADD_P_STASH
, NULL
, ps
);
1238 the_repository
->index_file
= old_repo_index_file
;
1239 if (old_index_env
&& *old_index_env
)
1240 setenv(INDEX_ENVIRONMENT
, old_index_env
, 1);
1242 unsetenv(INDEX_ENVIRONMENT
);
1243 FREE_AND_NULL(old_index_env
);
1245 /* State of the working tree. */
1246 if (write_index_as_tree(&info
->w_tree
, &istate
, stash_index_path
.buf
, 0,
1252 cp_diff_tree
.git_cmd
= 1;
1253 strvec_pushl(&cp_diff_tree
.args
, "diff-tree", "-p", "-U1", "HEAD",
1254 oid_to_hex(&info
->w_tree
), "--", NULL
);
1255 if (pipe_command(&cp_diff_tree
, NULL
, 0, out_patch
, 0, NULL
, 0)) {
1260 if (!out_patch
->len
) {
1262 fprintf_ln(stderr
, _("No changes selected"));
1267 release_index(&istate
);
1268 remove_path(stash_index_path
.buf
);
1272 static int stash_working_tree(struct stash_info
*info
, const struct pathspec
*ps
)
1275 struct rev_info rev
;
1276 struct child_process cp_upd_index
= CHILD_PROCESS_INIT
;
1277 struct strbuf diff_output
= STRBUF_INIT
;
1278 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1280 init_revisions(&rev
, NULL
);
1281 copy_pathspec(&rev
.prune_data
, ps
);
1283 set_alternate_index_output(stash_index_path
.buf
);
1284 if (reset_tree(&info
->i_tree
, 0, 0)) {
1288 set_alternate_index_output(NULL
);
1290 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
1291 rev
.diffopt
.format_callback
= add_diff_to_buf
;
1292 rev
.diffopt
.format_callback_data
= &diff_output
;
1294 if (repo_read_index_preload(the_repository
, &rev
.diffopt
.pathspec
, 0) < 0) {
1299 add_pending_object(&rev
, parse_object(the_repository
, &info
->b_commit
),
1301 if (run_diff_index(&rev
, 0)) {
1306 cp_upd_index
.git_cmd
= 1;
1307 strvec_pushl(&cp_upd_index
.args
, "update-index",
1308 "--ignore-skip-worktree-entries",
1309 "-z", "--add", "--remove", "--stdin", NULL
);
1310 strvec_pushf(&cp_upd_index
.env
, "GIT_INDEX_FILE=%s",
1311 stash_index_path
.buf
);
1313 if (pipe_command(&cp_upd_index
, diff_output
.buf
, diff_output
.len
,
1314 NULL
, 0, NULL
, 0)) {
1319 if (write_index_as_tree(&info
->w_tree
, &istate
, stash_index_path
.buf
, 0,
1326 release_index(&istate
);
1327 release_revisions(&rev
);
1328 strbuf_release(&diff_output
);
1329 remove_path(stash_index_path
.buf
);
1333 static int do_create_stash(const struct pathspec
*ps
, struct strbuf
*stash_msg_buf
,
1334 int include_untracked
, int patch_mode
, int only_staged
,
1335 struct stash_info
*info
, struct strbuf
*patch
,
1340 int untracked_commit_option
= 0;
1341 const char *head_short_sha1
= NULL
;
1342 const char *branch_ref
= NULL
;
1343 const char *branch_name
= "(no branch)";
1344 struct commit
*head_commit
= NULL
;
1345 struct commit_list
*parents
= NULL
;
1346 struct strbuf msg
= STRBUF_INIT
;
1347 struct strbuf commit_tree_label
= STRBUF_INIT
;
1348 struct strbuf untracked_files
= STRBUF_INIT
;
1350 prepare_fallback_ident("git stash", "git@stash");
1352 repo_read_index_preload(the_repository
, NULL
, 0);
1353 if (repo_refresh_and_write_index(the_repository
, REFRESH_QUIET
, 0, 0,
1354 NULL
, NULL
, NULL
) < 0) {
1359 if (get_oid("HEAD", &info
->b_commit
)) {
1361 fprintf_ln(stderr
, _("You do not have "
1362 "the initial commit yet"));
1366 head_commit
= lookup_commit(the_repository
, &info
->b_commit
);
1369 if (!check_changes(ps
, include_untracked
, &untracked_files
)) {
1374 branch_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flags
);
1375 if (flags
& REF_ISSYMREF
)
1376 skip_prefix(branch_ref
, "refs/heads/", &branch_name
);
1377 head_short_sha1
= find_unique_abbrev(&head_commit
->object
.oid
,
1379 strbuf_addf(&msg
, "%s: %s ", branch_name
, head_short_sha1
);
1380 pp_commit_easy(CMIT_FMT_ONELINE
, head_commit
, &msg
);
1382 strbuf_addf(&commit_tree_label
, "index on %s\n", msg
.buf
);
1383 commit_list_insert(head_commit
, &parents
);
1384 if (write_index_as_tree(&info
->i_tree
, &the_index
, get_index_file(), 0,
1386 commit_tree(commit_tree_label
.buf
, commit_tree_label
.len
,
1387 &info
->i_tree
, parents
, &info
->i_commit
, NULL
, NULL
)) {
1389 fprintf_ln(stderr
, _("Cannot save the current "
1395 if (include_untracked
) {
1396 if (save_untracked_files(info
, &msg
, untracked_files
)) {
1398 fprintf_ln(stderr
, _("Cannot save "
1399 "the untracked files"));
1403 untracked_commit_option
= 1;
1406 ret
= stash_patch(info
, ps
, patch
, quiet
);
1409 fprintf_ln(stderr
, _("Cannot save the current "
1412 } else if (ret
> 0) {
1415 } else if (only_staged
) {
1416 ret
= stash_staged(info
, patch
, quiet
);
1419 fprintf_ln(stderr
, _("Cannot save the current "
1422 } else if (ret
> 0) {
1426 if (stash_working_tree(info
, ps
)) {
1428 fprintf_ln(stderr
, _("Cannot save the current "
1435 if (!stash_msg_buf
->len
)
1436 strbuf_addf(stash_msg_buf
, "WIP on %s", msg
.buf
);
1438 strbuf_insertf(stash_msg_buf
, 0, "On %s: ", branch_name
);
1441 * `parents` will be empty after calling `commit_tree()`, so there is
1442 * no need to call `free_commit_list()`
1445 if (untracked_commit_option
)
1446 commit_list_insert(lookup_commit(the_repository
,
1449 commit_list_insert(lookup_commit(the_repository
, &info
->i_commit
),
1451 commit_list_insert(head_commit
, &parents
);
1453 if (commit_tree(stash_msg_buf
->buf
, stash_msg_buf
->len
, &info
->w_tree
,
1454 parents
, &info
->w_commit
, NULL
, NULL
)) {
1456 fprintf_ln(stderr
, _("Cannot record "
1457 "working tree state"));
1463 strbuf_release(&commit_tree_label
);
1464 strbuf_release(&msg
);
1465 strbuf_release(&untracked_files
);
1469 static int create_stash(int argc
, const char **argv
, const char *prefix
)
1472 struct strbuf stash_msg_buf
= STRBUF_INIT
;
1473 struct stash_info info
= STASH_INFO_INIT
;
1476 /* Starting with argv[1], since argv[0] is "create" */
1477 strbuf_join_argv(&stash_msg_buf
, argc
- 1, ++argv
, ' ');
1479 memset(&ps
, 0, sizeof(ps
));
1480 if (!check_changes_tracked_files(&ps
))
1483 ret
= do_create_stash(&ps
, &stash_msg_buf
, 0, 0, 0, &info
,
1486 printf_ln("%s", oid_to_hex(&info
.w_commit
));
1488 free_stash_info(&info
);
1489 strbuf_release(&stash_msg_buf
);
1493 static int do_push_stash(const struct pathspec
*ps
, const char *stash_msg
, int quiet
,
1494 int keep_index
, int patch_mode
, int include_untracked
, int only_staged
)
1497 struct stash_info info
= STASH_INFO_INIT
;
1498 struct strbuf patch
= STRBUF_INIT
;
1499 struct strbuf stash_msg_buf
= STRBUF_INIT
;
1500 struct strbuf untracked_files
= STRBUF_INIT
;
1502 if (patch_mode
&& keep_index
== -1)
1505 if (patch_mode
&& include_untracked
) {
1506 fprintf_ln(stderr
, _("Can't use --patch and --include-untracked"
1507 " or --all at the same time"));
1512 /* --patch overrides --staged */
1516 if (only_staged
&& include_untracked
) {
1517 fprintf_ln(stderr
, _("Can't use --staged and --include-untracked"
1518 " or --all at the same time"));
1523 repo_read_index_preload(the_repository
, NULL
, 0);
1524 if (!include_untracked
&& ps
->nr
) {
1526 char *ps_matched
= xcalloc(ps
->nr
, 1);
1528 /* TODO: audit for interaction with sparse-index. */
1529 ensure_full_index(&the_index
);
1530 for (i
= 0; i
< the_index
.cache_nr
; i
++)
1531 ce_path_match(&the_index
, the_index
.cache
[i
], ps
,
1534 if (report_path_error(ps_matched
, ps
)) {
1535 fprintf_ln(stderr
, _("Did you forget to 'git add'?"));
1543 if (repo_refresh_and_write_index(the_repository
, REFRESH_QUIET
, 0, 0,
1544 NULL
, NULL
, NULL
)) {
1549 if (!check_changes(ps
, include_untracked
, &untracked_files
)) {
1551 printf_ln(_("No local changes to save"));
1555 if (!reflog_exists(ref_stash
) && do_clear_stash()) {
1558 fprintf_ln(stderr
, _("Cannot initialize stash"));
1563 strbuf_addstr(&stash_msg_buf
, stash_msg
);
1564 if (do_create_stash(ps
, &stash_msg_buf
, include_untracked
, patch_mode
, only_staged
,
1565 &info
, &patch
, quiet
)) {
1570 if (do_store_stash(&info
.w_commit
, stash_msg_buf
.buf
, 1)) {
1573 fprintf_ln(stderr
, _("Cannot save the current status"));
1578 printf_ln(_("Saved working directory and index state %s"),
1581 if (!(patch_mode
|| only_staged
)) {
1582 if (include_untracked
&& !ps
->nr
) {
1583 struct child_process cp
= CHILD_PROCESS_INIT
;
1586 if (startup_info
->original_cwd
) {
1587 cp
.dir
= startup_info
->original_cwd
;
1588 strvec_pushf(&cp
.env
, "%s=%s",
1589 GIT_WORK_TREE_ENVIRONMENT
,
1590 the_repository
->worktree
);
1592 strvec_pushl(&cp
.args
, "clean", "--force",
1593 "--quiet", "-d", ":/", NULL
);
1594 if (include_untracked
== INCLUDE_ALL_FILES
)
1595 strvec_push(&cp
.args
, "-x");
1596 if (run_command(&cp
)) {
1601 discard_index(&the_index
);
1603 struct child_process cp_add
= CHILD_PROCESS_INIT
;
1604 struct child_process cp_diff
= CHILD_PROCESS_INIT
;
1605 struct child_process cp_apply
= CHILD_PROCESS_INIT
;
1606 struct strbuf out
= STRBUF_INIT
;
1609 strvec_push(&cp_add
.args
, "add");
1610 if (!include_untracked
)
1611 strvec_push(&cp_add
.args
, "-u");
1612 if (include_untracked
== INCLUDE_ALL_FILES
)
1613 strvec_push(&cp_add
.args
, "--force");
1614 strvec_push(&cp_add
.args
, "--");
1615 add_pathspecs(&cp_add
.args
, ps
);
1616 if (run_command(&cp_add
)) {
1621 cp_diff
.git_cmd
= 1;
1622 strvec_pushl(&cp_diff
.args
, "diff-index", "-p",
1623 "--cached", "--binary", "HEAD", "--",
1625 add_pathspecs(&cp_diff
.args
, ps
);
1626 if (pipe_command(&cp_diff
, NULL
, 0, &out
, 0, NULL
, 0)) {
1631 cp_apply
.git_cmd
= 1;
1632 strvec_pushl(&cp_apply
.args
, "apply", "--index",
1634 if (pipe_command(&cp_apply
, out
.buf
, out
.len
, NULL
, 0,
1640 struct child_process cp
= CHILD_PROCESS_INIT
;
1642 /* BUG: this nukes untracked files in the way */
1643 strvec_pushl(&cp
.args
, "reset", "--hard", "-q",
1644 "--no-recurse-submodules", NULL
);
1645 if (run_command(&cp
)) {
1651 if (keep_index
== 1 && !is_null_oid(&info
.i_tree
)) {
1652 struct child_process cp
= CHILD_PROCESS_INIT
;
1655 strvec_pushl(&cp
.args
, "checkout", "--no-overlay",
1656 oid_to_hex(&info
.i_tree
), "--", NULL
);
1658 strvec_push(&cp
.args
, ":/");
1660 add_pathspecs(&cp
.args
, ps
);
1661 if (run_command(&cp
)) {
1668 struct child_process cp
= CHILD_PROCESS_INIT
;
1671 strvec_pushl(&cp
.args
, "apply", "-R", NULL
);
1673 if (pipe_command(&cp
, patch
.buf
, patch
.len
, NULL
, 0, NULL
, 0)) {
1675 fprintf_ln(stderr
, _("Cannot remove "
1676 "worktree changes"));
1681 if (keep_index
< 1) {
1682 struct child_process cp
= CHILD_PROCESS_INIT
;
1685 strvec_pushl(&cp
.args
, "reset", "-q", "--refresh", "--",
1687 add_pathspecs(&cp
.args
, ps
);
1688 if (run_command(&cp
)) {
1697 strbuf_release(&patch
);
1698 free_stash_info(&info
);
1699 strbuf_release(&stash_msg_buf
);
1700 strbuf_release(&untracked_files
);
1704 static int push_stash(int argc
, const char **argv
, const char *prefix
,
1707 int force_assume
= 0;
1708 int keep_index
= -1;
1709 int only_staged
= 0;
1711 int include_untracked
= 0;
1713 int pathspec_file_nul
= 0;
1714 const char *stash_msg
= NULL
;
1715 const char *pathspec_from_file
= NULL
;
1717 struct option options
[] = {
1718 OPT_BOOL('k', "keep-index", &keep_index
,
1720 OPT_BOOL('S', "staged", &only_staged
,
1721 N_("stash staged changes only")),
1722 OPT_BOOL('p', "patch", &patch_mode
,
1723 N_("stash in patch mode")),
1724 OPT__QUIET(&quiet
, N_("quiet mode")),
1725 OPT_BOOL('u', "include-untracked", &include_untracked
,
1726 N_("include untracked files in stash")),
1727 OPT_SET_INT('a', "all", &include_untracked
,
1728 N_("include ignore files"), 2),
1729 OPT_STRING('m', "message", &stash_msg
, N_("message"),
1730 N_("stash message")),
1731 OPT_PATHSPEC_FROM_FILE(&pathspec_from_file
),
1732 OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul
),
1738 force_assume
= !strcmp(argv
[0], "-p");
1739 argc
= parse_options(argc
, argv
, prefix
, options
,
1740 push_assumed
? git_stash_usage
:
1741 git_stash_push_usage
,
1742 PARSE_OPT_KEEP_DASHDASH
);
1746 if (!strcmp(argv
[0], "--")) {
1749 } else if (push_assumed
&& !force_assume
) {
1750 die("subcommand wasn't specified; 'push' can't be assumed due to unexpected token '%s'",
1755 parse_pathspec(&ps
, 0, PATHSPEC_PREFER_FULL
| PATHSPEC_PREFIX_ORIGIN
,
1758 if (pathspec_from_file
) {
1760 die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
1763 die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--staged");
1766 die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
1768 parse_pathspec_file(&ps
, 0,
1769 PATHSPEC_PREFER_FULL
| PATHSPEC_PREFIX_ORIGIN
,
1770 prefix
, pathspec_from_file
, pathspec_file_nul
);
1771 } else if (pathspec_file_nul
) {
1772 die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
1775 ret
= do_push_stash(&ps
, stash_msg
, quiet
, keep_index
, patch_mode
,
1776 include_untracked
, only_staged
);
1777 clear_pathspec(&ps
);
1781 static int push_stash_unassumed(int argc
, const char **argv
, const char *prefix
)
1783 return push_stash(argc
, argv
, prefix
, 0);
1786 static int save_stash(int argc
, const char **argv
, const char *prefix
)
1788 int keep_index
= -1;
1789 int only_staged
= 0;
1791 int include_untracked
= 0;
1794 const char *stash_msg
= NULL
;
1796 struct strbuf stash_msg_buf
= STRBUF_INIT
;
1797 struct option options
[] = {
1798 OPT_BOOL('k', "keep-index", &keep_index
,
1800 OPT_BOOL('S', "staged", &only_staged
,
1801 N_("stash staged changes only")),
1802 OPT_BOOL('p', "patch", &patch_mode
,
1803 N_("stash in patch mode")),
1804 OPT__QUIET(&quiet
, N_("quiet mode")),
1805 OPT_BOOL('u', "include-untracked", &include_untracked
,
1806 N_("include untracked files in stash")),
1807 OPT_SET_INT('a', "all", &include_untracked
,
1808 N_("include ignore files"), 2),
1809 OPT_STRING('m', "message", &stash_msg
, "message",
1810 N_("stash message")),
1814 argc
= parse_options(argc
, argv
, prefix
, options
,
1815 git_stash_save_usage
,
1816 PARSE_OPT_KEEP_DASHDASH
);
1819 stash_msg
= strbuf_join_argv(&stash_msg_buf
, argc
, argv
, ' ');
1821 memset(&ps
, 0, sizeof(ps
));
1822 ret
= do_push_stash(&ps
, stash_msg
, quiet
, keep_index
,
1823 patch_mode
, include_untracked
, only_staged
);
1825 strbuf_release(&stash_msg_buf
);
1829 int cmd_stash(int argc
, const char **argv
, const char *prefix
)
1831 pid_t pid
= getpid();
1832 const char *index_file
;
1833 struct strvec args
= STRVEC_INIT
;
1834 parse_opt_subcommand_fn
*fn
= NULL
;
1835 struct option options
[] = {
1836 OPT_SUBCOMMAND("apply", &fn
, apply_stash
),
1837 OPT_SUBCOMMAND("clear", &fn
, clear_stash
),
1838 OPT_SUBCOMMAND("drop", &fn
, drop_stash
),
1839 OPT_SUBCOMMAND("pop", &fn
, pop_stash
),
1840 OPT_SUBCOMMAND("branch", &fn
, branch_stash
),
1841 OPT_SUBCOMMAND("list", &fn
, list_stash
),
1842 OPT_SUBCOMMAND("show", &fn
, show_stash
),
1843 OPT_SUBCOMMAND("store", &fn
, store_stash
),
1844 OPT_SUBCOMMAND("create", &fn
, create_stash
),
1845 OPT_SUBCOMMAND("push", &fn
, push_stash_unassumed
),
1846 OPT_SUBCOMMAND_F("save", &fn
, save_stash
, PARSE_OPT_NOCOMPLETE
),
1850 git_config(git_stash_config
, NULL
);
1852 argc
= parse_options(argc
, argv
, prefix
, options
, git_stash_usage
,
1853 PARSE_OPT_SUBCOMMAND_OPTIONAL
|
1854 PARSE_OPT_KEEP_UNKNOWN_OPT
|
1855 PARSE_OPT_KEEP_DASHDASH
);
1857 prepare_repo_settings(the_repository
);
1858 the_repository
->settings
.command_requires_full_index
= 0;
1860 index_file
= get_index_file();
1861 strbuf_addf(&stash_index_path
, "%s.stash.%" PRIuMAX
, index_file
,
1865 return !!fn(argc
, argv
, prefix
);
1867 return !!push_stash_unassumed(0, NULL
, prefix
);
1869 /* Assume 'stash push' */
1870 strvec_push(&args
, "push");
1871 strvec_pushv(&args
, argv
);
1872 return !!push_stash(args
.nr
, args
.v
, prefix
, 1);