2 # Copyright (c) 2007, Nanako Shiraishi
4 dashless
=$
(basename "$0" |
sed -e 's/-/ /')
5 USAGE
="list [<options>]
6 or: $dashless show [<stash>]
7 or: $dashless drop [-q|--quiet] [<stash>]
8 or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
9 or: $dashless branch <branchname> [<stash>]
10 or: $dashless save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
11 [-u|--include-untracked] [-a|--all] [<message>]
12 or: $dashless [push [--patch] [-k|--[no-]keep-index] [-q|--quiet]
13 [-u|--include-untracked] [-a|--all] [-m <message>]
22 prefix
=$
(git rev-parse
--show-prefix) ||
exit 1
25 TMP
="$GIT_DIR/.git-stash.$$"
26 TMPindex
=${GIT_INDEX_FILE-"$(git rev-parse --git-path index)"}.stash.$$
27 trap 'rm -f "$TMP-"* "$TMPindex"' 0
31 if git config
--get-colorbool color.interactive
; then
32 help_color
="$(git config --get-color color.interactive.help 'red bold')"
33 reset_color
="$(git config --get-color '' reset)"
40 git diff-index
--quiet --cached HEAD
--ignore-submodules -- "$@" &&
41 git diff-files
--quiet --ignore-submodules -- "$@" &&
42 (test -z "$untracked" ||
test -z "$(untracked_files)")
46 excl_opt
=--exclude-standard
47 test "$untracked" = "all" && excl_opt
=
48 git ls-files
-o -z $excl_opt -- "$@"
54 die
"$(gettext "git stash
clear with parameters is unimplemented
")"
56 if current
=$
(git rev-parse
--verify --quiet $ref_stash)
58 git update-ref
-d $ref_stash $current
70 stash_msg
=${1?"BUG: create_stash () -m requires an argument"}
72 -u|
--include-untracked)
74 untracked
=${1?"BUG: create_stash () -u requires an argument"}
84 git update-index
-q --refresh
90 # state of the base commit
91 if b_commit
=$
(git rev-parse
--verify HEAD
)
93 head=$
(git rev-list
--oneline -n 1 HEAD
--)
95 die
"$(gettext "You
do not have the initial commit yet
")"
98 if branch
=$
(git symbolic-ref
-q HEAD
)
100 branch
=${branch#refs/heads/}
104 msg
=$
(printf '%s: %s' "$branch" "$head")
107 i_tree
=$
(git write-tree
) &&
108 i_commit
=$
(printf 'index on %s\n' "$msg" |
109 git commit-tree
$i_tree -p $b_commit) ||
110 die
"$(gettext "Cannot save the current index state
")"
112 if test -n "$untracked"
114 # Untracked files are stored by themselves in a parentless commit, for
115 # ease of unpacking later.
117 untracked_files
"$@" |
(
118 GIT_INDEX_FILE
="$TMPindex" &&
119 export GIT_INDEX_FILE
&&
121 git update-index
-z --add --remove --stdin &&
122 u_tree
=$
(git write-tree
) &&
123 printf 'untracked files on %s\n' "$msg" | git commit-tree
$u_tree &&
125 ) ) || die
"$(gettext "Cannot save the untracked files
")"
127 untracked_commit_option
="-p $u_commit";
129 untracked_commit_option
=
132 if test -z "$patch_mode"
135 # state of the working tree
137 git read-tree
--index-output="$TMPindex" -m $i_tree &&
138 GIT_INDEX_FILE
="$TMPindex" &&
139 export GIT_INDEX_FILE
&&
140 git diff-index
--name-only -z HEAD
-- "$@" >"$TMP-stagenames" &&
141 git update-index
-z --add --remove --stdin <"$TMP-stagenames" &&
145 die
"$(gettext "Cannot save the current worktree state
")"
149 rm -f "$TMP-index" &&
150 GIT_INDEX_FILE
="$TMP-index" git read-tree HEAD
&&
152 # find out what the user wants
153 GIT_INDEX_FILE
="$TMP-index" \
154 git add--interactive
--patch=stash
-- "$@" &&
156 # state of the working tree
157 w_tree
=$
(GIT_INDEX_FILE
="$TMP-index" git write-tree
) ||
158 die
"$(gettext "Cannot save the current worktree state
")"
160 git diff-tree
-p HEAD
$w_tree -- >"$TMP-patch" &&
161 test -s "$TMP-patch" ||
162 die
"$(gettext "No changes selected
")"
164 rm -f "$TMP-index" ||
165 die
"$(gettext "Cannot remove temporary index
(can
't happen)")"
170 if test -z "$stash_msg"
172 stash_msg=$(printf 'WIP on
%s
' "$msg")
174 stash_msg=$(printf 'On
%s
: %s
' "$branch" "$stash_msg")
176 w_commit=$(printf '%s
\n' "$stash_msg" |
177 git commit-tree $w_tree -p $b_commit -p $i_commit $untracked_commit_option) ||
178 die "$(gettext "Cannot record working tree state")"
199 die "$(eval_gettext "\"$dashless store\" requires one <commit> argument")"
202 if test -z "$stash_msg"
204 stash_msg="Created via \"git stash store\"."
207 git update-ref --create-reflog -m "$stash_msg" $ref_stash $w_commit
209 test $ret != 0 && test -z "$quiet" &&
210 die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")"
230 # only default to keep if we don't already have an override
231 test -z "$keep_index" && keep_index
=t
236 -u|
--include-untracked)
244 test -z ${1+x} && usage
256 # TRANSLATORS: $option is an invalid option, like
257 # `--blah-blah'. The 7 spaces at the beginning of the
258 # second line correspond to "error: ". So you should line
259 # up the second line with however many characters the
260 # translation of "error: " takes in your language. E.g. in
263 # $ git stash save --blah-blah 2>&1 | head -n 2
264 # error: unknown option for 'stash save': --blah-blah
265 # To provide a message, use git stash save -- '--blah-blah'
266 eval_gettextln
"error: unknown option for 'stash save': \$option
267 To provide a message, use git stash save -- '\$option'"
277 eval "set $(git rev-parse --sq --prefix "$prefix" -- "$@
")"
279 if test -n "$patch_mode" && test -n "$untracked"
281 die
"$(gettext "Can
't use --patch and --include-untracked or --all at the same time")"
284 test -n "$untracked" || git ls-files --error-unmatch -- "$@" >/dev/null || exit 1
286 git update-index -q --refresh
289 say "$(gettext "No local changes to save")"
293 git reflog exists $ref_stash ||
294 clear_stash || die "$(gettext "Cannot initialize stash")"
296 create_stash -m "$stash_msg" -u "$untracked" -- "$@"
297 store_stash -m "$stash_msg" -q $w_commit ||
298 die "$(gettext "Cannot save the current status")"
299 say "$(eval_gettext "Saved working directory and index state \$stash_msg")"
301 if test -z "$patch_mode"
303 test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
304 if test -n "$untracked"
306 git clean --force --quiet -d $CLEAN_X_OPTION -- "$@"
312 git ls-files -z --modified -- "$@" |
313 git checkout-index -z --force --stdin
314 git clean --force -q -d -- "$@"
319 if test "$keep_index" = "t" && test -n "$i_tree"
321 git read-tree --reset $i_tree
322 git ls-files -z --modified -- "$@" |
323 git checkout-index -z --force --stdin
326 git apply -R < "$TMP-patch" ||
327 die "$(gettext "Cannot remove worktree changes")"
329 if test "$keep_index" != "t"
346 # pass all options through to push_stash
347 push_options="$push_options $1"
358 if test -z "$stash_msg"
360 push_stash $push_options
362 push_stash $push_options -m "$stash_msg"
367 git rev-parse --verify --quiet $ref_stash >/dev/null
371 have_stash || return 0
372 git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash --
376 ALLOW_UNKNOWN_FLAGS=t
377 assert_stash_like "$@"
381 if test "$(git config --bool stash.showStat || echo true)" = "true"
386 if test "$(git config --bool stash.showPatch || echo false)" = "true"
388 FLAGS=${FLAGS}${FLAGS:+ }-p
397 git diff ${FLAGS} $b_commit $w_commit
406 # Parses the remaining options looking for flags and
407 # at most one revision defaulting to ${ref_stash}@{0}
410 # Derives related tree and commit objects from the
411 # revision, if one is found.
413 # stash records the work tree, and is a merge between the
414 # base commit (first parent) and the index tree (second parent).
416 # REV is set to the symbolic version of the specified stash-like commit
417 # IS_STASH_LIKE is non-blank if ${REV} looks like a stash
418 # IS_STASH_REF is non-blank if the ${REV} looks like a stash ref
419 # s is set to the SHA1 of the stash commit
420 # w_commit is set to the commit containing the working tree
421 # b_commit is set to the base commit
422 # i_commit is set to the commit containing the index tree
423 # u_commit is set to the commit containing the untracked files tree
424 # w_tree is set to the working tree
425 # b_tree is set to the base tree
426 # i_tree is set to the index tree
427 # u_tree is set to the untracked files tree
429 # GIT_QUIET is set to t if -q is specified
430 # INDEX_OPTION is set to --index if --index is specified.
431 # FLAGS is set to the remaining flags (if allowed)
434 # * too many revisions specified
435 # * no revision is specified and there is no stash stack
436 # * a revision is specified which cannot be resolve to a SHA1
437 # * a non-existent stash reference is specified
438 # * unknown flags were set and ALLOW_UNKNOWN_FLAGS is not "t"
441 parse_flags_and_rev()
443 test "$PARSE_CACHE" = "$*" && return 0 # optimisation
474 test "$ALLOW_UNKNOWN_FLAGS" = t ||
475 die "$(eval_gettext "unknown option: \$opt")"
476 FLAGS="${FLAGS}${FLAGS:+ }$opt"
479 REV="${REV}${REV:+ }'$opt'"
488 have_stash || die "$(gettext "No stash entries found.")"
489 set -- ${ref_stash}@{0}
495 die "$(eval_gettext "Too many revisions specified: \$REV")"
504 set -- "${ref_stash}@{$1}"
508 REV=$(git rev-parse --symbolic --verify --quiet "$1") || {
510 die "$(eval_gettext "\$reference is not a valid reference")"
513 i_commit=$(git rev-parse --verify --quiet "$REV^2") &&
514 set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
522 test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
525 u_commit=$(git rev-parse --verify --quiet "$REV^3") &&
526 u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
531 parse_flags_and_rev "$@"
532 test -n "$IS_STASH_LIKE"
535 assert_stash_like() {
536 is_stash_like "$@" || {
538 die "$(eval_gettext "'\
$args' is not a stash-like commit")"
543 is_stash_like "$@" && test -n "$IS_STASH_REF"
547 is_stash_ref "$@" || {
549 die "$(eval_gettext "'\
$args' is not a stash reference")"
555 assert_stash_like "$@"
557 git update-index -q --refresh || die "$(gettext "unable to refresh index")"
559 # current index state
560 c_tree=$(git write-tree) ||
561 die "$(gettext "Cannot apply a stash in the middle of a merge")"
563 unstashed_index_tree=
564 if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" &&
565 test "$c_tree" != "$i_tree"
567 git diff-tree --binary $s^2^..$s^2 | git apply --cached
569 die "$(gettext "Conflicts in index. Try without --index.")"
570 unstashed_index_tree=$(git write-tree) ||
571 die "$(gettext "Could not save index tree")"
577 GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
578 GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
580 die "$(gettext "Could not restore untracked files from stash entry")"
584 GITHEAD_$w_tree='Stashed changes
' &&
585 GITHEAD_$c_tree='Updated upstream
' &&
586 GITHEAD_$b_tree='Version stash was based on
' &&
587 export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
590 if test -n "$GIT_QUIET"
592 GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
594 if git merge-recursive $b_tree -- $c_tree $w_tree
597 if test -n "$unstashed_index_tree"
599 git read-tree "$unstashed_index_tree"
602 git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" &&
603 git read-tree --reset $c_tree &&
604 git update-index --add --stdin <"$a" ||
605 die "$(gettext "Cannot unstage modified files")"
609 if test -n "$GIT_QUIET"
611 squelch='>/dev
/null
2>&1'
613 (cd "$START_DIR" && eval "git status $squelch") || :
615 # Merge conflict; keep the exit status from merge-recursive
618 if test -n "$INDEX_OPTION"
620 gettextln "Index was not unstashed." >&2
627 assert_stash_ref "$@"
634 say "$(gettext "The stash entry is kept in case you need it again.")"
640 assert_stash_ref "$@"
642 git reflog delete --updateref --rewrite "${REV}" &&
643 say "$(eval_gettext "Dropped \${REV} (\$s)")" ||
644 die "$(eval_gettext "\${REV}: Could not drop stash entry")"
646 # clear_stash if we just dropped the last stash entry
647 git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null ||
652 test -n "$1" || die "$(gettext "No branch name specified")"
657 assert_stash_like "$@"
659 git checkout -b $branch $REV^ &&
660 apply_stash "$@" && {
661 test -z "$IS_STASH_REF" || drop_stash "$@"
665 test "$1" = "-p" && set "push" "$@"
667 PARSE_CACHE='--not-parsed'
668 # The default command is "push" if nothing but options are given
675 *) seen_non_option=t; break ;;
679 test -n "$seen_non_option" || set "push" "$@"
709 create_stash -m "$*" && echo "$w_commit"
731 say "$(gettext "(To restore them type \"git stash apply\")")"