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] [<message>]]
19 TMP="$GIT_DIR/.git-stash.$$"
20 trap 'rm -f "$TMP-*"' 0
24 if git config --get-colorbool color.interactive; then
25 help_color="$(git config --get-color color.interactive.help 'red bold')"
26 reset_color="$(git config --get-color '' reset)"
33 git diff-index --quiet --cached HEAD --ignore-submodules -- &&
34 git diff-files --quiet --ignore-submodules
40 die "git stash clear with parameters is unimplemented"
42 if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
44 git update-ref -d $ref_stash $current
51 git update-index -q --refresh
57 # state of the base commit
58 if b_commit=$(git rev-parse --verify HEAD)
60 head=$(git rev-list --oneline -n 1 HEAD --)
62 die "You do not have the initial commit yet"
65 if branch=$(git symbolic-ref -q HEAD)
67 branch=${branch#refs/heads/}
71 msg=$(printf '%s: %s' "$branch" "$head")
74 i_tree=$(git write-tree) &&
75 i_commit=$(printf 'index on %s\n' "$msg" |
76 git commit-tree $i_tree -p $b_commit) ||
77 die "Cannot save the current index state"
79 if test -z "$patch_mode"
82 # state of the working tree
85 cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
86 GIT_INDEX_FILE="$TMP-index" &&
87 export GIT_INDEX_FILE &&
88 git read-tree -m $i_tree &&
89 git diff --name-only -z HEAD | git update-index -z --add --remove --stdin &&
93 die "Cannot save the current worktree state"
98 GIT_INDEX_FILE="$TMP-index" git read-tree HEAD &&
100 # find out what the user wants
101 GIT_INDEX_FILE="$TMP-index" \
102 git add--interactive --patch=stash -- &&
104 # state of the working tree
105 w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||
106 die "Cannot save the current worktree state"
108 git diff-tree -p HEAD $w_tree > "$TMP-patch" &&
109 test -s "$TMP-patch" ||
110 die "No changes selected"
112 rm -f "$TMP-index" ||
113 die "Cannot remove temporary index (can't happen)"
118 if test -z "$stash_msg"
120 stash_msg=$(printf 'WIP on %s' "$msg")
122 stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg")
124 w_commit=$(printf '%s\n' "$stash_msg" |
125 git commit-tree $w_tree -p $b_commit -p $i_commit) ||
126 die "Cannot record working tree state"
153 echo "error: unknown option for 'stash save': $1"
154 echo " To provide a message, use git stash save -- '$1'"
166 git update-index -q --refresh
169 say 'No local changes to save'
172 test -f "$GIT_DIR/logs/$ref_stash" ||
173 clear_stash || die "Cannot initialize stash"
175 create_stash "$stash_msg"
177 # Make sure the reflog for stash is kept.
178 : >>"$GIT_DIR/logs/$ref_stash"
180 git update-ref -m "$stash_msg" $ref_stash $w_commit ||
181 die "Cannot save the current status"
182 say Saved working directory and index state "$stash_msg"
184 if test -z "$patch_mode"
186 git reset --hard ${GIT_QUIET:+-q}
188 if test -n "$keep_index" && test -n $i_tree
190 git read-tree --reset -u $i_tree
193 git apply -R < "$TMP-patch" ||
194 die "Cannot remove worktree changes"
196 if test -z "$keep_index"
204 git rev-parse --verify $ref_stash >/dev/null 2>&1
208 have_stash || return 0
209 git log --format="%gd: %gs" -g "$@" $ref_stash --
213 have_stash || die 'No stash found'
215 flags=$(git rev-parse --no-revs --flags "$@")
221 w_commit=$(git rev-parse --quiet --verify --default $ref_stash "$@") &&
222 b_commit=$(git rev-parse --quiet --verify "$w_commit^") ||
223 die "'$*' is not a stash"
225 git diff $flags $b_commit $w_commit
229 # Parses the remaining options looking for flags and
230 # at most one revision defaulting to ${ref_stash}@{0}
233 # Derives related tree and commit objects from the
234 # revision, if one is found.
236 # stash records the work tree, and is a merge between the
237 # base commit (first parent) and the index tree (second parent).
239 # REV is set to the symbolic version of the specified stash-like commit
240 # IS_STASH_LIKE is non-blank if ${REV} looks like a stash
241 # IS_STASH_REF is non-blank if the ${REV} looks like a stash ref
242 # s is set to the SHA1 of the stash commit
243 # w_commit is set to the commit containing the working tree
244 # b_commit is set to the base commit
245 # i_commit is set to the commit containing the index tree
246 # w_tree is set to the working tree
247 # b_tree is set to the base tree
248 # i_tree is set to the index tree
250 # GIT_QUIET is set to t if -q is specified
251 # INDEX_OPTION is set to --index if --index is specified.
252 # FLAGS is set to the remaining flags
255 # * too many revisions specified
256 # * no revision is specified and there is no stash stack
257 # * a revision is specified which cannot be resolve to a SHA1
258 # * a non-existent stash reference is specified
261 parse_flags_and_rev()
263 test "$PARSE_CACHE" = "$*" && return 0 # optimisation
277 REV=$(git rev-parse --no-flags --symbolic "$@" 2>/dev/null)
278 FLAGS=$(git rev-parse --no-revs -- "$@" 2>/dev/null)
296 FLAGS="${FLAGS}${FLAGS:+ }$1"
306 have_stash || die "No stash found."
307 set -- ${ref_stash}@{0}
313 die "Too many revisions specified: $REV"
317 REV=$(git rev-parse --quiet --symbolic --verify $1 2>/dev/null) || die "$1 is not valid reference"
319 i_commit=$(git rev-parse --quiet --verify $REV^2 2>/dev/null) &&
320 set -- $(git rev-parse $REV $REV^1 $REV: $REV^1: $REV^2: 2>/dev/null) &&
328 test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
331 if test "${REV}" != "${REV%{*\}}"
333 # maintainers: it would be better if git rev-parse indicated
334 # this condition with a non-zero status code but as of 1.7.2.1 it
335 # it did not. So, we use non-empty stderr output as a proxy for the
336 # condition of interest.
337 test -z "$(git rev-parse "$REV" 2>&1 >/dev/null)" || die "$REV does not exist in the stash log"
344 parse_flags_and_rev "$@"
345 test -n "$IS_STASH_LIKE"
348 assert_stash_like() {
349 is_stash_like "$@" || die "'$*' is not a stash-like commit"
353 is_stash_like "$@" && test -n "$IS_STASH_REF"
357 is_stash_ref "$@" || die "'$*' is not a stash reference"
382 have_stash || die 'Nothing to apply'
383 applied_stash="$ref_stash@{0}"
388 # stash records the work tree, and is a merge between the
389 # base commit (first parent) and the index tree (second parent).
390 s=$(git rev-parse --quiet --verify --default $ref_stash "$@") &&
391 w_tree=$(git rev-parse --quiet --verify "$s:") &&
392 b_tree=$(git rev-parse --quiet --verify "$s^1:") &&
393 i_tree=$(git rev-parse --quiet --verify "$s^2:") ||
394 die "$*: no valid stashed state found"
396 git update-index -q --refresh &&
397 git diff-files --quiet --ignore-submodules ||
398 die 'Cannot apply to a dirty working tree, please stage your changes'
400 # current index state
401 c_tree=$(git write-tree) ||
402 die 'Cannot apply a stash in the middle of a merge'
404 unstashed_index_tree=
405 if test -n "$unstash_index" && test "$b_tree" != "$i_tree" &&
406 test "$c_tree" != "$i_tree"
408 git diff-tree --binary $s^2^..$s^2 | git apply --cached
410 die 'Conflicts in index. Try without --index.'
411 unstashed_index_tree=$(git write-tree) ||
412 die 'Could not save index tree'
417 GITHEAD_$w_tree='Stashed changes' &&
418 GITHEAD_$c_tree='Updated upstream' &&
419 GITHEAD_$b_tree='Version stash was based on' &&
420 export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
423 if test -n "$GIT_QUIET"
425 export GIT_MERGE_VERBOSITY=0
427 if git merge-recursive $b_tree -- $c_tree $w_tree
430 if test -n "$unstashed_index_tree"
432 git read-tree "$unstashed_index_tree"
435 git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" &&
436 git read-tree --reset $c_tree &&
437 git update-index --add --stdin <"$a" ||
438 die "Cannot unstage modified files"
442 if test -n "$GIT_QUIET"
444 squelch='>/dev/null 2>&1'
446 eval "git status $squelch" || :
448 # Merge conflict; keep the exit status from merge-recursive
450 if test -n "$unstash_index"
452 echo >&2 'Index was not unstashed.'
459 have_stash || die 'No stash entries to drop'
476 set x "$ref_stash@{0}"
479 # Verify supplied argument looks like a stash entry
480 s=$(git rev-parse --verify "$@") &&
481 git rev-parse --verify "$s:" > /dev/null 2>&1 &&
482 git rev-parse --verify "$s^1:" > /dev/null 2>&1 &&
483 git rev-parse --verify "$s^2:" > /dev/null 2>&1 ||
484 die "$*: not a valid stashed state"
486 git reflog delete --updateref --rewrite "$@" &&
487 say "Dropped $* ($s)" || die "$*: Could not drop stash entry"
489 # clear_stash if we just dropped the last stash entry
490 git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash
494 have_stash || die 'Nothing to apply'
496 test -n "$1" || die 'No branch name specified'
501 set x "$ref_stash@{0}"
505 git checkout -b $branch $stash^ &&
506 apply_stash --index $stash &&
510 PARSE_CACHE='--not-parsed'
511 # The default command is "save" if nothing but options are given
517 *) seen_non_option=t; break ;;
521 test -n "$seen_non_option" || set "save" "$@"
546 if test $# -gt 0 && test "$1" = create
550 create_stash "$*" && echo "$w_commit"
560 drop_stash "$applied_stash"
571 say '(To restore them type "git stash apply")'