1 #define USE_THE_INDEX_VARIABLE
5 #include "environment.h"
9 #include "object-name.h"
10 #include "parse-options.h"
13 #include "cache-tree.h"
14 #include "unpack-trees.h"
15 #include "merge-recursive.h"
16 #include "merge-ort-wrappers.h"
18 #include "run-command.h"
21 #include "preload-index.h"
22 #include "read-cache.h"
26 #include "sparse-index.h"
31 #include "add-interactive.h"
33 #define INCLUDE_ALL_FILES 2
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 \
62 static const char * const git_stash_usage
[] = {
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
,
77 static const char * const git_stash_list_usage
[] = {
78 BUILTIN_STASH_LIST_USAGE
,
82 static const char * const git_stash_show_usage
[] = {
83 BUILTIN_STASH_SHOW_USAGE
,
87 static const char * const git_stash_drop_usage
[] = {
88 BUILTIN_STASH_DROP_USAGE
,
92 static const char * const git_stash_pop_usage
[] = {
93 BUILTIN_STASH_POP_USAGE
,
97 static const char * const git_stash_apply_usage
[] = {
98 BUILTIN_STASH_APPLY_USAGE
,
102 static const char * const git_stash_branch_usage
[] = {
103 BUILTIN_STASH_BRANCH_USAGE
,
107 static const char * const git_stash_clear_usage
[] = {
108 BUILTIN_STASH_CLEAR_USAGE
,
112 static const char * const git_stash_store_usage
[] = {
113 BUILTIN_STASH_STORE_USAGE
,
117 static const char * const git_stash_push_usage
[] = {
118 BUILTIN_STASH_PUSH_USAGE
,
122 static const char * const git_stash_save_usage
[] = {
123 BUILTIN_STASH_SAVE_USAGE
,
127 static const char ref_stash
[] = "refs/stash";
128 static struct strbuf stash_index_path
= STRBUF_INIT
;
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
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
;
154 #define STASH_INFO_INIT { \
155 .revision = STRBUF_INIT, \
158 static void free_stash_info(struct stash_info
*info
)
160 strbuf_release(&info
->revision
);
163 static void assert_stash_like(struct stash_info
*info
, const char *revision
)
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
);
172 static int get_stash_info(struct stash_info
*info
, int argc
, const char **argv
)
177 const char *revision
;
178 const char *commit
= NULL
;
179 struct object_id dummy
;
180 struct strbuf symbolic
= STRBUF_INIT
;
184 struct strbuf refs_msg
= STRBUF_INIT
;
186 for (i
= 0; i
< argc
; i
++)
187 strbuf_addf(&refs_msg
, " '%s'", argv
[i
]);
189 fprintf_ln(stderr
, _("Too many revisions specified:%s"),
191 strbuf_release(&refs_msg
);
200 if (!ref_exists(ref_stash
)) {
201 fprintf_ln(stderr
, _("No stash entries found."));
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
);
209 strbuf_addstr(&info
->revision
, commit
);
212 revision
= info
->revision
.buf
;
214 if (repo_get_oid(the_repository
, revision
, &info
->w_commit
))
215 return error(_("%s is not a valid reference"), revision
);
217 assert_stash_like(info
, revision
);
219 info
->has_u
= !get_oidf(&info
->u_tree
, "%s^3:", revision
);
221 end_of_rev
= strchrnul(revision
, '@');
222 strbuf_add(&symbolic
, revision
, end_of_rev
- revision
);
224 ret
= repo_dwim_ref(the_repository
, symbolic
.buf
, symbolic
.len
,
225 &dummy
, &expanded_ref
, 0);
226 strbuf_release(&symbolic
);
228 case 0: /* Not found, but valid ref */
229 info
->is_stash_ref
= 0;
232 info
->is_stash_ref
= !strcmp(expanded_ref
, ref_stash
);
234 default: /* Invalid or ambiguous */
239 return !(ret
== 0 || ret
== 1);
242 static int do_clear_stash(void)
244 struct object_id obj
;
245 if (repo_get_oid(the_repository
, ref_stash
, &obj
))
248 return delete_ref(NULL
, ref_stash
, &obj
, 0);
251 static int clear_stash(int argc
, const char **argv
, const char *prefix
)
253 struct option options
[] = {
257 argc
= parse_options(argc
, argv
, prefix
, options
,
258 git_stash_clear_usage
,
259 PARSE_OPT_STOP_AT_NON_OPTION
);
262 return error(_("git stash clear with arguments is "
265 return do_clear_stash();
268 static int reset_tree(struct object_id
*i_tree
, int update
, int reset
)
271 struct unpack_trees_options opts
;
272 struct tree_desc t
[MAX_UNPACK_TREES
];
274 struct lock_file lock_file
= LOCK_INIT
;
276 repo_read_index_preload(the_repository
, NULL
, 0);
277 if (refresh_index(&the_index
, REFRESH_QUIET
, NULL
, NULL
, NULL
))
280 repo_hold_locked_index(the_repository
, &lock_file
, LOCK_DIE_ON_ERROR
);
282 memset(&opts
, 0, sizeof(opts
));
284 tree
= parse_tree_indirect(i_tree
);
285 if (parse_tree(tree
))
288 init_tree_desc(t
, &tree
->object
.oid
, tree
->buffer
, tree
->size
);
291 opts
.src_index
= &the_index
;
292 opts
.dst_index
= &the_index
;
294 opts
.reset
= reset
? UNPACK_RESET_PROTECT_UNTRACKED
: 0;
295 opts
.update
= update
;
297 opts
.preserve_ignored
= 0; /* FIXME: !overwrite_ignore */
298 opts
.fn
= oneway_merge
;
300 if (unpack_trees(nr_trees
, t
, &opts
))
303 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
304 return error(_("unable to write new index file"));
309 static int diff_tree_binary(struct strbuf
*out
, struct object_id
*w_commit
)
311 struct child_process cp
= CHILD_PROCESS_INIT
;
312 const char *w_commit_hex
= oid_to_hex(w_commit
);
315 * Diff-tree would not be very hard to replace with a native function,
316 * however it should be done together with apply_cached.
319 strvec_pushl(&cp
.args
, "diff-tree", "--binary", NULL
);
320 strvec_pushf(&cp
.args
, "%s^2^..%s^2", w_commit_hex
, w_commit_hex
);
322 return pipe_command(&cp
, NULL
, 0, out
, 0, NULL
, 0);
325 static int apply_cached(struct strbuf
*out
)
327 struct child_process cp
= CHILD_PROCESS_INIT
;
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
335 strvec_pushl(&cp
.args
, "apply", "--cached", NULL
);
336 return pipe_command(&cp
, out
->buf
, out
->len
, NULL
, 0, NULL
, 0);
339 static int reset_head(void)
341 struct child_process cp
= CHILD_PROCESS_INIT
;
344 * Reset is overall quite simple, however there is no current public
348 strvec_pushl(&cp
.args
, "reset", "--quiet", "--refresh", NULL
);
350 return run_command(&cp
);
353 static int is_path_a_directory(const char *path
)
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.
361 return (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
));
364 static void add_diff_to_buf(struct diff_queue_struct
*q
,
365 struct diff_options
*options
,
370 for (i
= 0; i
< q
->nr
; i
++) {
371 if (is_path_a_directory(q
->queue
[i
]->one
->path
))
374 strbuf_addstr(data
, q
->queue
[i
]->one
->path
);
376 /* NUL-terminate: will be fed to update-index -z */
377 strbuf_addch(data
, '\0');
381 static int restore_untracked(struct object_id
*u_tree
)
384 struct child_process cp
= CHILD_PROCESS_INIT
;
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.
392 strvec_push(&cp
.args
, "read-tree");
393 strvec_push(&cp
.args
, oid_to_hex(u_tree
));
394 strvec_pushf(&cp
.env
, "GIT_INDEX_FILE=%s",
395 stash_index_path
.buf
);
396 if (run_command(&cp
)) {
397 remove_path(stash_index_path
.buf
);
401 child_process_init(&cp
);
403 strvec_pushl(&cp
.args
, "checkout-index", "--all", NULL
);
404 strvec_pushf(&cp
.env
, "GIT_INDEX_FILE=%s",
405 stash_index_path
.buf
);
407 res
= run_command(&cp
);
408 remove_path(stash_index_path
.buf
);
412 static void unstage_changes_unless_new(struct object_id
*orig_tree
)
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.
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.
425 struct checkout state
= CHECKOUT_INIT
;
426 struct diff_options diff_opts
;
427 struct lock_file lock
= LOCK_INIT
;
430 /* If any entries have skip_worktree set, we'll have to check 'em out */
433 state
.refresh_cache
= 1;
434 state
.istate
= &the_index
;
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).
441 repo_diff_setup(the_repository
, &diff_opts
);
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
);
447 do_diff_cache(orig_tree
, &diff_opts
);
448 diffcore_std(&diff_opts
);
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
;
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
));
462 * Step 2: Place changes in the working tree
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.
469 if (pos
>= 0 && ce_skip_worktree(the_index
.cache
[pos
])) {
472 ce
= the_index
.cache
[pos
];
473 if (!lstat(ce
->name
, &st
)) {
474 /* Conflicting path present; relocate it */
475 struct strbuf new_path
= STRBUF_INIT
;
478 strbuf_addf(&new_path
,
479 "%s.stash.XXXXXX", ce
->name
);
480 fd
= xmkstemp(new_path
.buf
);
482 printf(_("WARNING: Untracked file in way of "
483 "tracked file! Renaming\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
);
492 checkout_entry(ce
, &state
, NULL
, NULL
);
493 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
497 * Step 3: "unstage" changes, as long as they are still tracked
499 if (p
->one
->oid_valid
) {
501 * Path existed in orig_tree; restore index entry
502 * from that tree in order to "unstage" the changes.
504 int option
= ADD_CACHE_OK_TO_REPLACE
;
506 option
= ADD_CACHE_OK_TO_ADD
;
508 ce
= make_cache_entry(&the_index
,
513 add_index_entry(&the_index
, ce
, option
);
516 diff_flush(&diff_opts
);
519 * Step 4: write the new index to disk
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."));
527 static int do_apply_stash(const char *prefix
, struct stash_info
*info
,
528 int index
, int quiet
)
531 int has_index
= index
;
532 struct merge_options o
;
533 struct object_id c_tree
;
534 struct object_id index_tree
;
535 struct tree
*head
, *merge
, *merge_base
;
536 struct lock_file lock
= LOCK_INIT
;
538 repo_read_index_preload(the_repository
, NULL
, 0);
539 if (repo_refresh_and_write_index(the_repository
, REFRESH_QUIET
, 0, 0,
543 if (write_index_as_tree(&c_tree
, &the_index
, get_index_file(), 0,
545 return error(_("cannot apply a stash in the middle of a merge"));
548 if (oideq(&info
->b_tree
, &info
->i_tree
) ||
549 oideq(&c_tree
, &info
->i_tree
)) {
552 struct strbuf out
= STRBUF_INIT
;
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
));
560 ret
= apply_cached(&out
);
561 strbuf_release(&out
);
563 return error(_("conflicts in index. "
564 "Try without --index."));
566 discard_index(&the_index
);
567 repo_read_index(the_repository
);
568 if (write_index_as_tree(&index_tree
, &the_index
,
569 get_index_file(), 0, NULL
))
570 return error(_("could not save index tree"));
573 discard_index(&the_index
);
574 repo_read_index(the_repository
);
578 init_merge_options(&o
, the_repository
);
580 o
.branch1
= "Updated upstream";
581 o
.branch2
= "Stashed changes";
582 o
.ancestor
= "Stash base";
584 if (oideq(&info
->b_tree
, &c_tree
))
585 o
.branch1
= "Version stash was based on";
590 if (o
.verbosity
>= 3)
591 printf_ln(_("Merging %s with %s"), o
.branch1
, o
.branch2
);
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
);
597 repo_hold_locked_index(o
.repo
, &lock
, LOCK_DIE_ON_ERROR
);
598 clean
= merge_ort_nonrecursive(&o
, head
, merge
, merge_base
);
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
605 ret
= clean
>= 0 ? !clean
: clean
;
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"));
614 repo_rerere(the_repository
, 0);
617 fprintf_ln(stderr
, _("Index was not unstashed."));
619 goto restore_untracked
;
623 if (reset_tree(&index_tree
, 0, 0))
626 unstage_changes_unless_new(&c_tree
);
630 if (info
->has_u
&& restore_untracked(&info
->u_tree
))
631 ret
= error(_("could not restore untracked files from stash"));
634 struct child_process cp
= CHILD_PROCESS_INIT
;
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.
643 strvec_pushf(&cp
.env
, GIT_WORK_TREE_ENVIRONMENT
"=%s",
644 absolute_path(get_git_work_tree()));
645 strvec_pushf(&cp
.env
, GIT_DIR_ENVIRONMENT
"=%s",
646 absolute_path(get_git_dir()));
647 strvec_push(&cp
.args
, "status");
654 static int apply_stash(int argc
, const char **argv
, const char *prefix
)
659 struct stash_info info
= STASH_INFO_INIT
;
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")),
667 argc
= parse_options(argc
, argv
, prefix
, options
,
668 git_stash_apply_usage
, 0);
670 if (get_stash_info(&info
, argc
, argv
))
673 ret
= do_apply_stash(prefix
, &info
, index
, quiet
);
675 free_stash_info(&info
);
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
)
689 static int reflog_is_empty(const char *refname
)
691 return !for_each_reflog_ent(refname
, reject_reflog_ent
, NULL
);
694 static int do_drop_stash(struct stash_info
*info
, int quiet
)
696 if (!reflog_delete(info
->revision
.buf
,
697 EXPIRE_REFLOGS_REWRITE
| EXPIRE_REFLOGS_UPDATE_REF
,
700 printf_ln(_("Dropped %s (%s)"), info
->revision
.buf
,
701 oid_to_hex(&info
->w_commit
));
703 return error(_("%s: Could not drop stash entry"),
707 if (reflog_is_empty(ref_stash
))
713 static int get_stash_info_assert(struct stash_info
*info
, int argc
,
716 int ret
= get_stash_info(info
, argc
, argv
);
721 if (!info
->is_stash_ref
)
722 return error(_("'%s' is not a stash reference"), info
->revision
.buf
);
727 static int drop_stash(int argc
, const char **argv
, const char *prefix
)
731 struct stash_info info
= STASH_INFO_INIT
;
732 struct option options
[] = {
733 OPT__QUIET(&quiet
, N_("be quiet, only report errors")),
737 argc
= parse_options(argc
, argv
, prefix
, options
,
738 git_stash_drop_usage
, 0);
740 if (get_stash_info_assert(&info
, argc
, argv
))
743 ret
= do_drop_stash(&info
, quiet
);
745 free_stash_info(&info
);
749 static int pop_stash(int argc
, const char **argv
, const char *prefix
)
754 struct stash_info info
= STASH_INFO_INIT
;
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")),
762 argc
= parse_options(argc
, argv
, prefix
, options
,
763 git_stash_pop_usage
, 0);
765 if (get_stash_info_assert(&info
, argc
, argv
))
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."));
772 ret
= do_drop_stash(&info
, quiet
);
775 free_stash_info(&info
);
779 static int branch_stash(int argc
, const char **argv
, const char *prefix
)
782 const char *branch
= NULL
;
783 struct stash_info info
= STASH_INFO_INIT
;
784 struct child_process cp
= CHILD_PROCESS_INIT
;
785 struct option options
[] = {
789 argc
= parse_options(argc
, argv
, prefix
, options
,
790 git_stash_branch_usage
, 0);
793 fprintf_ln(stderr
, _("No branch name specified"));
799 if (get_stash_info(&info
, argc
- 1, argv
+ 1))
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
));
806 ret
= run_command(&cp
);
808 ret
= do_apply_stash(prefix
, &info
, 1, 0);
809 if (!ret
&& info
.is_stash_ref
)
810 ret
= do_drop_stash(&info
, 0);
813 free_stash_info(&info
);
817 static int list_stash(int argc
, const char **argv
, const char *prefix
)
819 struct child_process cp
= CHILD_PROCESS_INIT
;
820 struct option options
[] = {
824 argc
= parse_options(argc
, argv
, prefix
, options
,
825 git_stash_list_usage
,
826 PARSE_OPT_KEEP_UNKNOWN_OPT
);
828 if (!ref_exists(ref_stash
))
832 strvec_pushl(&cp
.args
, "log", "--format=%gd: %gs", "-g",
833 "--first-parent", NULL
);
834 strvec_pushv(&cp
.args
, argv
);
835 strvec_push(&cp
.args
, ref_stash
);
836 strvec_push(&cp
.args
, "--");
837 return run_command(&cp
);
840 static int show_stat
= 1;
841 static int show_patch
;
842 static int show_include_untracked
;
844 static int git_stash_config(const char *var
, const char *value
,
845 const struct config_context
*ctx
, void *cb
)
847 if (!strcmp(var
, "stash.showstat")) {
848 show_stat
= git_config_bool(var
, value
);
851 if (!strcmp(var
, "stash.showpatch")) {
852 show_patch
= git_config_bool(var
, value
);
855 if (!strcmp(var
, "stash.showincludeuntracked")) {
856 show_include_untracked
= git_config_bool(var
, value
);
859 return git_diff_basic_config(var
, value
, ctx
, cb
);
862 static void diff_include_untracked(const struct stash_info
*info
, struct diff_options
*diff_opt
)
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 };
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
]->object
.oid
,
875 tree
[i
]->buffer
, tree
[i
]->size
);
878 unpack_tree_opt
.head_idx
= -1;
879 unpack_tree_opt
.src_index
= &the_index
;
880 unpack_tree_opt
.dst_index
= &the_index
;
881 unpack_tree_opt
.merge
= 1;
882 unpack_tree_opt
.fn
= stash_worktree_untracked_merge
;
884 if (unpack_trees(ARRAY_SIZE(tree_desc
), tree_desc
, &unpack_tree_opt
))
885 die(_("failed to unpack trees"));
887 do_diff_cache(&info
->b_commit
, diff_opt
);
890 static int show_stash(int argc
, const char **argv
, const char *prefix
)
894 struct stash_info info
= STASH_INFO_INIT
;
896 struct strvec stash_args
= STRVEC_INIT
;
897 struct strvec revision_args
= STRVEC_INIT
;
902 } show_untracked
= show_include_untracked
? UNTRACKED_INCLUDE
: UNTRACKED_NONE
;
903 struct option options
[] = {
904 OPT_SET_INT('u', "include-untracked", &show_untracked
,
905 N_("include untracked files in the stash"),
907 OPT_SET_INT_F(0, "only-untracked", &show_untracked
,
908 N_("only show untracked files in the stash"),
909 UNTRACKED_ONLY
, PARSE_OPT_NONEG
),
914 init_diff_ui_defaults();
915 git_config(git_diff_ui_config
, NULL
);
916 repo_init_revisions(the_repository
, &rev
, prefix
);
918 argc
= parse_options(argc
, argv
, prefix
, options
, git_stash_show_usage
,
919 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN_OPT
|
920 PARSE_OPT_KEEP_DASHDASH
);
922 strvec_push(&revision_args
, argv
[0]);
923 for (i
= 1; i
< argc
; i
++) {
924 if (argv
[i
][0] != '-')
925 strvec_push(&stash_args
, argv
[i
]);
927 strvec_push(&revision_args
, argv
[i
]);
930 if (get_stash_info(&info
, stash_args
.nr
, stash_args
.v
))
934 * The config settings are applied only if there are not passed
937 if (revision_args
.nr
== 1) {
939 rev
.diffopt
.output_format
= DIFF_FORMAT_DIFFSTAT
;
942 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
944 if (!show_stat
&& !show_patch
) {
950 argc
= setup_revisions(revision_args
.nr
, revision_args
.v
, &rev
, NULL
);
953 if (!rev
.diffopt
.output_format
) {
954 rev
.diffopt
.output_format
= DIFF_FORMAT_PATCH
;
955 diff_setup_done(&rev
.diffopt
);
958 rev
.diffopt
.flags
.recursive
= 1;
959 setup_diff_pager(&rev
.diffopt
);
960 switch (show_untracked
) {
962 diff_tree_oid(&info
.b_commit
, &info
.w_commit
, "", &rev
.diffopt
);
966 diff_root_tree_oid(&info
.u_tree
, "", &rev
.diffopt
);
968 case UNTRACKED_INCLUDE
:
970 diff_include_untracked(&info
, &rev
.diffopt
);
972 diff_tree_oid(&info
.b_commit
, &info
.w_commit
, "", &rev
.diffopt
);
975 log_tree_diff_flush(&rev
);
977 ret
= diff_result_code(&rev
.diffopt
, 0);
979 strvec_clear(&stash_args
);
980 free_stash_info(&info
);
981 release_revisions(&rev
);
983 usage_with_options(git_stash_show_usage
, options
);
990 static int do_store_stash(const struct object_id
*w_commit
, const char *stash_msg
,
994 stash_msg
= "Created via \"git stash store\".";
996 if (update_ref(stash_msg
, ref_stash
, w_commit
, NULL
,
997 REF_FORCE_CREATE_REFLOG
,
998 quiet
? UPDATE_REFS_QUIET_ON_ERR
:
999 UPDATE_REFS_MSG_ON_ERR
)) {
1001 fprintf_ln(stderr
, _("Cannot update %s with %s"),
1002 ref_stash
, oid_to_hex(w_commit
));
1010 static int store_stash(int argc
, const char **argv
, const char *prefix
)
1013 const char *stash_msg
= NULL
;
1014 struct object_id obj
;
1015 struct object_context dummy
;
1016 struct option options
[] = {
1017 OPT__QUIET(&quiet
, N_("be quiet")),
1018 OPT_STRING('m', "message", &stash_msg
, "message",
1019 N_("stash message")),
1023 argc
= parse_options(argc
, argv
, prefix
, options
,
1024 git_stash_store_usage
,
1025 PARSE_OPT_KEEP_UNKNOWN_OPT
);
1029 fprintf_ln(stderr
, _("\"git stash store\" requires one "
1030 "<commit> argument"));
1034 if (get_oid_with_context(the_repository
,
1035 argv
[0], quiet
? GET_OID_QUIETLY
: 0, &obj
,
1038 fprintf_ln(stderr
, _("Cannot update %s with %s"),
1039 ref_stash
, argv
[0]);
1043 return do_store_stash(&obj
, stash_msg
, quiet
);
1046 static void add_pathspecs(struct strvec
*args
,
1047 const struct pathspec
*ps
) {
1050 for (i
= 0; i
< ps
->nr
; i
++)
1051 strvec_push(args
, ps
->items
[i
].original
);
1055 * `untracked_files` will be filled with the names of untracked files.
1056 * The return value is:
1058 * = 0 if there are not any untracked files
1059 * > 0 if there are untracked files
1061 static int get_untracked_files(const struct pathspec
*ps
, int include_untracked
,
1062 struct strbuf
*untracked_files
)
1066 struct dir_struct dir
= DIR_INIT
;
1068 if (include_untracked
!= INCLUDE_ALL_FILES
)
1069 setup_standard_excludes(&dir
);
1071 fill_directory(&dir
, the_repository
->index
, ps
);
1072 for (i
= 0; i
< dir
.nr
; i
++) {
1073 struct dir_entry
*ent
= dir
.entries
[i
];
1075 strbuf_addstr(untracked_files
, ent
->name
);
1076 /* NUL-terminate: will be fed to update-index -z */
1077 strbuf_addch(untracked_files
, '\0');
1085 * The return value of `check_changes_tracked_files()` can be:
1087 * < 0 if there was an error
1088 * = 0 if there are no changes.
1089 * > 0 if there are changes.
1091 static int check_changes_tracked_files(const struct pathspec
*ps
)
1094 struct rev_info rev
;
1095 struct object_id dummy
;
1098 /* No initial commit. */
1099 if (repo_get_oid(the_repository
, "HEAD", &dummy
))
1102 if (repo_read_index(the_repository
) < 0)
1105 repo_init_revisions(the_repository
, &rev
, NULL
);
1106 copy_pathspec(&rev
.prune_data
, ps
);
1108 rev
.diffopt
.flags
.quick
= 1;
1109 rev
.diffopt
.flags
.ignore_submodules
= 1;
1112 add_head_to_pending(&rev
);
1113 diff_setup_done(&rev
.diffopt
);
1115 result
= run_diff_index(&rev
, 1);
1116 if (diff_result_code(&rev
.diffopt
, result
)) {
1121 result
= run_diff_files(&rev
, 0);
1122 if (diff_result_code(&rev
.diffopt
, result
)) {
1128 release_revisions(&rev
);
1133 * The function will fill `untracked_files` with the names of untracked files
1134 * It will return 1 if there were any changes and 0 if there were not.
1136 static int check_changes(const struct pathspec
*ps
, int include_untracked
,
1137 struct strbuf
*untracked_files
)
1140 if (check_changes_tracked_files(ps
))
1143 if (include_untracked
&& get_untracked_files(ps
, include_untracked
,
1150 static int save_untracked_files(struct stash_info
*info
, struct strbuf
*msg
,
1151 struct strbuf files
)
1154 struct strbuf untracked_msg
= STRBUF_INIT
;
1155 struct child_process cp_upd_index
= CHILD_PROCESS_INIT
;
1156 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1158 cp_upd_index
.git_cmd
= 1;
1159 strvec_pushl(&cp_upd_index
.args
, "update-index", "-z", "--add",
1160 "--remove", "--stdin", NULL
);
1161 strvec_pushf(&cp_upd_index
.env
, "GIT_INDEX_FILE=%s",
1162 stash_index_path
.buf
);
1164 strbuf_addf(&untracked_msg
, "untracked files on %s\n", msg
->buf
);
1165 if (pipe_command(&cp_upd_index
, files
.buf
, files
.len
, NULL
, 0,
1171 if (write_index_as_tree(&info
->u_tree
, &istate
, stash_index_path
.buf
, 0,
1177 if (commit_tree(untracked_msg
.buf
, untracked_msg
.len
,
1178 &info
->u_tree
, NULL
, &info
->u_commit
, NULL
, NULL
)) {
1184 release_index(&istate
);
1185 strbuf_release(&untracked_msg
);
1186 remove_path(stash_index_path
.buf
);
1190 static int stash_staged(struct stash_info
*info
, struct strbuf
*out_patch
,
1194 struct child_process cp_diff_tree
= CHILD_PROCESS_INIT
;
1195 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1197 if (write_index_as_tree(&info
->w_tree
, &istate
, the_repository
->index_file
,
1203 cp_diff_tree
.git_cmd
= 1;
1204 strvec_pushl(&cp_diff_tree
.args
, "diff-tree", "-p", "-U1", "HEAD",
1205 oid_to_hex(&info
->w_tree
), "--", NULL
);
1206 if (pipe_command(&cp_diff_tree
, NULL
, 0, out_patch
, 0, NULL
, 0)) {
1211 if (!out_patch
->len
) {
1213 fprintf_ln(stderr
, _("No staged changes"));
1218 release_index(&istate
);
1222 static int stash_patch(struct stash_info
*info
, const struct pathspec
*ps
,
1223 struct strbuf
*out_patch
, int quiet
)
1226 struct child_process cp_read_tree
= CHILD_PROCESS_INIT
;
1227 struct child_process cp_diff_tree
= CHILD_PROCESS_INIT
;
1228 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1229 char *old_index_env
= NULL
, *old_repo_index_file
;
1231 remove_path(stash_index_path
.buf
);
1233 cp_read_tree
.git_cmd
= 1;
1234 strvec_pushl(&cp_read_tree
.args
, "read-tree", "HEAD", NULL
);
1235 strvec_pushf(&cp_read_tree
.env
, "GIT_INDEX_FILE=%s",
1236 stash_index_path
.buf
);
1237 if (run_command(&cp_read_tree
)) {
1242 /* Find out what the user wants. */
1243 old_repo_index_file
= the_repository
->index_file
;
1244 the_repository
->index_file
= stash_index_path
.buf
;
1245 old_index_env
= xstrdup_or_null(getenv(INDEX_ENVIRONMENT
));
1246 setenv(INDEX_ENVIRONMENT
, the_repository
->index_file
, 1);
1248 ret
= !!run_add_p(the_repository
, ADD_P_STASH
, NULL
, ps
);
1250 the_repository
->index_file
= old_repo_index_file
;
1251 if (old_index_env
&& *old_index_env
)
1252 setenv(INDEX_ENVIRONMENT
, old_index_env
, 1);
1254 unsetenv(INDEX_ENVIRONMENT
);
1255 FREE_AND_NULL(old_index_env
);
1257 /* State of the working tree. */
1258 if (write_index_as_tree(&info
->w_tree
, &istate
, stash_index_path
.buf
, 0,
1264 cp_diff_tree
.git_cmd
= 1;
1265 strvec_pushl(&cp_diff_tree
.args
, "diff-tree", "-p", "-U1", "HEAD",
1266 oid_to_hex(&info
->w_tree
), "--", NULL
);
1267 if (pipe_command(&cp_diff_tree
, NULL
, 0, out_patch
, 0, NULL
, 0)) {
1272 if (!out_patch
->len
) {
1274 fprintf_ln(stderr
, _("No changes selected"));
1279 release_index(&istate
);
1280 remove_path(stash_index_path
.buf
);
1284 static int stash_working_tree(struct stash_info
*info
, const struct pathspec
*ps
)
1287 struct rev_info rev
;
1288 struct child_process cp_upd_index
= CHILD_PROCESS_INIT
;
1289 struct strbuf diff_output
= STRBUF_INIT
;
1290 struct index_state istate
= INDEX_STATE_INIT(the_repository
);
1292 repo_init_revisions(the_repository
, &rev
, NULL
);
1293 copy_pathspec(&rev
.prune_data
, ps
);
1295 set_alternate_index_output(stash_index_path
.buf
);
1296 if (reset_tree(&info
->i_tree
, 0, 0)) {
1300 set_alternate_index_output(NULL
);
1302 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
1303 rev
.diffopt
.format_callback
= add_diff_to_buf
;
1304 rev
.diffopt
.format_callback_data
= &diff_output
;
1306 if (repo_read_index_preload(the_repository
, &rev
.diffopt
.pathspec
, 0) < 0) {
1311 add_pending_object(&rev
, parse_object(the_repository
, &info
->b_commit
),
1313 if (run_diff_index(&rev
, 0)) {
1318 cp_upd_index
.git_cmd
= 1;
1319 strvec_pushl(&cp_upd_index
.args
, "update-index",
1320 "--ignore-skip-worktree-entries",
1321 "-z", "--add", "--remove", "--stdin", NULL
);
1322 strvec_pushf(&cp_upd_index
.env
, "GIT_INDEX_FILE=%s",
1323 stash_index_path
.buf
);
1325 if (pipe_command(&cp_upd_index
, diff_output
.buf
, diff_output
.len
,
1326 NULL
, 0, NULL
, 0)) {
1331 if (write_index_as_tree(&info
->w_tree
, &istate
, stash_index_path
.buf
, 0,
1338 release_index(&istate
);
1339 release_revisions(&rev
);
1340 strbuf_release(&diff_output
);
1341 remove_path(stash_index_path
.buf
);
1345 static int do_create_stash(const struct pathspec
*ps
, struct strbuf
*stash_msg_buf
,
1346 int include_untracked
, int patch_mode
, int only_staged
,
1347 struct stash_info
*info
, struct strbuf
*patch
,
1352 int untracked_commit_option
= 0;
1353 const char *head_short_sha1
= NULL
;
1354 const char *branch_ref
= NULL
;
1355 const char *branch_name
= "(no branch)";
1356 struct commit
*head_commit
= NULL
;
1357 struct commit_list
*parents
= NULL
;
1358 struct strbuf msg
= STRBUF_INIT
;
1359 struct strbuf commit_tree_label
= STRBUF_INIT
;
1360 struct strbuf untracked_files
= STRBUF_INIT
;
1362 prepare_fallback_ident("git stash", "git@stash");
1364 repo_read_index_preload(the_repository
, NULL
, 0);
1365 if (repo_refresh_and_write_index(the_repository
, REFRESH_QUIET
, 0, 0,
1366 NULL
, NULL
, NULL
) < 0) {
1371 if (repo_get_oid(the_repository
, "HEAD", &info
->b_commit
)) {
1373 fprintf_ln(stderr
, _("You do not have "
1374 "the initial commit yet"));
1378 head_commit
= lookup_commit(the_repository
, &info
->b_commit
);
1381 if (!check_changes(ps
, include_untracked
, &untracked_files
)) {
1386 branch_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flags
);
1387 if (flags
& REF_ISSYMREF
)
1388 skip_prefix(branch_ref
, "refs/heads/", &branch_name
);
1389 head_short_sha1
= repo_find_unique_abbrev(the_repository
,
1390 &head_commit
->object
.oid
,
1392 strbuf_addf(&msg
, "%s: %s ", branch_name
, head_short_sha1
);
1393 pp_commit_easy(CMIT_FMT_ONELINE
, head_commit
, &msg
);
1395 strbuf_addf(&commit_tree_label
, "index on %s\n", msg
.buf
);
1396 commit_list_insert(head_commit
, &parents
);
1397 if (write_index_as_tree(&info
->i_tree
, &the_index
, get_index_file(), 0,
1399 commit_tree(commit_tree_label
.buf
, commit_tree_label
.len
,
1400 &info
->i_tree
, parents
, &info
->i_commit
, NULL
, NULL
)) {
1402 fprintf_ln(stderr
, _("Cannot save the current "
1408 if (include_untracked
) {
1409 if (save_untracked_files(info
, &msg
, untracked_files
)) {
1411 fprintf_ln(stderr
, _("Cannot save "
1412 "the untracked files"));
1416 untracked_commit_option
= 1;
1419 ret
= stash_patch(info
, ps
, patch
, quiet
);
1422 fprintf_ln(stderr
, _("Cannot save the current "
1425 } else if (ret
> 0) {
1428 } else if (only_staged
) {
1429 ret
= stash_staged(info
, patch
, quiet
);
1432 fprintf_ln(stderr
, _("Cannot save the current "
1435 } else if (ret
> 0) {
1439 if (stash_working_tree(info
, ps
)) {
1441 fprintf_ln(stderr
, _("Cannot save the current "
1448 if (!stash_msg_buf
->len
)
1449 strbuf_addf(stash_msg_buf
, "WIP on %s", msg
.buf
);
1451 strbuf_insertf(stash_msg_buf
, 0, "On %s: ", branch_name
);
1454 * `parents` will be empty after calling `commit_tree()`, so there is
1455 * no need to call `free_commit_list()`
1458 if (untracked_commit_option
)
1459 commit_list_insert(lookup_commit(the_repository
,
1462 commit_list_insert(lookup_commit(the_repository
, &info
->i_commit
),
1464 commit_list_insert(head_commit
, &parents
);
1466 if (commit_tree(stash_msg_buf
->buf
, stash_msg_buf
->len
, &info
->w_tree
,
1467 parents
, &info
->w_commit
, NULL
, NULL
)) {
1469 fprintf_ln(stderr
, _("Cannot record "
1470 "working tree state"));
1476 strbuf_release(&commit_tree_label
);
1477 strbuf_release(&msg
);
1478 strbuf_release(&untracked_files
);
1482 static int create_stash(int argc
, const char **argv
, const char *prefix UNUSED
)
1485 struct strbuf stash_msg_buf
= STRBUF_INIT
;
1486 struct stash_info info
= STASH_INFO_INIT
;
1489 /* Starting with argv[1], since argv[0] is "create" */
1490 strbuf_join_argv(&stash_msg_buf
, argc
- 1, ++argv
, ' ');
1492 memset(&ps
, 0, sizeof(ps
));
1493 if (!check_changes_tracked_files(&ps
))
1496 ret
= do_create_stash(&ps
, &stash_msg_buf
, 0, 0, 0, &info
,
1499 printf_ln("%s", oid_to_hex(&info
.w_commit
));
1501 free_stash_info(&info
);
1502 strbuf_release(&stash_msg_buf
);
1506 static int do_push_stash(const struct pathspec
*ps
, const char *stash_msg
, int quiet
,
1507 int keep_index
, int patch_mode
, int include_untracked
, int only_staged
)
1510 struct stash_info info
= STASH_INFO_INIT
;
1511 struct strbuf patch
= STRBUF_INIT
;
1512 struct strbuf stash_msg_buf
= STRBUF_INIT
;
1513 struct strbuf untracked_files
= STRBUF_INIT
;
1515 if (patch_mode
&& keep_index
== -1)
1518 if (patch_mode
&& include_untracked
) {
1519 fprintf_ln(stderr
, _("Can't use --patch and --include-untracked"
1520 " or --all at the same time"));
1525 /* --patch overrides --staged */
1529 if (only_staged
&& include_untracked
) {
1530 fprintf_ln(stderr
, _("Can't use --staged and --include-untracked"
1531 " or --all at the same time"));
1536 repo_read_index_preload(the_repository
, NULL
, 0);
1537 if (!include_untracked
&& ps
->nr
) {
1539 char *ps_matched
= xcalloc(ps
->nr
, 1);
1541 /* TODO: audit for interaction with sparse-index. */
1542 ensure_full_index(&the_index
);
1543 for (i
= 0; i
< the_index
.cache_nr
; i
++)
1544 ce_path_match(&the_index
, the_index
.cache
[i
], ps
,
1547 if (report_path_error(ps_matched
, ps
)) {
1548 fprintf_ln(stderr
, _("Did you forget to 'git add'?"));
1556 if (repo_refresh_and_write_index(the_repository
, REFRESH_QUIET
, 0, 0,
1557 NULL
, NULL
, NULL
)) {
1562 if (!check_changes(ps
, include_untracked
, &untracked_files
)) {
1564 printf_ln(_("No local changes to save"));
1568 if (!reflog_exists(ref_stash
) && do_clear_stash()) {
1571 fprintf_ln(stderr
, _("Cannot initialize stash"));
1576 strbuf_addstr(&stash_msg_buf
, stash_msg
);
1577 if (do_create_stash(ps
, &stash_msg_buf
, include_untracked
, patch_mode
, only_staged
,
1578 &info
, &patch
, quiet
)) {
1583 if (do_store_stash(&info
.w_commit
, stash_msg_buf
.buf
, 1)) {
1586 fprintf_ln(stderr
, _("Cannot save the current status"));
1591 printf_ln(_("Saved working directory and index state %s"),
1594 if (!(patch_mode
|| only_staged
)) {
1595 if (include_untracked
&& !ps
->nr
) {
1596 struct child_process cp
= CHILD_PROCESS_INIT
;
1599 if (startup_info
->original_cwd
) {
1600 cp
.dir
= startup_info
->original_cwd
;
1601 strvec_pushf(&cp
.env
, "%s=%s",
1602 GIT_WORK_TREE_ENVIRONMENT
,
1603 the_repository
->worktree
);
1605 strvec_pushl(&cp
.args
, "clean", "--force",
1606 "--quiet", "-d", ":/", NULL
);
1607 if (include_untracked
== INCLUDE_ALL_FILES
)
1608 strvec_push(&cp
.args
, "-x");
1609 if (run_command(&cp
)) {
1614 discard_index(&the_index
);
1616 struct child_process cp_add
= CHILD_PROCESS_INIT
;
1617 struct child_process cp_diff
= CHILD_PROCESS_INIT
;
1618 struct child_process cp_apply
= CHILD_PROCESS_INIT
;
1619 struct strbuf out
= STRBUF_INIT
;
1622 strvec_push(&cp_add
.args
, "add");
1623 if (!include_untracked
)
1624 strvec_push(&cp_add
.args
, "-u");
1625 if (include_untracked
== INCLUDE_ALL_FILES
)
1626 strvec_push(&cp_add
.args
, "--force");
1627 strvec_push(&cp_add
.args
, "--");
1628 add_pathspecs(&cp_add
.args
, ps
);
1629 if (run_command(&cp_add
)) {
1634 cp_diff
.git_cmd
= 1;
1635 strvec_pushl(&cp_diff
.args
, "diff-index", "-p",
1636 "--cached", "--binary", "HEAD", "--",
1638 add_pathspecs(&cp_diff
.args
, ps
);
1639 if (pipe_command(&cp_diff
, NULL
, 0, &out
, 0, NULL
, 0)) {
1644 cp_apply
.git_cmd
= 1;
1645 strvec_pushl(&cp_apply
.args
, "apply", "--index",
1647 if (pipe_command(&cp_apply
, out
.buf
, out
.len
, NULL
, 0,
1653 struct child_process cp
= CHILD_PROCESS_INIT
;
1655 /* BUG: this nukes untracked files in the way */
1656 strvec_pushl(&cp
.args
, "reset", "--hard", "-q",
1657 "--no-recurse-submodules", NULL
);
1658 if (run_command(&cp
)) {
1664 if (keep_index
== 1 && !is_null_oid(&info
.i_tree
)) {
1665 struct child_process cp
= CHILD_PROCESS_INIT
;
1668 strvec_pushl(&cp
.args
, "checkout", "--no-overlay",
1669 oid_to_hex(&info
.i_tree
), "--", NULL
);
1671 strvec_push(&cp
.args
, ":/");
1673 add_pathspecs(&cp
.args
, ps
);
1674 if (run_command(&cp
)) {
1681 struct child_process cp
= CHILD_PROCESS_INIT
;
1684 strvec_pushl(&cp
.args
, "apply", "-R", NULL
);
1686 if (pipe_command(&cp
, patch
.buf
, patch
.len
, NULL
, 0, NULL
, 0)) {
1688 fprintf_ln(stderr
, _("Cannot remove "
1689 "worktree changes"));
1694 if (keep_index
< 1) {
1695 struct child_process cp
= CHILD_PROCESS_INIT
;
1698 strvec_pushl(&cp
.args
, "reset", "-q", "--refresh", "--",
1700 add_pathspecs(&cp
.args
, ps
);
1701 if (run_command(&cp
)) {
1710 strbuf_release(&patch
);
1711 free_stash_info(&info
);
1712 strbuf_release(&stash_msg_buf
);
1713 strbuf_release(&untracked_files
);
1717 static int push_stash(int argc
, const char **argv
, const char *prefix
,
1720 int force_assume
= 0;
1721 int keep_index
= -1;
1722 int only_staged
= 0;
1724 int include_untracked
= 0;
1726 int pathspec_file_nul
= 0;
1727 const char *stash_msg
= NULL
;
1728 const char *pathspec_from_file
= NULL
;
1730 struct option options
[] = {
1731 OPT_BOOL('k', "keep-index", &keep_index
,
1733 OPT_BOOL('S', "staged", &only_staged
,
1734 N_("stash staged changes only")),
1735 OPT_BOOL('p', "patch", &patch_mode
,
1736 N_("stash in patch mode")),
1737 OPT__QUIET(&quiet
, N_("quiet mode")),
1738 OPT_BOOL('u', "include-untracked", &include_untracked
,
1739 N_("include untracked files in stash")),
1740 OPT_SET_INT('a', "all", &include_untracked
,
1741 N_("include ignore files"), 2),
1742 OPT_STRING('m', "message", &stash_msg
, N_("message"),
1743 N_("stash message")),
1744 OPT_PATHSPEC_FROM_FILE(&pathspec_from_file
),
1745 OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul
),
1751 force_assume
= !strcmp(argv
[0], "-p");
1752 argc
= parse_options(argc
, argv
, prefix
, options
,
1753 push_assumed
? git_stash_usage
:
1754 git_stash_push_usage
,
1755 PARSE_OPT_KEEP_DASHDASH
);
1759 if (!strcmp(argv
[0], "--")) {
1762 } else if (push_assumed
&& !force_assume
) {
1763 die("subcommand wasn't specified; 'push' can't be assumed due to unexpected token '%s'",
1768 parse_pathspec(&ps
, 0, PATHSPEC_PREFER_FULL
| PATHSPEC_PREFIX_ORIGIN
,
1771 if (pathspec_from_file
) {
1773 die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
1776 die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--staged");
1779 die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
1781 parse_pathspec_file(&ps
, 0,
1782 PATHSPEC_PREFER_FULL
| PATHSPEC_PREFIX_ORIGIN
,
1783 prefix
, pathspec_from_file
, pathspec_file_nul
);
1784 } else if (pathspec_file_nul
) {
1785 die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
1788 ret
= do_push_stash(&ps
, stash_msg
, quiet
, keep_index
, patch_mode
,
1789 include_untracked
, only_staged
);
1790 clear_pathspec(&ps
);
1794 static int push_stash_unassumed(int argc
, const char **argv
, const char *prefix
)
1796 return push_stash(argc
, argv
, prefix
, 0);
1799 static int save_stash(int argc
, const char **argv
, const char *prefix
)
1801 int keep_index
= -1;
1802 int only_staged
= 0;
1804 int include_untracked
= 0;
1807 const char *stash_msg
= NULL
;
1809 struct strbuf stash_msg_buf
= STRBUF_INIT
;
1810 struct option options
[] = {
1811 OPT_BOOL('k', "keep-index", &keep_index
,
1813 OPT_BOOL('S', "staged", &only_staged
,
1814 N_("stash staged changes only")),
1815 OPT_BOOL('p', "patch", &patch_mode
,
1816 N_("stash in patch mode")),
1817 OPT__QUIET(&quiet
, N_("quiet mode")),
1818 OPT_BOOL('u', "include-untracked", &include_untracked
,
1819 N_("include untracked files in stash")),
1820 OPT_SET_INT('a', "all", &include_untracked
,
1821 N_("include ignore files"), 2),
1822 OPT_STRING('m', "message", &stash_msg
, "message",
1823 N_("stash message")),
1827 argc
= parse_options(argc
, argv
, prefix
, options
,
1828 git_stash_save_usage
,
1829 PARSE_OPT_KEEP_DASHDASH
);
1832 stash_msg
= strbuf_join_argv(&stash_msg_buf
, argc
, argv
, ' ');
1834 memset(&ps
, 0, sizeof(ps
));
1835 ret
= do_push_stash(&ps
, stash_msg
, quiet
, keep_index
,
1836 patch_mode
, include_untracked
, only_staged
);
1838 strbuf_release(&stash_msg_buf
);
1842 int cmd_stash(int argc
, const char **argv
, const char *prefix
)
1844 pid_t pid
= getpid();
1845 const char *index_file
;
1846 struct strvec args
= STRVEC_INIT
;
1847 parse_opt_subcommand_fn
*fn
= NULL
;
1848 struct option options
[] = {
1849 OPT_SUBCOMMAND("apply", &fn
, apply_stash
),
1850 OPT_SUBCOMMAND("clear", &fn
, clear_stash
),
1851 OPT_SUBCOMMAND("drop", &fn
, drop_stash
),
1852 OPT_SUBCOMMAND("pop", &fn
, pop_stash
),
1853 OPT_SUBCOMMAND("branch", &fn
, branch_stash
),
1854 OPT_SUBCOMMAND("list", &fn
, list_stash
),
1855 OPT_SUBCOMMAND("show", &fn
, show_stash
),
1856 OPT_SUBCOMMAND("store", &fn
, store_stash
),
1857 OPT_SUBCOMMAND("create", &fn
, create_stash
),
1858 OPT_SUBCOMMAND("push", &fn
, push_stash_unassumed
),
1859 OPT_SUBCOMMAND_F("save", &fn
, save_stash
, PARSE_OPT_NOCOMPLETE
),
1863 git_config(git_stash_config
, NULL
);
1865 argc
= parse_options(argc
, argv
, prefix
, options
, git_stash_usage
,
1866 PARSE_OPT_SUBCOMMAND_OPTIONAL
|
1867 PARSE_OPT_KEEP_UNKNOWN_OPT
|
1868 PARSE_OPT_KEEP_DASHDASH
);
1870 prepare_repo_settings(the_repository
);
1871 the_repository
->settings
.command_requires_full_index
= 0;
1873 index_file
= get_index_file();
1874 strbuf_addf(&stash_index_path
, "%s.stash.%" PRIuMAX
, index_file
,
1878 return !!fn(argc
, argv
, prefix
);
1880 return !!push_stash_unassumed(0, NULL
, prefix
);
1882 /* Assume 'stash push' */
1883 strvec_push(&args
, "push");
1884 strvec_pushv(&args
, argv
);
1885 return !!push_stash(args
.nr
, args
.v
, prefix
, 1);