]>
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>] |
dc89689e | 10 | or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] |
a5ab00c5 | 11 | or: $dashless clear" |
f2c66ed1 | 12 | |
3cd2491a | 13 | SUBDIRECTORY_OK=Yes |
8f321a39 | 14 | OPTIONS_SPEC= |
f2c66ed1 NS |
15 | . git-sh-setup |
16 | require_work_tree | |
ceff079b | 17 | cd_to_toplevel |
f2c66ed1 NS |
18 | |
19 | TMP="$GIT_DIR/.git-stash.$$" | |
3ba2e865 JS |
20 | TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$ |
21 | trap 'rm -f "$TMP-"* "$TMPindex"' 0 | |
f2c66ed1 NS |
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 |
b0e621ad | 61 | head=$(git rev-list --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=$( ( | |
3ba2e865 JS |
85 | git read-tree --index-output="$TMPindex" -m $i_tree && |
86 | GIT_INDEX_FILE="$TMPindex" && | |
dda1f2a5 | 87 | export GIT_INDEX_FILE && |
7aa5d43c | 88 | git diff --name-only -z HEAD | git update-index -z --add --remove --stdin && |
dda1f2a5 | 89 | git write-tree && |
3ba2e865 | 90 | rm -f "$TMPindex" |
dda1f2a5 TR |
91 | ) ) || |
92 | die "Cannot save the current worktree state" | |
93 | ||
94 | else | |
95 | ||
b24f56d6 | 96 | rm -f "$TMP-index" && |
dda1f2a5 TR |
97 | GIT_INDEX_FILE="$TMP-index" git read-tree HEAD && |
98 | ||
99 | # find out what the user wants | |
100 | GIT_INDEX_FILE="$TMP-index" \ | |
101 | git add--interactive --patch=stash -- && | |
102 | ||
103 | # state of the working tree | |
104 | w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || | |
f2c66ed1 NS |
105 | die "Cannot save the current worktree state" |
106 | ||
dda1f2a5 TR |
107 | git diff-tree -p HEAD $w_tree > "$TMP-patch" && |
108 | test -s "$TMP-patch" || | |
109 | die "No changes selected" | |
110 | ||
111 | rm -f "$TMP-index" || | |
112 | die "Cannot remove temporary index (can't happen)" | |
113 | ||
114 | fi | |
115 | ||
f2c66ed1 | 116 | # create the stash |
9f62e18a JH |
117 | if test -z "$stash_msg" |
118 | then | |
119 | stash_msg=$(printf 'WIP on %s' "$msg") | |
120 | else | |
121 | stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg") | |
122 | fi | |
123 | w_commit=$(printf '%s\n' "$stash_msg" | | |
5be60078 | 124 | git commit-tree $w_tree -p $b_commit -p $i_commit) || |
f2c66ed1 | 125 | die "Cannot record working tree state" |
bc9e7399 | 126 | } |
f2c66ed1 | 127 | |
bc9e7399 | 128 | save_stash () { |
7bedebca | 129 | keep_index= |
dda1f2a5 | 130 | patch_mode= |
fcdd0e92 SB |
131 | while test $# != 0 |
132 | do | |
133 | case "$1" in | |
ea41cfc4 | 134 | -k|--keep-index) |
fcdd0e92 SB |
135 | keep_index=t |
136 | ;; | |
dda1f2a5 TR |
137 | --no-keep-index) |
138 | keep_index= | |
139 | ;; | |
140 | -p|--patch) | |
141 | patch_mode=t | |
fcdd0e92 SB |
142 | keep_index=t |
143 | ;; | |
144 | -q|--quiet) | |
145 | GIT_QUIET=t | |
146 | ;; | |
3c2eb80f MM |
147 | --) |
148 | shift | |
149 | break | |
150 | ;; | |
151 | -*) | |
152 | echo "error: unknown option for 'stash save': $1" | |
5d005922 | 153 | echo " To provide a message, use git stash save -- '$1'" |
3c2eb80f MM |
154 | usage |
155 | ;; | |
fcdd0e92 SB |
156 | *) |
157 | break | |
158 | ;; | |
159 | esac | |
7bedebca | 160 | shift |
fcdd0e92 | 161 | done |
7bedebca | 162 | |
47629dcf | 163 | stash_msg="$*" |
bc9e7399 | 164 | |
1eff26c0 | 165 | git update-index -q --refresh |
bc9e7399 JH |
166 | if no_changes |
167 | then | |
fcdd0e92 | 168 | say 'No local changes to save' |
bc9e7399 JH |
169 | exit 0 |
170 | fi | |
171 | test -f "$GIT_DIR/logs/$ref_stash" || | |
172 | clear_stash || die "Cannot initialize stash" | |
173 | ||
174 | create_stash "$stash_msg" | |
a9ee9bf9 EM |
175 | |
176 | # Make sure the reflog for stash is kept. | |
177 | : >>"$GIT_DIR/logs/$ref_stash" | |
f2c66ed1 | 178 | |
9f62e18a | 179 | git update-ref -m "$stash_msg" $ref_stash $w_commit || |
f2c66ed1 | 180 | die "Cannot save the current status" |
fcdd0e92 | 181 | say Saved working directory and index state "$stash_msg" |
7bedebca | 182 | |
dda1f2a5 | 183 | if test -z "$patch_mode" |
7bedebca | 184 | then |
dda1f2a5 TR |
185 | git reset --hard ${GIT_QUIET:+-q} |
186 | ||
187 | if test -n "$keep_index" && test -n $i_tree | |
188 | then | |
189 | git read-tree --reset -u $i_tree | |
190 | fi | |
191 | else | |
192 | git apply -R < "$TMP-patch" || | |
193 | die "Cannot remove worktree changes" | |
194 | ||
195 | if test -z "$keep_index" | |
196 | then | |
197 | git reset | |
198 | fi | |
7bedebca | 199 | fi |
f2c66ed1 NS |
200 | } |
201 | ||
401de405 | 202 | have_stash () { |
0e32126f | 203 | git rev-parse --verify $ref_stash >/dev/null 2>&1 |
401de405 JK |
204 | } |
205 | ||
f2c66ed1 | 206 | list_stash () { |
401de405 | 207 | have_stash || return 0 |
391c53bd | 208 | git log --format="%gd: %gs" -g "$@" $ref_stash -- |
f2c66ed1 NS |
209 | } |
210 | ||
211 | show_stash () { | |
a9bf09e1 | 212 | assert_stash_like "$@" |
14cd4581 | 213 | |
a9bf09e1 | 214 | git diff ${FLAGS:---stat} $b_commit $w_commit |
f2c66ed1 NS |
215 | } |
216 | ||
ef763129 JS |
217 | # |
218 | # Parses the remaining options looking for flags and | |
219 | # at most one revision defaulting to ${ref_stash}@{0} | |
220 | # if none found. | |
221 | # | |
222 | # Derives related tree and commit objects from the | |
223 | # revision, if one is found. | |
224 | # | |
225 | # stash records the work tree, and is a merge between the | |
226 | # base commit (first parent) and the index tree (second parent). | |
227 | # | |
228 | # REV is set to the symbolic version of the specified stash-like commit | |
229 | # IS_STASH_LIKE is non-blank if ${REV} looks like a stash | |
230 | # IS_STASH_REF is non-blank if the ${REV} looks like a stash ref | |
231 | # s is set to the SHA1 of the stash commit | |
232 | # w_commit is set to the commit containing the working tree | |
233 | # b_commit is set to the base commit | |
234 | # i_commit is set to the commit containing the index tree | |
235 | # w_tree is set to the working tree | |
236 | # b_tree is set to the base tree | |
237 | # i_tree is set to the index tree | |
238 | # | |
239 | # GIT_QUIET is set to t if -q is specified | |
240 | # INDEX_OPTION is set to --index if --index is specified. | |
241 | # FLAGS is set to the remaining flags | |
242 | # | |
243 | # dies if: | |
244 | # * too many revisions specified | |
245 | # * no revision is specified and there is no stash stack | |
246 | # * a revision is specified which cannot be resolve to a SHA1 | |
247 | # * a non-existent stash reference is specified | |
248 | # | |
249 | ||
250 | parse_flags_and_rev() | |
251 | { | |
252 | test "$PARSE_CACHE" = "$*" && return 0 # optimisation | |
253 | PARSE_CACHE="$*" | |
254 | ||
255 | IS_STASH_LIKE= | |
256 | IS_STASH_REF= | |
257 | INDEX_OPTION= | |
258 | s= | |
259 | w_commit= | |
260 | b_commit= | |
261 | i_commit= | |
262 | w_tree= | |
263 | b_tree= | |
264 | i_tree= | |
265 | ||
266 | REV=$(git rev-parse --no-flags --symbolic "$@" 2>/dev/null) | |
ef763129 JS |
267 | |
268 | FLAGS= | |
2bea593b | 269 | for opt |
ef763129 | 270 | do |
2bea593b JS |
271 | case "$opt" in |
272 | -q|--quiet) | |
273 | GIT_QUIET=-t | |
274 | ;; | |
ef763129 JS |
275 | --index) |
276 | INDEX_OPTION=--index | |
277 | ;; | |
2bea593b JS |
278 | -*) |
279 | FLAGS="${FLAGS}${FLAGS:+ }$opt" | |
ef763129 JS |
280 | ;; |
281 | esac | |
ef763129 JS |
282 | done |
283 | ||
284 | set -- $REV | |
285 | ||
286 | case $# in | |
287 | 0) | |
288 | have_stash || die "No stash found." | |
289 | set -- ${ref_stash}@{0} | |
290 | ;; | |
291 | 1) | |
292 | : | |
293 | ;; | |
294 | *) | |
295 | die "Too many revisions specified: $REV" | |
296 | ;; | |
297 | esac | |
298 | ||
299 | REV=$(git rev-parse --quiet --symbolic --verify $1 2>/dev/null) || die "$1 is not valid reference" | |
300 | ||
301 | i_commit=$(git rev-parse --quiet --verify $REV^2 2>/dev/null) && | |
302 | set -- $(git rev-parse $REV $REV^1 $REV: $REV^1: $REV^2: 2>/dev/null) && | |
303 | s=$1 && | |
304 | w_commit=$1 && | |
305 | b_commit=$2 && | |
306 | w_tree=$3 && | |
307 | b_tree=$4 && | |
308 | i_tree=$5 && | |
309 | IS_STASH_LIKE=t && | |
310 | test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" && | |
311 | IS_STASH_REF=t | |
312 | ||
b0f0ecd9 JS |
313 | if test "${REV}" != "${REV%{*\}}" |
314 | then | |
315 | # maintainers: it would be better if git rev-parse indicated | |
316 | # this condition with a non-zero status code but as of 1.7.2.1 it | |
317 | # it did not. So, we use non-empty stderr output as a proxy for the | |
318 | # condition of interest. | |
319 | test -z "$(git rev-parse "$REV" 2>&1 >/dev/null)" || die "$REV does not exist in the stash log" | |
320 | fi | |
321 | ||
ef763129 JS |
322 | } |
323 | ||
324 | is_stash_like() | |
325 | { | |
326 | parse_flags_and_rev "$@" | |
327 | test -n "$IS_STASH_LIKE" | |
328 | } | |
329 | ||
330 | assert_stash_like() { | |
331 | is_stash_like "$@" || die "'$*' is not a stash-like commit" | |
332 | } | |
333 | ||
334 | is_stash_ref() { | |
335 | is_stash_like "$@" && test -n "$IS_STASH_REF" | |
336 | } | |
337 | ||
338 | assert_stash_ref() { | |
339 | is_stash_ref "$@" || die "'$*' is not a stash reference" | |
340 | } | |
341 | ||
f2c66ed1 | 342 | apply_stash () { |
fcdd0e92 | 343 | |
064ed100 | 344 | assert_stash_like "$@" |
f2c66ed1 | 345 | |
5fd448f1 OA |
346 | git update-index -q --refresh && |
347 | git diff-files --quiet --ignore-submodules || | |
348 | die 'Cannot apply to a dirty working tree, please stage your changes' | |
349 | ||
350 | # current index state | |
351 | c_tree=$(git write-tree) || | |
352 | die 'Cannot apply a stash in the middle of a merge' | |
353 | ||
cbeaccc3 | 354 | unstashed_index_tree= |
064ed100 | 355 | if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" && |
7bedebca | 356 | test "$c_tree" != "$i_tree" |
cbeaccc3 | 357 | then |
89d750bf | 358 | git diff-tree --binary $s^2^..$s^2 | git apply --cached |
150937c4 JS |
359 | test $? -ne 0 && |
360 | die 'Conflicts in index. Try without --index.' | |
52070790 | 361 | unstashed_index_tree=$(git write-tree) || |
150937c4 JS |
362 | die 'Could not save index tree' |
363 | git reset | |
cbeaccc3 | 364 | fi |
150937c4 | 365 | |
f2c66ed1 NS |
366 | eval " |
367 | GITHEAD_$w_tree='Stashed changes' && | |
368 | GITHEAD_$c_tree='Updated upstream' && | |
369 | GITHEAD_$b_tree='Version stash was based on' && | |
370 | export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree | |
371 | " | |
372 | ||
fcdd0e92 SB |
373 | if test -n "$GIT_QUIET" |
374 | then | |
69ae92bd | 375 | GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY |
fcdd0e92 | 376 | fi |
52070790 | 377 | if git merge-recursive $b_tree -- $c_tree $w_tree |
f2c66ed1 NS |
378 | then |
379 | # No conflict | |
cbeaccc3 JH |
380 | if test -n "$unstashed_index_tree" |
381 | then | |
382 | git read-tree "$unstashed_index_tree" | |
83b3df7d JH |
383 | else |
384 | a="$TMP-added" && | |
89d750bf | 385 | git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" && |
83b3df7d JH |
386 | git read-tree --reset $c_tree && |
387 | git update-index --add --stdin <"$a" || | |
388 | die "Cannot unstage modified files" | |
389 | rm -f "$a" | |
cbeaccc3 | 390 | fi |
fcdd0e92 SB |
391 | squelch= |
392 | if test -n "$GIT_QUIET" | |
393 | then | |
394 | squelch='>/dev/null 2>&1' | |
395 | fi | |
396 | eval "git status $squelch" || : | |
f2c66ed1 NS |
397 | else |
398 | # Merge conflict; keep the exit status from merge-recursive | |
150937c4 | 399 | status=$? |
064ed100 | 400 | if test -n "$INDEX_OPTION" |
cbeaccc3 JH |
401 | then |
402 | echo >&2 'Index was not unstashed.' | |
403 | fi | |
150937c4 | 404 | exit $status |
f2c66ed1 NS |
405 | fi |
406 | } | |
407 | ||
f276872d JS |
408 | pop_stash() { |
409 | assert_stash_ref "$@" | |
410 | ||
411 | apply_stash "$@" && | |
412 | drop_stash "$@" | |
413 | } | |
414 | ||
e25d5f9c | 415 | drop_stash () { |
92e39e44 | 416 | assert_stash_ref "$@" |
e25d5f9c | 417 | |
92e39e44 JS |
418 | git reflog delete --updateref --rewrite "${REV}" && |
419 | say "Dropped ${REV} ($s)" || die "${REV}: Could not drop stash entry" | |
e25d5f9c BC |
420 | |
421 | # clear_stash if we just dropped the last stash entry | |
0e32126f | 422 | git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash |
e25d5f9c BC |
423 | } |
424 | ||
656b5034 | 425 | apply_to_branch () { |
656b5034 AMS |
426 | test -n "$1" || die 'No branch name specified' |
427 | branch=$1 | |
fb433dc9 | 428 | shift 1 |
656b5034 | 429 | |
fb433dc9 JS |
430 | set -- --index "$@" |
431 | assert_stash_like "$@" | |
432 | ||
433 | git checkout -b $branch $REV^ && | |
57693d03 JS |
434 | apply_stash "$@" && { |
435 | test -z "$IS_STASH_REF" || drop_stash "$@" | |
436 | } | |
656b5034 AMS |
437 | } |
438 | ||
ef763129 | 439 | PARSE_CACHE='--not-parsed' |
3c2eb80f MM |
440 | # The default command is "save" if nothing but options are given |
441 | seen_non_option= | |
442 | for opt | |
443 | do | |
444 | case "$opt" in | |
445 | -*) ;; | |
446 | *) seen_non_option=t; break ;; | |
447 | esac | |
448 | done | |
449 | ||
450 | test -n "$seen_non_option" || set "save" "$@" | |
451 | ||
f2c66ed1 NS |
452 | # Main command set |
453 | case "$1" in | |
fcb10a96 JH |
454 | list) |
455 | shift | |
f2c66ed1 NS |
456 | list_stash "$@" |
457 | ;; | |
458 | show) | |
459 | shift | |
460 | show_stash "$@" | |
461 | ;; | |
683befa1 KL |
462 | save) |
463 | shift | |
47629dcf | 464 | save_stash "$@" |
683befa1 | 465 | ;; |
f2c66ed1 NS |
466 | apply) |
467 | shift | |
468 | apply_stash "$@" | |
469 | ;; | |
470 | clear) | |
3023dc69 JH |
471 | shift |
472 | clear_stash "$@" | |
f2c66ed1 | 473 | ;; |
bc9e7399 JH |
474 | create) |
475 | if test $# -gt 0 && test "$1" = create | |
476 | then | |
477 | shift | |
478 | fi | |
479 | create_stash "$*" && echo "$w_commit" | |
480 | ;; | |
e25d5f9c BC |
481 | drop) |
482 | shift | |
483 | drop_stash "$@" | |
484 | ;; | |
bd56ff54 BC |
485 | pop) |
486 | shift | |
f276872d | 487 | pop_stash "$@" |
bd56ff54 | 488 | ;; |
656b5034 AMS |
489 | branch) |
490 | shift | |
491 | apply_to_branch "$@" | |
492 | ;; | |
f2c66ed1 | 493 | *) |
3c2eb80f MM |
494 | case $# in |
495 | 0) | |
97bc00a4 | 496 | save_stash && |
fcdd0e92 | 497 | say '(To restore them type "git stash apply")' |
ea41cfc4 JS |
498 | ;; |
499 | *) | |
683befa1 | 500 | usage |
ea41cfc4 | 501 | esac |
9f62e18a | 502 | ;; |
f2c66ed1 | 503 | esac |