2 # Copyright (c) 2007, Nanako Shiraishi
4 USAGE
='[ | list | show | apply | clear]'
12 TMP
="$GIT_DIR/.git-stash.$$"
13 trap 'rm -f "$TMP-*"' 0
18 git diff-index
--quiet --cached HEAD
&&
19 git diff-files
--quiet
23 if current
=$
(git rev-parse
--verify $ref_stash 2>/dev
/null
)
25 git update-ref
-d refs
/stash
$current
34 echo >&2 'No local changes to save'
37 test -f "$GIT_DIR/logs/$ref_stash" ||
38 clear_stash || die
"Cannot initialize stash"
40 # Make sure the reflog for stash is kept.
41 : >>"$GIT_DIR/logs/$ref_stash"
43 # state of the base commit
44 if b_commit
=$
(git rev-parse
--verify HEAD
)
46 head=$
(git log
--abbrev-commit --pretty=oneline
-n 1 HEAD
)
48 die
"You do not have the initial commit yet"
51 if branch
=$
(git symbolic-ref
-q HEAD
)
53 branch
=${branch#refs/heads/}
57 msg
=$
(printf '%s: %s' "$branch" "$head")
60 i_tree
=$
(git write-tree
) &&
61 i_commit
=$
(printf 'index on %s\n' "$msg" |
62 git commit-tree
$i_tree -p $b_commit) ||
63 die
"Cannot save the current index state"
65 # state of the working tree
68 cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
69 GIT_INDEX_FILE
="$TMP-index" &&
70 export GIT_INDEX_FILE
&&
71 git read-tree
-m $i_tree &&
76 die
"Cannot save the current worktree state"
79 if test -z "$stash_msg"
81 stash_msg
=$
(printf 'WIP on %s' "$msg")
83 stash_msg
=$
(printf 'On %s: %s' "$branch" "$stash_msg")
85 w_commit
=$
(printf '%s\n' "$stash_msg" |
86 git commit-tree
$w_tree -p $b_commit -p $i_commit) ||
87 die
"Cannot record working tree state"
89 git update-ref
-m "$stash_msg" $ref_stash $w_commit ||
90 die
"Cannot save the current status"
91 printf >&2 'Saved "%s"\n' "$stash_msg"
95 git rev-parse
--verify $ref_stash >/dev
/null
2>&1
99 have_stash ||
return 0
100 git log
--pretty=oneline
-g "$@" $ref_stash |
101 sed -n -e 's/^[.0-9a-f]* refs\///p'
105 flags
=$
(git rev-parse
--no-revs --flags "$@")
110 s
=$
(git rev-parse
--revs-only --no-flags --default $ref_stash "$@")
112 w_commit
=$
(git rev-parse
--verify "$s") &&
113 b_commit
=$
(git rev-parse
--verify "$s^") &&
114 git
diff $flags $b_commit $w_commit
118 git diff-files
--quiet ||
119 die
'Cannot restore on top of a dirty state'
128 # current index state
129 c_tree
=$
(git write-tree
) ||
130 die
'Cannot apply a stash in the middle of a merge'
132 # stash records the work tree, and is a merge between the
133 # base commit (first parent) and the index tree (second parent).
134 s
=$
(git rev-parse
--revs-only --no-flags --default $ref_stash "$@") &&
135 w_tree
=$
(git rev-parse
--verify "$s:") &&
136 b_tree
=$
(git rev-parse
--verify "$s^1:") &&
137 i_tree
=$
(git rev-parse
--verify "$s^2:") ||
138 die
"$*: no valid stashed state found"
140 unstashed_index_tree
=
141 if test -n "$unstash_index" && test "$b_tree" != "$i_tree"
143 git diff-tree
--binary $s^
2^..
$s^
2 | git apply
--cached
145 die
'Conflicts in index. Try without --index.'
146 unstashed_index_tree
=$
(git-write-tree
) ||
147 die
'Could not save index tree'
152 GITHEAD_$w_tree='Stashed changes' &&
153 GITHEAD_$c_tree='Updated upstream' &&
154 GITHEAD_$b_tree='Version stash was based on' &&
155 export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
158 if git-merge-recursive
$b_tree -- $c_tree $w_tree
161 if test -n "$unstashed_index_tree"
163 git read-tree
"$unstashed_index_tree"
166 git diff-index
--cached --name-only --diff-filter=A
$c_tree >"$a" &&
167 git read-tree
--reset $c_tree &&
168 git update-index
--add --stdin <"$a" ||
169 die
"Cannot unstage modified files"
174 # Merge conflict; keep the exit status from merge-recursive
176 if test -n "$unstash_index"
178 echo >&2 'Index was not unstashed.'
210 if test $# -gt 0 && test "$1" = save
214 save_stash
"$*" && git-reset
--hard