]>
Commit | Line | Data |
---|---|---|
f2c66ed1 NS |
1 | #!/bin/sh |
2 | # Copyright (c) 2007, Nanako Shiraishi | |
3 | ||
4 | USAGE='[ | list | show | apply | clear]' | |
5 | ||
3cd2491a | 6 | SUBDIRECTORY_OK=Yes |
f2c66ed1 NS |
7 | . git-sh-setup |
8 | require_work_tree | |
9 | ||
10 | TMP="$GIT_DIR/.git-stash.$$" | |
11 | trap 'rm -f "$TMP-*"' 0 | |
12 | ||
13 | ref_stash=refs/stash | |
14 | ||
15 | no_changes () { | |
5be60078 JH |
16 | git diff-index --quiet --cached HEAD && |
17 | git diff-files --quiet | |
f2c66ed1 NS |
18 | } |
19 | ||
20 | clear_stash () { | |
21 | logfile="$GIT_DIR/logs/$ref_stash" && | |
22 | mkdir -p "$(dirname "$logfile")" && | |
23 | : >"$logfile" | |
24 | } | |
25 | ||
26 | save_stash () { | |
9f62e18a JH |
27 | stash_msg="$1" |
28 | ||
f2c66ed1 NS |
29 | if no_changes |
30 | then | |
31 | echo >&2 'No local changes to save' | |
32 | exit 0 | |
33 | fi | |
34 | test -f "$GIT_DIR/logs/$ref_stash" || | |
35 | clear_stash || die "Cannot initialize stash" | |
36 | ||
37 | # state of the base commit | |
5be60078 | 38 | if b_commit=$(git rev-parse --verify HEAD) |
f2c66ed1 | 39 | then |
5be60078 | 40 | head=$(git log --abbrev-commit --pretty=oneline -n 1 HEAD) |
f2c66ed1 NS |
41 | else |
42 | die "You do not have the initial commit yet" | |
43 | fi | |
44 | ||
5be60078 | 45 | if branch=$(git symbolic-ref -q HEAD) |
f2c66ed1 NS |
46 | then |
47 | branch=${branch#refs/heads/} | |
48 | else | |
49 | branch='(no branch)' | |
50 | fi | |
51 | msg=$(printf '%s: %s' "$branch" "$head") | |
52 | ||
53 | # state of the index | |
5be60078 | 54 | i_tree=$(git write-tree) && |
f2c66ed1 | 55 | i_commit=$(printf 'index on %s' "$msg" | |
5be60078 | 56 | git commit-tree $i_tree -p $b_commit) || |
f2c66ed1 NS |
57 | die "Cannot save the current index state" |
58 | ||
59 | # state of the working tree | |
60 | w_tree=$( ( | |
b24f56d6 JH |
61 | rm -f "$TMP-index" && |
62 | cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" && | |
f2c66ed1 NS |
63 | GIT_INDEX_FILE="$TMP-index" && |
64 | export GIT_INDEX_FILE && | |
b24f56d6 | 65 | git read-tree -m $i_tree && |
5be60078 JH |
66 | git add -u && |
67 | git write-tree && | |
f2c66ed1 NS |
68 | rm -f "$TMP-index" |
69 | ) ) || | |
70 | die "Cannot save the current worktree state" | |
71 | ||
72 | # create the stash | |
9f62e18a JH |
73 | if test -z "$stash_msg" |
74 | then | |
75 | stash_msg=$(printf 'WIP on %s' "$msg") | |
76 | else | |
77 | stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg") | |
78 | fi | |
79 | w_commit=$(printf '%s\n' "$stash_msg" | | |
5be60078 | 80 | git commit-tree $w_tree -p $b_commit -p $i_commit) || |
f2c66ed1 NS |
81 | die "Cannot record working tree state" |
82 | ||
9f62e18a | 83 | git update-ref -m "$stash_msg" $ref_stash $w_commit || |
f2c66ed1 | 84 | die "Cannot save the current status" |
9f62e18a | 85 | printf >&2 'Saved "%s"\n' "$stash_msg" |
f2c66ed1 NS |
86 | } |
87 | ||
401de405 | 88 | have_stash () { |
5be60078 | 89 | git rev-parse --verify $ref_stash >/dev/null 2>&1 |
401de405 JK |
90 | } |
91 | ||
f2c66ed1 | 92 | list_stash () { |
401de405 | 93 | have_stash || return 0 |
5be60078 | 94 | git log --pretty=oneline -g "$@" $ref_stash | |
f2c66ed1 NS |
95 | sed -n -e 's/^[.0-9a-f]* refs\///p' |
96 | } | |
97 | ||
98 | show_stash () { | |
5be60078 | 99 | flags=$(git rev-parse --no-revs --flags "$@") |
f2c66ed1 NS |
100 | if test -z "$flags" |
101 | then | |
102 | flags=--stat | |
103 | fi | |
5be60078 | 104 | s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@") |
f2c66ed1 | 105 | |
5be60078 JH |
106 | w_commit=$(git rev-parse --verify "$s") && |
107 | b_commit=$(git rev-parse --verify "$s^") && | |
108 | git diff $flags $b_commit $w_commit | |
f2c66ed1 NS |
109 | } |
110 | ||
111 | apply_stash () { | |
5be60078 | 112 | git diff-files --quiet || |
f2c66ed1 NS |
113 | die 'Cannot restore on top of a dirty state' |
114 | ||
150937c4 JS |
115 | unstash_index= |
116 | case "$1" in | |
117 | --index) | |
118 | unstash_index=t | |
119 | shift | |
120 | esac | |
121 | ||
f2c66ed1 | 122 | # current index state |
5be60078 | 123 | c_tree=$(git write-tree) || |
f2c66ed1 NS |
124 | die 'Cannot apply a stash in the middle of a merge' |
125 | ||
5be60078 JH |
126 | s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@") && |
127 | w_tree=$(git rev-parse --verify "$s:") && | |
128 | b_tree=$(git rev-parse --verify "$s^:") || | |
f2c66ed1 NS |
129 | die "$*: no valid stashed state found" |
130 | ||
150937c4 JS |
131 | test -z "$unstash_index" || { |
132 | git diff --binary $s^2^..$s^2 | git apply --cached | |
133 | test $? -ne 0 && | |
134 | die 'Conflicts in index. Try without --index.' | |
135 | unstashed_index_tree=$(git-write-tree) || | |
136 | die 'Could not save index tree' | |
137 | git reset | |
138 | } | |
139 | ||
f2c66ed1 NS |
140 | eval " |
141 | GITHEAD_$w_tree='Stashed changes' && | |
142 | GITHEAD_$c_tree='Updated upstream' && | |
143 | GITHEAD_$b_tree='Version stash was based on' && | |
144 | export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree | |
145 | " | |
146 | ||
147 | if git-merge-recursive $b_tree -- $c_tree $w_tree | |
148 | then | |
149 | # No conflict | |
150 | a="$TMP-added" && | |
5be60078 JH |
151 | git diff --cached --name-only --diff-filter=A $c_tree >"$a" && |
152 | git read-tree --reset $c_tree && | |
153 | git update-index --add --stdin <"$a" || | |
f2c66ed1 NS |
154 | die "Cannot unstage modified files" |
155 | git-status | |
156 | rm -f "$a" | |
150937c4 | 157 | test -z "$unstash_index" || git read-tree $unstashed_index_tree |
f2c66ed1 NS |
158 | else |
159 | # Merge conflict; keep the exit status from merge-recursive | |
150937c4 JS |
160 | status=$? |
161 | test -z "$unstash_index" || echo 'Index was not unstashed.' >&2 | |
162 | exit $status | |
f2c66ed1 NS |
163 | fi |
164 | } | |
165 | ||
166 | # Main command set | |
167 | case "$1" in | |
fcb10a96 JH |
168 | list) |
169 | shift | |
f2c66ed1 NS |
170 | if test $# = 0 |
171 | then | |
172 | set x -n 10 | |
173 | shift | |
174 | fi | |
175 | list_stash "$@" | |
176 | ;; | |
177 | show) | |
178 | shift | |
179 | show_stash "$@" | |
180 | ;; | |
181 | apply) | |
182 | shift | |
183 | apply_stash "$@" | |
184 | ;; | |
185 | clear) | |
186 | clear_stash | |
187 | ;; | |
9f62e18a JH |
188 | help | usage) |
189 | usage | |
f2c66ed1 NS |
190 | ;; |
191 | *) | |
9f62e18a JH |
192 | if test $# -gt 0 && test "$1" = save |
193 | then | |
194 | shift | |
195 | fi | |
196 | save_stash "$*" && git-reset --hard | |
197 | ;; | |
f2c66ed1 | 198 | esac |