2 # Copyright (c) 2007, Nanako Shiraishi
4 USAGE='[ | list | show | apply | clear]'
11 TMP="$GIT_DIR/.git-stash.$$"
12 trap 'rm -f "$TMP-*"' 0
17 git diff-index --quiet --cached HEAD &&
18 git diff-files --quiet
22 logfile="$GIT_DIR/logs/$ref_stash" &&
23 mkdir -p "$(dirname "$logfile")" &&
32 echo >&2 'No local changes to save'
35 test -f "$GIT_DIR/logs/$ref_stash" ||
36 clear_stash || die "Cannot initialize stash"
38 # state of the base commit
39 if b_commit=$(git rev-parse --verify HEAD)
41 head=$(git log --abbrev-commit --pretty=oneline -n 1 HEAD)
43 die "You do not have the initial commit yet"
46 if branch=$(git symbolic-ref -q HEAD)
48 branch=${branch#refs/heads/}
52 msg=$(printf '%s: %s' "$branch" "$head")
55 i_tree=$(git write-tree) &&
56 i_commit=$(printf 'index on %s' "$msg" |
57 git commit-tree $i_tree -p $b_commit) ||
58 die "Cannot save the current index state"
60 # state of the working tree
63 cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
64 GIT_INDEX_FILE="$TMP-index" &&
65 export GIT_INDEX_FILE &&
66 git read-tree -m $i_tree &&
71 die "Cannot save the current worktree state"
74 if test -z "$stash_msg"
76 stash_msg=$(printf 'WIP on %s' "$msg")
78 stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg")
80 w_commit=$(printf '%s\n' "$stash_msg" |
81 git commit-tree $w_tree -p $b_commit -p $i_commit) ||
82 die "Cannot record working tree state"
84 git update-ref -m "$stash_msg" $ref_stash $w_commit ||
85 die "Cannot save the current status"
86 printf >&2 'Saved "%s"\n' "$stash_msg"
90 git rev-parse --verify $ref_stash >/dev/null 2>&1
94 have_stash || return 0
95 git log --pretty=oneline -g "$@" $ref_stash |
96 sed -n -e 's/^[.0-9a-f]* refs\///p'
100 flags=$(git rev-parse --no-revs --flags "$@")
105 s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@")
107 w_commit=$(git rev-parse --verify "$s") &&
108 b_commit=$(git rev-parse --verify "$s^") &&
109 git diff $flags $b_commit $w_commit
113 git diff-files --quiet ||
114 die 'Cannot restore on top of a dirty state'
123 # current index state
124 c_tree=$(git write-tree) ||
125 die 'Cannot apply a stash in the middle of a merge'
127 s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@") &&
128 w_tree=$(git rev-parse --verify "$s:") &&
129 b_tree=$(git rev-parse --verify "$s^:") ||
130 die "$*: no valid stashed state found"
132 test -z "$unstash_index" || {
133 git diff --binary $s^2^..$s^2 | git apply --cached
135 die 'Conflicts in index. Try without --index.'
136 unstashed_index_tree=$(git-write-tree) ||
137 die 'Could not save index tree'
142 GITHEAD_$w_tree='Stashed changes' &&
143 GITHEAD_$c_tree='Updated upstream' &&
144 GITHEAD_$b_tree='Version stash was based on' &&
145 export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
148 if git-merge-recursive $b_tree -- $c_tree $w_tree
152 git diff --cached --name-only --diff-filter=A $c_tree >"$a" &&
153 git read-tree --reset $c_tree &&
154 git update-index --add --stdin <"$a" ||
155 die "Cannot unstage modified files"
158 test -z "$unstash_index" || git read-tree $unstashed_index_tree
160 # Merge conflict; keep the exit status from merge-recursive
162 test -z "$unstash_index" || echo 'Index was not unstashed.' >&2
193 if test $# -gt 0 && test "$1" = save
197 save_stash "$*" && git-reset --hard