]>
Commit | Line | Data |
---|---|---|
f2c66ed1 NS |
1 | #!/bin/sh |
2 | # Copyright (c) 2007, Nanako Shiraishi | |
3 | ||
bd56ff54 | 4 | USAGE='[ | save | list | show | apply | clear | drop | pop | create ]' |
f2c66ed1 | 5 | |
3cd2491a | 6 | SUBDIRECTORY_OK=Yes |
8f321a39 | 7 | OPTIONS_SPEC= |
f2c66ed1 NS |
8 | . git-sh-setup |
9 | require_work_tree | |
ceff079b | 10 | cd_to_toplevel |
f2c66ed1 NS |
11 | |
12 | TMP="$GIT_DIR/.git-stash.$$" | |
13 | trap 'rm -f "$TMP-*"' 0 | |
14 | ||
15 | ref_stash=refs/stash | |
16 | ||
17 | no_changes () { | |
6848d58c JS |
18 | git diff-index --quiet --cached HEAD --ignore-submodules -- && |
19 | git diff-files --quiet --ignore-submodules | |
f2c66ed1 NS |
20 | } |
21 | ||
22 | clear_stash () { | |
3023dc69 JH |
23 | if test $# != 0 |
24 | then | |
25 | die "git stash clear with parameters is unimplemented" | |
26 | fi | |
7ab3cc70 JH |
27 | if current=$(git rev-parse --verify $ref_stash 2>/dev/null) |
28 | then | |
a9ee9bf9 | 29 | git update-ref -d $ref_stash $current |
7ab3cc70 | 30 | fi |
f2c66ed1 NS |
31 | } |
32 | ||
bc9e7399 | 33 | create_stash () { |
9f62e18a JH |
34 | stash_msg="$1" |
35 | ||
f2c66ed1 NS |
36 | if no_changes |
37 | then | |
f2c66ed1 NS |
38 | exit 0 |
39 | fi | |
f12e925a | 40 | |
f2c66ed1 | 41 | # state of the base commit |
5be60078 | 42 | if b_commit=$(git rev-parse --verify HEAD) |
f2c66ed1 | 43 | then |
aa4f31d5 | 44 | head=$(git log --no-color --abbrev-commit --pretty=oneline -n 1 HEAD --) |
f2c66ed1 NS |
45 | else |
46 | die "You do not have the initial commit yet" | |
47 | fi | |
48 | ||
5be60078 | 49 | if branch=$(git symbolic-ref -q HEAD) |
f2c66ed1 NS |
50 | then |
51 | branch=${branch#refs/heads/} | |
52 | else | |
53 | branch='(no branch)' | |
54 | fi | |
55 | msg=$(printf '%s: %s' "$branch" "$head") | |
56 | ||
57 | # state of the index | |
5be60078 | 58 | i_tree=$(git write-tree) && |
6143fa2c | 59 | i_commit=$(printf 'index on %s\n' "$msg" | |
5be60078 | 60 | git commit-tree $i_tree -p $b_commit) || |
f2c66ed1 NS |
61 | die "Cannot save the current index state" |
62 | ||
63 | # state of the working tree | |
64 | w_tree=$( ( | |
b24f56d6 JH |
65 | rm -f "$TMP-index" && |
66 | cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" && | |
f2c66ed1 NS |
67 | GIT_INDEX_FILE="$TMP-index" && |
68 | export GIT_INDEX_FILE && | |
b24f56d6 | 69 | git read-tree -m $i_tree && |
5be60078 JH |
70 | git add -u && |
71 | git write-tree && | |
f2c66ed1 NS |
72 | rm -f "$TMP-index" |
73 | ) ) || | |
74 | die "Cannot save the current worktree state" | |
75 | ||
76 | # create the stash | |
9f62e18a JH |
77 | if test -z "$stash_msg" |
78 | then | |
79 | stash_msg=$(printf 'WIP on %s' "$msg") | |
80 | else | |
81 | stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg") | |
82 | fi | |
83 | w_commit=$(printf '%s\n' "$stash_msg" | | |
5be60078 | 84 | git commit-tree $w_tree -p $b_commit -p $i_commit) || |
f2c66ed1 | 85 | die "Cannot record working tree state" |
bc9e7399 | 86 | } |
f2c66ed1 | 87 | |
bc9e7399 | 88 | save_stash () { |
7bedebca SG |
89 | keep_index= |
90 | case "$1" in | |
91 | --keep-index) | |
92 | keep_index=t | |
93 | shift | |
94 | esac | |
95 | ||
47629dcf | 96 | stash_msg="$*" |
bc9e7399 JH |
97 | |
98 | if no_changes | |
99 | then | |
7c390d90 | 100 | echo 'No local changes to save' |
bc9e7399 JH |
101 | exit 0 |
102 | fi | |
103 | test -f "$GIT_DIR/logs/$ref_stash" || | |
104 | clear_stash || die "Cannot initialize stash" | |
105 | ||
106 | create_stash "$stash_msg" | |
a9ee9bf9 EM |
107 | |
108 | # Make sure the reflog for stash is kept. | |
109 | : >>"$GIT_DIR/logs/$ref_stash" | |
f2c66ed1 | 110 | |
9f62e18a | 111 | git update-ref -m "$stash_msg" $ref_stash $w_commit || |
f2c66ed1 | 112 | die "Cannot save the current status" |
7c390d90 | 113 | printf 'Saved working directory and index state "%s"\n' "$stash_msg" |
7bedebca SG |
114 | |
115 | git reset --hard | |
116 | ||
117 | if test -n "$keep_index" && test -n $i_tree | |
118 | then | |
119 | git read-tree --reset -u $i_tree | |
120 | fi | |
f2c66ed1 NS |
121 | } |
122 | ||
401de405 | 123 | have_stash () { |
5be60078 | 124 | git rev-parse --verify $ref_stash >/dev/null 2>&1 |
401de405 JK |
125 | } |
126 | ||
f2c66ed1 | 127 | list_stash () { |
401de405 | 128 | have_stash || return 0 |
aa4f31d5 | 129 | git log --no-color --pretty=oneline -g "$@" $ref_stash -- | |
f2c66ed1 NS |
130 | sed -n -e 's/^[.0-9a-f]* refs\///p' |
131 | } | |
132 | ||
133 | show_stash () { | |
5be60078 | 134 | flags=$(git rev-parse --no-revs --flags "$@") |
f2c66ed1 NS |
135 | if test -z "$flags" |
136 | then | |
137 | flags=--stat | |
138 | fi | |
5be60078 | 139 | s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@") |
f2c66ed1 | 140 | |
5be60078 JH |
141 | w_commit=$(git rev-parse --verify "$s") && |
142 | b_commit=$(git rev-parse --verify "$s^") && | |
e7187e4e | 143 | git diff $flags $b_commit $w_commit |
f2c66ed1 NS |
144 | } |
145 | ||
146 | apply_stash () { | |
6848d58c | 147 | git diff-files --quiet --ignore-submodules || |
f2c66ed1 NS |
148 | die 'Cannot restore on top of a dirty state' |
149 | ||
150937c4 JS |
150 | unstash_index= |
151 | case "$1" in | |
152 | --index) | |
153 | unstash_index=t | |
154 | shift | |
155 | esac | |
156 | ||
f2c66ed1 | 157 | # current index state |
5be60078 | 158 | c_tree=$(git write-tree) || |
f2c66ed1 NS |
159 | die 'Cannot apply a stash in the middle of a merge' |
160 | ||
cbeaccc3 JH |
161 | # stash records the work tree, and is a merge between the |
162 | # base commit (first parent) and the index tree (second parent). | |
5be60078 JH |
163 | s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@") && |
164 | w_tree=$(git rev-parse --verify "$s:") && | |
cbeaccc3 JH |
165 | b_tree=$(git rev-parse --verify "$s^1:") && |
166 | i_tree=$(git rev-parse --verify "$s^2:") || | |
f2c66ed1 NS |
167 | die "$*: no valid stashed state found" |
168 | ||
cbeaccc3 | 169 | unstashed_index_tree= |
7bedebca SG |
170 | if test -n "$unstash_index" && test "$b_tree" != "$i_tree" && |
171 | test "$c_tree" != "$i_tree" | |
cbeaccc3 | 172 | then |
89d750bf | 173 | git diff-tree --binary $s^2^..$s^2 | git apply --cached |
150937c4 JS |
174 | test $? -ne 0 && |
175 | die 'Conflicts in index. Try without --index.' | |
176 | unstashed_index_tree=$(git-write-tree) || | |
177 | die 'Could not save index tree' | |
178 | git reset | |
cbeaccc3 | 179 | fi |
150937c4 | 180 | |
f2c66ed1 NS |
181 | eval " |
182 | GITHEAD_$w_tree='Stashed changes' && | |
183 | GITHEAD_$c_tree='Updated upstream' && | |
184 | GITHEAD_$b_tree='Version stash was based on' && | |
185 | export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree | |
186 | " | |
187 | ||
188 | if git-merge-recursive $b_tree -- $c_tree $w_tree | |
189 | then | |
190 | # No conflict | |
cbeaccc3 JH |
191 | if test -n "$unstashed_index_tree" |
192 | then | |
193 | git read-tree "$unstashed_index_tree" | |
83b3df7d JH |
194 | else |
195 | a="$TMP-added" && | |
89d750bf | 196 | git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" && |
83b3df7d JH |
197 | git read-tree --reset $c_tree && |
198 | git update-index --add --stdin <"$a" || | |
199 | die "Cannot unstage modified files" | |
200 | rm -f "$a" | |
cbeaccc3 JH |
201 | fi |
202 | git status || : | |
f2c66ed1 NS |
203 | else |
204 | # Merge conflict; keep the exit status from merge-recursive | |
150937c4 | 205 | status=$? |
cbeaccc3 JH |
206 | if test -n "$unstash_index" |
207 | then | |
208 | echo >&2 'Index was not unstashed.' | |
209 | fi | |
150937c4 | 210 | exit $status |
f2c66ed1 NS |
211 | fi |
212 | } | |
213 | ||
e25d5f9c BC |
214 | drop_stash () { |
215 | have_stash || die 'No stash entries to drop' | |
216 | ||
217 | if test $# = 0 | |
218 | then | |
219 | set x "$ref_stash@{0}" | |
220 | shift | |
221 | fi | |
222 | # Verify supplied argument looks like a stash entry | |
223 | s=$(git rev-parse --revs-only --no-flags "$@") && | |
224 | git rev-parse --verify "$s:" > /dev/null 2>&1 && | |
225 | git rev-parse --verify "$s^1:" > /dev/null 2>&1 && | |
226 | git rev-parse --verify "$s^2:" > /dev/null 2>&1 || | |
227 | die "$*: not a valid stashed state" | |
228 | ||
229 | git reflog delete --updateref --rewrite "$@" && | |
230 | echo "Dropped $* ($s)" || die "$*: Could not drop stash entry" | |
231 | ||
232 | # clear_stash if we just dropped the last stash entry | |
233 | git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash | |
234 | } | |
235 | ||
656b5034 AMS |
236 | apply_to_branch () { |
237 | have_stash || die 'Nothing to apply' | |
238 | ||
239 | test -n "$1" || die 'No branch name specified' | |
240 | branch=$1 | |
241 | ||
242 | if test -z "$2" | |
243 | then | |
244 | set x "$ref_stash@{0}" | |
245 | fi | |
246 | stash=$2 | |
247 | ||
248 | git-checkout -b $branch $stash^ && | |
249 | apply_stash --index $stash && | |
250 | drop_stash $stash | |
251 | } | |
252 | ||
f2c66ed1 NS |
253 | # Main command set |
254 | case "$1" in | |
fcb10a96 JH |
255 | list) |
256 | shift | |
f2c66ed1 NS |
257 | if test $# = 0 |
258 | then | |
259 | set x -n 10 | |
260 | shift | |
261 | fi | |
262 | list_stash "$@" | |
263 | ;; | |
264 | show) | |
265 | shift | |
266 | show_stash "$@" | |
267 | ;; | |
683befa1 KL |
268 | save) |
269 | shift | |
47629dcf | 270 | save_stash "$@" |
683befa1 | 271 | ;; |
f2c66ed1 NS |
272 | apply) |
273 | shift | |
274 | apply_stash "$@" | |
275 | ;; | |
276 | clear) | |
3023dc69 JH |
277 | shift |
278 | clear_stash "$@" | |
f2c66ed1 | 279 | ;; |
bc9e7399 JH |
280 | create) |
281 | if test $# -gt 0 && test "$1" = create | |
282 | then | |
283 | shift | |
284 | fi | |
285 | create_stash "$*" && echo "$w_commit" | |
286 | ;; | |
e25d5f9c BC |
287 | drop) |
288 | shift | |
289 | drop_stash "$@" | |
290 | ;; | |
bd56ff54 BC |
291 | pop) |
292 | shift | |
293 | if apply_stash "$@" | |
294 | then | |
295 | test -z "$unstash_index" || shift | |
296 | drop_stash "$@" | |
297 | fi | |
298 | ;; | |
656b5034 AMS |
299 | branch) |
300 | shift | |
301 | apply_to_branch "$@" | |
302 | ;; | |
f2c66ed1 | 303 | *) |
683befa1 | 304 | if test $# -eq 0 |
9f62e18a | 305 | then |
97bc00a4 | 306 | save_stash && |
7bedebca | 307 | echo '(To restore them type "git stash apply")' |
683befa1 KL |
308 | else |
309 | usage | |
9f62e18a | 310 | fi |
9f62e18a | 311 | ;; |
f2c66ed1 | 312 | esac |