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 [-k|--keep-index] [-q|--quiet] [<message>]]
11 or: $dashless [-k|--keep-index]
20 TMP
="$GIT_DIR/.git-stash.$$"
21 trap 'rm -f "$TMP-*"' 0
25 if git config
--get-colorbool color.interactive
; then
26 help_color
="$(git config --get-color color.interactive.help 'red bold')"
27 reset_color
="$(git config --get-color '' reset)"
34 git diff-index
--quiet --cached HEAD
--ignore-submodules -- &&
35 git diff-files
--quiet --ignore-submodules
41 die
"git stash clear with parameters is unimplemented"
43 if current
=$
(git rev-parse
--verify $ref_stash 2>/dev
/null
)
45 git update-ref
-d $ref_stash $current
52 git update-index
-q --refresh
58 # state of the base commit
59 if b_commit
=$
(git rev-parse
--verify HEAD
)
61 head=$
(git log
--no-color --abbrev-commit --pretty=oneline
-n 1 HEAD
--)
63 die
"You do not have the initial commit yet"
66 if branch
=$
(git symbolic-ref
-q HEAD
)
68 branch
=${branch#refs/heads/}
72 msg
=$
(printf '%s: %s' "$branch" "$head")
75 i_tree
=$
(git write-tree
) &&
76 i_commit
=$
(printf 'index on %s\n' "$msg" |
77 git commit-tree
$i_tree -p $b_commit) ||
78 die
"Cannot save the current index state"
80 if test -z "$patch_mode"
83 # state of the working tree
86 cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
87 GIT_INDEX_FILE
="$TMP-index" &&
88 export GIT_INDEX_FILE
&&
89 git read-tree
-m $i_tree &&
94 die
"Cannot save the current worktree state"
99 GIT_INDEX_FILE
="$TMP-index" git read-tree HEAD
&&
101 # find out what the user wants
102 GIT_INDEX_FILE
="$TMP-index" \
103 git add--interactive
--patch=stash
-- &&
105 # state of the working tree
106 w_tree
=$
(GIT_INDEX_FILE
="$TMP-index" git write-tree
) ||
107 die
"Cannot save the current worktree state"
109 git diff-tree
-p HEAD
$w_tree > "$TMP-patch" &&
110 test -s "$TMP-patch" ||
111 die
"No changes selected"
113 rm -f "$TMP-index" ||
114 die
"Cannot remove temporary index (can't happen)"
119 if test -z "$stash_msg"
121 stash_msg
=$
(printf 'WIP on %s' "$msg")
123 stash_msg
=$
(printf 'On %s: %s' "$branch" "$stash_msg")
125 w_commit
=$
(printf '%s\n' "$stash_msg" |
126 git commit-tree
$w_tree -p $b_commit -p $i_commit) ||
127 die
"Cannot record working tree state"
158 git update-index
-q --refresh
161 say
'No local changes to save'
164 test -f "$GIT_DIR/logs/$ref_stash" ||
165 clear_stash || die
"Cannot initialize stash"
167 create_stash
"$stash_msg"
169 # Make sure the reflog for stash is kept.
170 : >>"$GIT_DIR/logs/$ref_stash"
172 git update-ref
-m "$stash_msg" $ref_stash $w_commit ||
173 die
"Cannot save the current status"
174 say Saved working directory and index state
"$stash_msg"
176 if test -z "$patch_mode"
178 git
reset --hard ${GIT_QUIET:+-q}
180 if test -n "$keep_index" && test -n $i_tree
182 git read-tree
--reset -u $i_tree
185 git apply
-R < "$TMP-patch" ||
186 die
"Cannot remove worktree changes"
188 if test -z "$keep_index"
196 git rev-parse
--verify $ref_stash >/dev
/null
2>&1
200 have_stash ||
return 0
201 git log
--no-color --pretty=oneline
-g "$@" $ref_stash -- |
202 sed -n -e 's/^[.0-9a-f]* refs\///p'
206 flags
=$
(git rev-parse
--no-revs --flags "$@")
212 w_commit
=$
(git rev-parse
--verify --default $ref_stash "$@") &&
213 b_commit
=$
(git rev-parse
--verify "$w_commit^") &&
214 git
diff $flags $b_commit $w_commit
218 git update-index
-q --refresh &&
219 git diff-files
--quiet --ignore-submodules ||
220 die
'Cannot apply to a dirty working tree, please stage your changes'
240 # current index state
241 c_tree
=$
(git write-tree
) ||
242 die
'Cannot apply a stash in the middle of a merge'
244 # stash records the work tree, and is a merge between the
245 # base commit (first parent) and the index tree (second parent).
246 s
=$
(git rev-parse
--verify --default $ref_stash "$@") &&
247 w_tree
=$
(git rev-parse
--verify "$s:") &&
248 b_tree
=$
(git rev-parse
--verify "$s^1:") &&
249 i_tree
=$
(git rev-parse
--verify "$s^2:") ||
250 die
"$*: no valid stashed state found"
252 unstashed_index_tree
=
253 if test -n "$unstash_index" && test "$b_tree" != "$i_tree" &&
254 test "$c_tree" != "$i_tree"
256 git diff-tree
--binary $s^
2^..
$s^
2 | git apply
--cached
258 die
'Conflicts in index. Try without --index.'
259 unstashed_index_tree
=$
(git write-tree
) ||
260 die
'Could not save index tree'
265 GITHEAD_$w_tree='Stashed changes' &&
266 GITHEAD_$c_tree='Updated upstream' &&
267 GITHEAD_$b_tree='Version stash was based on' &&
268 export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
271 if test -n "$GIT_QUIET"
273 export GIT_MERGE_VERBOSITY
=0
275 if git merge-recursive
$b_tree -- $c_tree $w_tree
278 if test -n "$unstashed_index_tree"
280 git read-tree
"$unstashed_index_tree"
283 git diff-index
--cached --name-only --diff-filter=A
$c_tree >"$a" &&
284 git read-tree
--reset $c_tree &&
285 git update-index
--add --stdin <"$a" ||
286 die
"Cannot unstage modified files"
290 if test -n "$GIT_QUIET"
292 squelch
='>/dev/null 2>&1'
294 eval "git status $squelch" ||
:
296 # Merge conflict; keep the exit status from merge-recursive
298 if test -n "$unstash_index"
300 echo >&2 'Index was not unstashed.'
307 have_stash || die
'No stash entries to drop'
324 set x
"$ref_stash@{0}"
327 # Verify supplied argument looks like a stash entry
328 s
=$
(git rev-parse
--verify "$@") &&
329 git rev-parse
--verify "$s:" > /dev
/null
2>&1 &&
330 git rev-parse
--verify "$s^1:" > /dev
/null
2>&1 &&
331 git rev-parse
--verify "$s^2:" > /dev
/null
2>&1 ||
332 die
"$*: not a valid stashed state"
334 git reflog delete
--updateref --rewrite "$@" &&
335 say
"Dropped $* ($s)" || die
"$*: Could not drop stash entry"
337 # clear_stash if we just dropped the last stash entry
338 git rev-parse
--verify "$ref_stash@{0}" > /dev
/null
2>&1 || clear_stash
342 have_stash || die
'Nothing to apply'
344 test -n "$1" || die
'No branch name specified'
349 set x
"$ref_stash@{0}"
353 git checkout
-b $branch $stash^
&&
354 apply_stash
--index $stash &&
386 if test $# -gt 0 && test "$1" = create
390 create_stash
"$*" && echo "$w_commit"
400 test -z "$unstash_index" ||
shift
410 0,,|
1,-k,|
1,--keep-index,|
1,-p,|
1,--patch,|
2,-p,--no-keep-index|
2,--patch,--no-keep-index)
412 say
'(To restore them type "git stash apply")'