]>
Commit | Line | Data |
---|---|---|
f2c66ed1 NS |
1 | #!/bin/sh |
2 | # Copyright (c) 2007, Nanako Shiraishi | |
3 | ||
a5ab00c5 SB |
4 | dashless=$(basename "$0" | sed -e 's/-/ /') |
5 | USAGE="list [<options>] | |
fcdd0e92 SB |
6 | or: $dashless show [<stash>] |
7 | or: $dashless drop [-q|--quiet] [<stash>] | |
8 | or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>] | |
a5ab00c5 | 9 | or: $dashless branch <branchname> [<stash>] |
ea41cfc4 JS |
10 | or: $dashless [save [-k|--keep-index] [-q|--quiet] [<message>]] |
11 | or: $dashless [-k|--keep-index] | |
a5ab00c5 | 12 | or: $dashless clear" |
f2c66ed1 | 13 | |
3cd2491a | 14 | SUBDIRECTORY_OK=Yes |
8f321a39 | 15 | OPTIONS_SPEC= |
f2c66ed1 NS |
16 | . git-sh-setup |
17 | require_work_tree | |
ceff079b | 18 | cd_to_toplevel |
f2c66ed1 NS |
19 | |
20 | TMP="$GIT_DIR/.git-stash.$$" | |
21 | trap 'rm -f "$TMP-*"' 0 | |
22 | ||
23 | ref_stash=refs/stash | |
24 | ||
dda1f2a5 TR |
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)" | |
28 | else | |
29 | help_color= | |
30 | reset_color= | |
31 | fi | |
32 | ||
f2c66ed1 | 33 | no_changes () { |
6848d58c JS |
34 | git diff-index --quiet --cached HEAD --ignore-submodules -- && |
35 | git diff-files --quiet --ignore-submodules | |
f2c66ed1 NS |
36 | } |
37 | ||
38 | clear_stash () { | |
3023dc69 JH |
39 | if test $# != 0 |
40 | then | |
41 | die "git stash clear with parameters is unimplemented" | |
42 | fi | |
0e32126f | 43 | if current=$(git rev-parse --verify $ref_stash 2>/dev/null) |
7ab3cc70 | 44 | then |
a9ee9bf9 | 45 | git update-ref -d $ref_stash $current |
7ab3cc70 | 46 | fi |
f2c66ed1 NS |
47 | } |
48 | ||
bc9e7399 | 49 | create_stash () { |
9f62e18a JH |
50 | stash_msg="$1" |
51 | ||
1eff26c0 | 52 | git update-index -q --refresh |
f2c66ed1 NS |
53 | if no_changes |
54 | then | |
f2c66ed1 NS |
55 | exit 0 |
56 | fi | |
f12e925a | 57 | |
f2c66ed1 | 58 | # state of the base commit |
5be60078 | 59 | if b_commit=$(git rev-parse --verify HEAD) |
f2c66ed1 | 60 | then |
aa4f31d5 | 61 | head=$(git log --no-color --abbrev-commit --pretty=oneline -n 1 HEAD --) |
f2c66ed1 NS |
62 | else |
63 | die "You do not have the initial commit yet" | |
64 | fi | |
65 | ||
5be60078 | 66 | if branch=$(git symbolic-ref -q HEAD) |
f2c66ed1 NS |
67 | then |
68 | branch=${branch#refs/heads/} | |
69 | else | |
70 | branch='(no branch)' | |
71 | fi | |
72 | msg=$(printf '%s: %s' "$branch" "$head") | |
73 | ||
74 | # state of the index | |
5be60078 | 75 | i_tree=$(git write-tree) && |
6143fa2c | 76 | i_commit=$(printf 'index on %s\n' "$msg" | |
5be60078 | 77 | git commit-tree $i_tree -p $b_commit) || |
f2c66ed1 NS |
78 | die "Cannot save the current index state" |
79 | ||
dda1f2a5 TR |
80 | if test -z "$patch_mode" |
81 | then | |
82 | ||
83 | # state of the working tree | |
84 | w_tree=$( ( | |
85 | rm -f "$TMP-index" && | |
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 && | |
90 | git add -u && | |
91 | git write-tree && | |
92 | rm -f "$TMP-index" | |
93 | ) ) || | |
94 | die "Cannot save the current worktree state" | |
95 | ||
96 | else | |
97 | ||
b24f56d6 | 98 | rm -f "$TMP-index" && |
dda1f2a5 TR |
99 | GIT_INDEX_FILE="$TMP-index" git read-tree HEAD && |
100 | ||
101 | # find out what the user wants | |
102 | GIT_INDEX_FILE="$TMP-index" \ | |
103 | git add--interactive --patch=stash -- && | |
104 | ||
105 | # state of the working tree | |
106 | w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || | |
f2c66ed1 NS |
107 | die "Cannot save the current worktree state" |
108 | ||
dda1f2a5 TR |
109 | git diff-tree -p HEAD $w_tree > "$TMP-patch" && |
110 | test -s "$TMP-patch" || | |
111 | die "No changes selected" | |
112 | ||
113 | rm -f "$TMP-index" || | |
114 | die "Cannot remove temporary index (can't happen)" | |
115 | ||
116 | fi | |
117 | ||
f2c66ed1 | 118 | # create the stash |
9f62e18a JH |
119 | if test -z "$stash_msg" |
120 | then | |
121 | stash_msg=$(printf 'WIP on %s' "$msg") | |
122 | else | |
123 | stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg") | |
124 | fi | |
125 | w_commit=$(printf '%s\n' "$stash_msg" | | |
5be60078 | 126 | git commit-tree $w_tree -p $b_commit -p $i_commit) || |
f2c66ed1 | 127 | die "Cannot record working tree state" |
bc9e7399 | 128 | } |
f2c66ed1 | 129 | |
bc9e7399 | 130 | save_stash () { |
7bedebca | 131 | keep_index= |
dda1f2a5 | 132 | patch_mode= |
fcdd0e92 SB |
133 | while test $# != 0 |
134 | do | |
135 | case "$1" in | |
ea41cfc4 | 136 | -k|--keep-index) |
fcdd0e92 SB |
137 | keep_index=t |
138 | ;; | |
dda1f2a5 TR |
139 | --no-keep-index) |
140 | keep_index= | |
141 | ;; | |
142 | -p|--patch) | |
143 | patch_mode=t | |
144 | keep_index=t | |
145 | ;; | |
fcdd0e92 SB |
146 | -q|--quiet) |
147 | GIT_QUIET=t | |
148 | ;; | |
149 | *) | |
150 | break | |
151 | ;; | |
152 | esac | |
7bedebca | 153 | shift |
fcdd0e92 | 154 | done |
7bedebca | 155 | |
47629dcf | 156 | stash_msg="$*" |
bc9e7399 | 157 | |
1eff26c0 | 158 | git update-index -q --refresh |
bc9e7399 JH |
159 | if no_changes |
160 | then | |
fcdd0e92 | 161 | say 'No local changes to save' |
bc9e7399 JH |
162 | exit 0 |
163 | fi | |
164 | test -f "$GIT_DIR/logs/$ref_stash" || | |
165 | clear_stash || die "Cannot initialize stash" | |
166 | ||
167 | create_stash "$stash_msg" | |
a9ee9bf9 EM |
168 | |
169 | # Make sure the reflog for stash is kept. | |
170 | : >>"$GIT_DIR/logs/$ref_stash" | |
f2c66ed1 | 171 | |
9f62e18a | 172 | git update-ref -m "$stash_msg" $ref_stash $w_commit || |
f2c66ed1 | 173 | die "Cannot save the current status" |
fcdd0e92 | 174 | say Saved working directory and index state "$stash_msg" |
7bedebca | 175 | |
dda1f2a5 | 176 | if test -z "$patch_mode" |
7bedebca | 177 | then |
dda1f2a5 TR |
178 | git reset --hard ${GIT_QUIET:+-q} |
179 | ||
180 | if test -n "$keep_index" && test -n $i_tree | |
181 | then | |
182 | git read-tree --reset -u $i_tree | |
183 | fi | |
184 | else | |
185 | git apply -R < "$TMP-patch" || | |
186 | die "Cannot remove worktree changes" | |
187 | ||
188 | if test -z "$keep_index" | |
189 | then | |
190 | git reset | |
191 | fi | |
7bedebca | 192 | fi |
f2c66ed1 NS |
193 | } |
194 | ||
401de405 | 195 | have_stash () { |
0e32126f | 196 | git rev-parse --verify $ref_stash >/dev/null 2>&1 |
401de405 JK |
197 | } |
198 | ||
f2c66ed1 | 199 | list_stash () { |
401de405 | 200 | have_stash || return 0 |
aa4f31d5 | 201 | git log --no-color --pretty=oneline -g "$@" $ref_stash -- | |
f2c66ed1 NS |
202 | sed -n -e 's/^[.0-9a-f]* refs\///p' |
203 | } | |
204 | ||
205 | show_stash () { | |
5be60078 | 206 | flags=$(git rev-parse --no-revs --flags "$@") |
f2c66ed1 NS |
207 | if test -z "$flags" |
208 | then | |
209 | flags=--stat | |
210 | fi | |
da65e7c1 | 211 | |
875471c5 BC |
212 | w_commit=$(git rev-parse --verify --default $ref_stash "$@") && |
213 | b_commit=$(git rev-parse --verify "$w_commit^") && | |
e7187e4e | 214 | git diff $flags $b_commit $w_commit |
f2c66ed1 NS |
215 | } |
216 | ||
217 | apply_stash () { | |
1eff26c0 | 218 | git update-index -q --refresh && |
6848d58c | 219 | git diff-files --quiet --ignore-submodules || |
2a79d2f6 | 220 | die 'Cannot apply to a dirty working tree, please stage your changes' |
f2c66ed1 | 221 | |
150937c4 | 222 | unstash_index= |
fcdd0e92 SB |
223 | |
224 | while test $# != 0 | |
225 | do | |
226 | case "$1" in | |
227 | --index) | |
228 | unstash_index=t | |
229 | ;; | |
230 | -q|--quiet) | |
231 | GIT_QUIET=t | |
232 | ;; | |
233 | *) | |
234 | break | |
235 | ;; | |
236 | esac | |
150937c4 | 237 | shift |
fcdd0e92 | 238 | done |
150937c4 | 239 | |
f2c66ed1 | 240 | # current index state |
5be60078 | 241 | c_tree=$(git write-tree) || |
f2c66ed1 NS |
242 | die 'Cannot apply a stash in the middle of a merge' |
243 | ||
cbeaccc3 JH |
244 | # stash records the work tree, and is a merge between the |
245 | # base commit (first parent) and the index tree (second parent). | |
875471c5 | 246 | s=$(git rev-parse --verify --default $ref_stash "$@") && |
5be60078 | 247 | w_tree=$(git rev-parse --verify "$s:") && |
cbeaccc3 JH |
248 | b_tree=$(git rev-parse --verify "$s^1:") && |
249 | i_tree=$(git rev-parse --verify "$s^2:") || | |
f2c66ed1 NS |
250 | die "$*: no valid stashed state found" |
251 | ||
cbeaccc3 | 252 | unstashed_index_tree= |
7bedebca SG |
253 | if test -n "$unstash_index" && test "$b_tree" != "$i_tree" && |
254 | test "$c_tree" != "$i_tree" | |
cbeaccc3 | 255 | then |
89d750bf | 256 | git diff-tree --binary $s^2^..$s^2 | git apply --cached |
150937c4 JS |
257 | test $? -ne 0 && |
258 | die 'Conflicts in index. Try without --index.' | |
52070790 | 259 | unstashed_index_tree=$(git write-tree) || |
150937c4 JS |
260 | die 'Could not save index tree' |
261 | git reset | |
cbeaccc3 | 262 | fi |
150937c4 | 263 | |
f2c66ed1 NS |
264 | eval " |
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 | |
269 | " | |
270 | ||
fcdd0e92 SB |
271 | if test -n "$GIT_QUIET" |
272 | then | |
273 | export GIT_MERGE_VERBOSITY=0 | |
274 | fi | |
52070790 | 275 | if git merge-recursive $b_tree -- $c_tree $w_tree |
f2c66ed1 NS |
276 | then |
277 | # No conflict | |
cbeaccc3 JH |
278 | if test -n "$unstashed_index_tree" |
279 | then | |
280 | git read-tree "$unstashed_index_tree" | |
83b3df7d JH |
281 | else |
282 | a="$TMP-added" && | |
89d750bf | 283 | git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" && |
83b3df7d JH |
284 | git read-tree --reset $c_tree && |
285 | git update-index --add --stdin <"$a" || | |
286 | die "Cannot unstage modified files" | |
287 | rm -f "$a" | |
cbeaccc3 | 288 | fi |
fcdd0e92 SB |
289 | squelch= |
290 | if test -n "$GIT_QUIET" | |
291 | then | |
292 | squelch='>/dev/null 2>&1' | |
293 | fi | |
294 | eval "git status $squelch" || : | |
f2c66ed1 NS |
295 | else |
296 | # Merge conflict; keep the exit status from merge-recursive | |
150937c4 | 297 | status=$? |
cbeaccc3 JH |
298 | if test -n "$unstash_index" |
299 | then | |
300 | echo >&2 'Index was not unstashed.' | |
301 | fi | |
150937c4 | 302 | exit $status |
f2c66ed1 NS |
303 | fi |
304 | } | |
305 | ||
e25d5f9c BC |
306 | drop_stash () { |
307 | have_stash || die 'No stash entries to drop' | |
308 | ||
fcdd0e92 SB |
309 | while test $# != 0 |
310 | do | |
311 | case "$1" in | |
312 | -q|--quiet) | |
313 | GIT_QUIET=t | |
314 | ;; | |
315 | *) | |
316 | break | |
317 | ;; | |
318 | esac | |
319 | shift | |
320 | done | |
321 | ||
e25d5f9c BC |
322 | if test $# = 0 |
323 | then | |
324 | set x "$ref_stash@{0}" | |
325 | shift | |
326 | fi | |
327 | # Verify supplied argument looks like a stash entry | |
875471c5 | 328 | s=$(git rev-parse --verify "$@") && |
0e32126f JH |
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 || | |
e25d5f9c BC |
332 | die "$*: not a valid stashed state" |
333 | ||
334 | git reflog delete --updateref --rewrite "$@" && | |
fcdd0e92 | 335 | say "Dropped $* ($s)" || die "$*: Could not drop stash entry" |
e25d5f9c BC |
336 | |
337 | # clear_stash if we just dropped the last stash entry | |
0e32126f | 338 | git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash |
e25d5f9c BC |
339 | } |
340 | ||
656b5034 AMS |
341 | apply_to_branch () { |
342 | have_stash || die 'Nothing to apply' | |
343 | ||
344 | test -n "$1" || die 'No branch name specified' | |
345 | branch=$1 | |
346 | ||
347 | if test -z "$2" | |
348 | then | |
349 | set x "$ref_stash@{0}" | |
350 | fi | |
351 | stash=$2 | |
352 | ||
52070790 | 353 | git checkout -b $branch $stash^ && |
656b5034 AMS |
354 | apply_stash --index $stash && |
355 | drop_stash $stash | |
356 | } | |
357 | ||
f2c66ed1 NS |
358 | # Main command set |
359 | case "$1" in | |
fcb10a96 JH |
360 | list) |
361 | shift | |
f2c66ed1 NS |
362 | if test $# = 0 |
363 | then | |
364 | set x -n 10 | |
365 | shift | |
366 | fi | |
367 | list_stash "$@" | |
368 | ;; | |
369 | show) | |
370 | shift | |
371 | show_stash "$@" | |
372 | ;; | |
683befa1 KL |
373 | save) |
374 | shift | |
47629dcf | 375 | save_stash "$@" |
683befa1 | 376 | ;; |
f2c66ed1 NS |
377 | apply) |
378 | shift | |
379 | apply_stash "$@" | |
380 | ;; | |
381 | clear) | |
3023dc69 JH |
382 | shift |
383 | clear_stash "$@" | |
f2c66ed1 | 384 | ;; |
bc9e7399 JH |
385 | create) |
386 | if test $# -gt 0 && test "$1" = create | |
387 | then | |
388 | shift | |
389 | fi | |
390 | create_stash "$*" && echo "$w_commit" | |
391 | ;; | |
e25d5f9c BC |
392 | drop) |
393 | shift | |
394 | drop_stash "$@" | |
395 | ;; | |
bd56ff54 BC |
396 | pop) |
397 | shift | |
398 | if apply_stash "$@" | |
399 | then | |
400 | test -z "$unstash_index" || shift | |
401 | drop_stash "$@" | |
402 | fi | |
403 | ;; | |
656b5034 AMS |
404 | branch) |
405 | shift | |
406 | apply_to_branch "$@" | |
407 | ;; | |
f2c66ed1 | 408 | *) |
f300fab5 TR |
409 | case $#,"$1","$2" in |
410 | 0,,|1,-k,|1,--keep-index,|1,-p,|1,--patch,|2,-p,--no-keep-index|2,--patch,--no-keep-index) | |
ea41cfc4 | 411 | save_stash "$@" && |
fcdd0e92 | 412 | say '(To restore them type "git stash apply")' |
ea41cfc4 JS |
413 | ;; |
414 | *) | |
683befa1 | 415 | usage |
ea41cfc4 | 416 | esac |
9f62e18a | 417 | ;; |
f2c66ed1 | 418 | esac |