]>
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>] |
78751302 DC |
10 | or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] |
11 | [-u|--include-untracked] [-a|--all] [<message>]] | |
a5ab00c5 | 12 | or: $dashless clear" |
f2c66ed1 | 13 | |
3cd2491a | 14 | SUBDIRECTORY_OK=Yes |
8f321a39 | 15 | OPTIONS_SPEC= |
d0ea45bf | 16 | START_DIR=$(pwd) |
f2c66ed1 | 17 | . git-sh-setup |
8a583bec | 18 | . git-sh-i18n |
f2c66ed1 | 19 | require_work_tree |
ceff079b | 20 | cd_to_toplevel |
f2c66ed1 NS |
21 | |
22 | TMP="$GIT_DIR/.git-stash.$$" | |
3ba2e865 JS |
23 | TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$ |
24 | trap 'rm -f "$TMP-"* "$TMPindex"' 0 | |
f2c66ed1 NS |
25 | |
26 | ref_stash=refs/stash | |
27 | ||
dda1f2a5 TR |
28 | if git config --get-colorbool color.interactive; then |
29 | help_color="$(git config --get-color color.interactive.help 'red bold')" | |
30 | reset_color="$(git config --get-color '' reset)" | |
31 | else | |
32 | help_color= | |
33 | reset_color= | |
34 | fi | |
35 | ||
f2c66ed1 | 36 | no_changes () { |
6848d58c | 37 | git diff-index --quiet --cached HEAD --ignore-submodules -- && |
78751302 DC |
38 | git diff-files --quiet --ignore-submodules && |
39 | (test -z "$untracked" || test -z "$(untracked_files)") | |
40 | } | |
41 | ||
42 | untracked_files () { | |
43 | excl_opt=--exclude-standard | |
44 | test "$untracked" = "all" && excl_opt= | |
45 | git ls-files -o -z $excl_opt | |
f2c66ed1 NS |
46 | } |
47 | ||
48 | clear_stash () { | |
3023dc69 JH |
49 | if test $# != 0 |
50 | then | |
b1440ce2 | 51 | die "$(gettext "git stash clear with parameters is unimplemented")" |
3023dc69 | 52 | fi |
1956dfa8 | 53 | if current=$(git rev-parse --verify --quiet $ref_stash) |
7ab3cc70 | 54 | then |
a9ee9bf9 | 55 | git update-ref -d $ref_stash $current |
7ab3cc70 | 56 | fi |
f2c66ed1 NS |
57 | } |
58 | ||
bc9e7399 | 59 | create_stash () { |
9f62e18a | 60 | stash_msg="$1" |
78751302 | 61 | untracked="$2" |
9f62e18a | 62 | |
1eff26c0 | 63 | git update-index -q --refresh |
f2c66ed1 NS |
64 | if no_changes |
65 | then | |
f2c66ed1 NS |
66 | exit 0 |
67 | fi | |
f12e925a | 68 | |
f2c66ed1 | 69 | # state of the base commit |
5be60078 | 70 | if b_commit=$(git rev-parse --verify HEAD) |
f2c66ed1 | 71 | then |
b0e621ad | 72 | head=$(git rev-list --oneline -n 1 HEAD --) |
f2c66ed1 | 73 | else |
b1440ce2 | 74 | die "$(gettext "You do not have the initial commit yet")" |
f2c66ed1 NS |
75 | fi |
76 | ||
5be60078 | 77 | if branch=$(git symbolic-ref -q HEAD) |
f2c66ed1 NS |
78 | then |
79 | branch=${branch#refs/heads/} | |
80 | else | |
81 | branch='(no branch)' | |
82 | fi | |
83 | msg=$(printf '%s: %s' "$branch" "$head") | |
84 | ||
85 | # state of the index | |
5be60078 | 86 | i_tree=$(git write-tree) && |
6143fa2c | 87 | i_commit=$(printf 'index on %s\n' "$msg" | |
5be60078 | 88 | git commit-tree $i_tree -p $b_commit) || |
b1440ce2 | 89 | die "$(gettext "Cannot save the current index state")" |
f2c66ed1 | 90 | |
78751302 DC |
91 | if test -n "$untracked" |
92 | then | |
93 | # Untracked files are stored by themselves in a parentless commit, for | |
94 | # ease of unpacking later. | |
95 | u_commit=$( | |
96 | untracked_files | ( | |
bed137d2 EP |
97 | GIT_INDEX_FILE="$TMPindex" && |
98 | export GIT_INDEX_FILE && | |
78751302 DC |
99 | rm -f "$TMPindex" && |
100 | git update-index -z --add --remove --stdin && | |
101 | u_tree=$(git write-tree) && | |
102 | printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree && | |
103 | rm -f "$TMPindex" | |
104 | ) ) || die "Cannot save the untracked files" | |
105 | ||
106 | untracked_commit_option="-p $u_commit"; | |
107 | else | |
108 | untracked_commit_option= | |
109 | fi | |
110 | ||
dda1f2a5 TR |
111 | if test -z "$patch_mode" |
112 | then | |
113 | ||
114 | # state of the working tree | |
115 | w_tree=$( ( | |
3ba2e865 JS |
116 | git read-tree --index-output="$TMPindex" -m $i_tree && |
117 | GIT_INDEX_FILE="$TMPindex" && | |
dda1f2a5 | 118 | export GIT_INDEX_FILE && |
44df2e29 JM |
119 | git diff --name-only -z HEAD -- >"$TMP-stagenames" && |
120 | git update-index -z --add --remove --stdin <"$TMP-stagenames" && | |
dda1f2a5 | 121 | git write-tree && |
3ba2e865 | 122 | rm -f "$TMPindex" |
dda1f2a5 | 123 | ) ) || |
b1440ce2 | 124 | die "$(gettext "Cannot save the current worktree state")" |
dda1f2a5 TR |
125 | |
126 | else | |
127 | ||
b24f56d6 | 128 | rm -f "$TMP-index" && |
dda1f2a5 TR |
129 | GIT_INDEX_FILE="$TMP-index" git read-tree HEAD && |
130 | ||
131 | # find out what the user wants | |
132 | GIT_INDEX_FILE="$TMP-index" \ | |
133 | git add--interactive --patch=stash -- && | |
134 | ||
135 | # state of the working tree | |
136 | w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || | |
b1440ce2 | 137 | die "$(gettext "Cannot save the current worktree state")" |
f2c66ed1 | 138 | |
44df2e29 | 139 | git diff-tree -p HEAD $w_tree -- >"$TMP-patch" && |
dda1f2a5 | 140 | test -s "$TMP-patch" || |
b1440ce2 | 141 | die "$(gettext "No changes selected")" |
dda1f2a5 TR |
142 | |
143 | rm -f "$TMP-index" || | |
b1440ce2 | 144 | die "$(gettext "Cannot remove temporary index (can't happen)")" |
dda1f2a5 TR |
145 | |
146 | fi | |
147 | ||
f2c66ed1 | 148 | # create the stash |
9f62e18a JH |
149 | if test -z "$stash_msg" |
150 | then | |
151 | stash_msg=$(printf 'WIP on %s' "$msg") | |
152 | else | |
153 | stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg") | |
154 | fi | |
155 | w_commit=$(printf '%s\n' "$stash_msg" | | |
22f41286 JH |
156 | git commit-tree $w_tree -p $b_commit -p $i_commit $untracked_commit_option) || |
157 | die "$(gettext "Cannot record working tree state")" | |
bc9e7399 | 158 | } |
f2c66ed1 | 159 | |
bd514cad RR |
160 | store_stash () { |
161 | while test $# != 0 | |
162 | do | |
163 | case "$1" in | |
164 | -m|--message) | |
165 | shift | |
166 | stash_msg="$1" | |
167 | ;; | |
168 | -q|--quiet) | |
169 | quiet=t | |
170 | ;; | |
171 | *) | |
172 | break | |
173 | ;; | |
174 | esac | |
175 | shift | |
176 | done | |
177 | test $# = 1 || | |
178 | die "$(eval_gettext "\"$dashless store\" requires one <commit> argument")" | |
179 | ||
180 | w_commit="$1" | |
181 | if test -z "$stash_msg" | |
182 | then | |
183 | stash_msg="Created via \"git stash store\"." | |
184 | fi | |
185 | ||
186 | # Make sure the reflog for stash is kept. | |
187 | : >>"$GIT_DIR/logs/$ref_stash" | |
188 | git update-ref -m "$stash_msg" $ref_stash $w_commit | |
189 | ret=$? | |
190 | test $ret != 0 && test -z $quiet && | |
191 | die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")" | |
192 | return $ret | |
193 | } | |
194 | ||
bc9e7399 | 195 | save_stash () { |
7bedebca | 196 | keep_index= |
dda1f2a5 | 197 | patch_mode= |
78751302 | 198 | untracked= |
fcdd0e92 SB |
199 | while test $# != 0 |
200 | do | |
201 | case "$1" in | |
ea41cfc4 | 202 | -k|--keep-index) |
fcdd0e92 SB |
203 | keep_index=t |
204 | ;; | |
dda1f2a5 | 205 | --no-keep-index) |
3a243f70 | 206 | keep_index=n |
dda1f2a5 TR |
207 | ;; |
208 | -p|--patch) | |
209 | patch_mode=t | |
3a243f70 DM |
210 | # only default to keep if we don't already have an override |
211 | test -z "$keep_index" && keep_index=t | |
fcdd0e92 SB |
212 | ;; |
213 | -q|--quiet) | |
214 | GIT_QUIET=t | |
215 | ;; | |
78751302 DC |
216 | -u|--include-untracked) |
217 | untracked=untracked | |
218 | ;; | |
219 | -a|--all) | |
220 | untracked=all | |
221 | ;; | |
5ba28313 JK |
222 | --help) |
223 | show_help | |
224 | ;; | |
3c2eb80f MM |
225 | --) |
226 | shift | |
227 | break | |
228 | ;; | |
229 | -*) | |
eed10649 ÆAB |
230 | option="$1" |
231 | # TRANSLATORS: $option is an invalid option, like | |
232 | # `--blah-blah'. The 7 spaces at the beginning of the | |
233 | # second line correspond to "error: ". So you should line | |
234 | # up the second line with however many characters the | |
235 | # translation of "error: " takes in your language. E.g. in | |
236 | # English this is: | |
237 | # | |
238 | # $ git stash save --blah-blah 2>&1 | head -n 2 | |
239 | # error: unknown option for 'stash save': --blah-blah | |
240 | # To provide a message, use git stash save -- '--blah-blah' | |
ed3c400c RL |
241 | eval_gettextln "error: unknown option for 'stash save': \$option |
242 | To provide a message, use git stash save -- '\$option'" | |
3c2eb80f MM |
243 | usage |
244 | ;; | |
fcdd0e92 SB |
245 | *) |
246 | break | |
247 | ;; | |
248 | esac | |
7bedebca | 249 | shift |
fcdd0e92 | 250 | done |
7bedebca | 251 | |
78751302 DC |
252 | if test -n "$patch_mode" && test -n "$untracked" |
253 | then | |
d88acc91 | 254 | die "Can't use --patch and --include-untracked or --all at the same time" |
78751302 DC |
255 | fi |
256 | ||
47629dcf | 257 | stash_msg="$*" |
bc9e7399 | 258 | |
1eff26c0 | 259 | git update-index -q --refresh |
bc9e7399 JH |
260 | if no_changes |
261 | then | |
5a175871 | 262 | say "$(gettext "No local changes to save")" |
bc9e7399 JH |
263 | exit 0 |
264 | fi | |
265 | test -f "$GIT_DIR/logs/$ref_stash" || | |
b1440ce2 | 266 | clear_stash || die "$(gettext "Cannot initialize stash")" |
bc9e7399 | 267 | |
78751302 | 268 | create_stash "$stash_msg" $untracked |
bd514cad RR |
269 | store_stash -m "$stash_msg" -q $w_commit || |
270 | die "$(gettext "Cannot save the current status")" | |
fcdd0e92 | 271 | say Saved working directory and index state "$stash_msg" |
7bedebca | 272 | |
dda1f2a5 | 273 | if test -z "$patch_mode" |
7bedebca | 274 | then |
dda1f2a5 | 275 | git reset --hard ${GIT_QUIET:+-q} |
78751302 DC |
276 | test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION= |
277 | if test -n "$untracked" | |
278 | then | |
7474b8b4 | 279 | git clean --force --quiet -d $CLEAN_X_OPTION |
78751302 | 280 | fi |
dda1f2a5 | 281 | |
3a243f70 | 282 | if test "$keep_index" = "t" && test -n $i_tree |
dda1f2a5 TR |
283 | then |
284 | git read-tree --reset -u $i_tree | |
285 | fi | |
286 | else | |
287 | git apply -R < "$TMP-patch" || | |
b1440ce2 | 288 | die "$(gettext "Cannot remove worktree changes")" |
dda1f2a5 | 289 | |
3a243f70 | 290 | if test "$keep_index" != "t" |
dda1f2a5 TR |
291 | then |
292 | git reset | |
293 | fi | |
7bedebca | 294 | fi |
f2c66ed1 NS |
295 | } |
296 | ||
401de405 | 297 | have_stash () { |
1956dfa8 | 298 | git rev-parse --verify --quiet $ref_stash >/dev/null |
401de405 JK |
299 | } |
300 | ||
f2c66ed1 | 301 | list_stash () { |
401de405 | 302 | have_stash || return 0 |
288c67ca | 303 | git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash -- |
f2c66ed1 NS |
304 | } |
305 | ||
306 | show_stash () { | |
d6cc2df5 | 307 | ALLOW_UNKNOWN_FLAGS=t |
a9bf09e1 | 308 | assert_stash_like "$@" |
14cd4581 | 309 | |
a9bf09e1 | 310 | git diff ${FLAGS:---stat} $b_commit $w_commit |
f2c66ed1 NS |
311 | } |
312 | ||
5ba28313 JK |
313 | show_help () { |
314 | exec git help stash | |
315 | exit 1 | |
316 | } | |
317 | ||
ef763129 JS |
318 | # |
319 | # Parses the remaining options looking for flags and | |
320 | # at most one revision defaulting to ${ref_stash}@{0} | |
321 | # if none found. | |
322 | # | |
323 | # Derives related tree and commit objects from the | |
324 | # revision, if one is found. | |
325 | # | |
326 | # stash records the work tree, and is a merge between the | |
327 | # base commit (first parent) and the index tree (second parent). | |
328 | # | |
329 | # REV is set to the symbolic version of the specified stash-like commit | |
330 | # IS_STASH_LIKE is non-blank if ${REV} looks like a stash | |
331 | # IS_STASH_REF is non-blank if the ${REV} looks like a stash ref | |
332 | # s is set to the SHA1 of the stash commit | |
333 | # w_commit is set to the commit containing the working tree | |
334 | # b_commit is set to the base commit | |
335 | # i_commit is set to the commit containing the index tree | |
78751302 | 336 | # u_commit is set to the commit containing the untracked files tree |
ef763129 JS |
337 | # w_tree is set to the working tree |
338 | # b_tree is set to the base tree | |
339 | # i_tree is set to the index tree | |
78751302 | 340 | # u_tree is set to the untracked files tree |
ef763129 JS |
341 | # |
342 | # GIT_QUIET is set to t if -q is specified | |
343 | # INDEX_OPTION is set to --index if --index is specified. | |
d6cc2df5 | 344 | # FLAGS is set to the remaining flags (if allowed) |
ef763129 JS |
345 | # |
346 | # dies if: | |
347 | # * too many revisions specified | |
348 | # * no revision is specified and there is no stash stack | |
349 | # * a revision is specified which cannot be resolve to a SHA1 | |
350 | # * a non-existent stash reference is specified | |
d6cc2df5 | 351 | # * unknown flags were set and ALLOW_UNKNOWN_FLAGS is not "t" |
ef763129 JS |
352 | # |
353 | ||
354 | parse_flags_and_rev() | |
355 | { | |
356 | test "$PARSE_CACHE" = "$*" && return 0 # optimisation | |
357 | PARSE_CACHE="$*" | |
358 | ||
359 | IS_STASH_LIKE= | |
360 | IS_STASH_REF= | |
361 | INDEX_OPTION= | |
362 | s= | |
363 | w_commit= | |
364 | b_commit= | |
365 | i_commit= | |
78751302 | 366 | u_commit= |
ef763129 JS |
367 | w_tree= |
368 | b_tree= | |
369 | i_tree= | |
78751302 | 370 | u_tree= |
ef763129 | 371 | |
2a07e437 | 372 | REV=$(git rev-parse --no-flags --symbolic --sq "$@") || exit 1 |
ef763129 JS |
373 | |
374 | FLAGS= | |
2bea593b | 375 | for opt |
ef763129 | 376 | do |
2bea593b JS |
377 | case "$opt" in |
378 | -q|--quiet) | |
379 | GIT_QUIET=-t | |
380 | ;; | |
ef763129 JS |
381 | --index) |
382 | INDEX_OPTION=--index | |
383 | ;; | |
5ba28313 JK |
384 | --help) |
385 | show_help | |
386 | ;; | |
2bea593b | 387 | -*) |
d6cc2df5 JK |
388 | test "$ALLOW_UNKNOWN_FLAGS" = t || |
389 | die "$(eval_gettext "unknown option: \$opt")" | |
2bea593b | 390 | FLAGS="${FLAGS}${FLAGS:+ }$opt" |
ef763129 JS |
391 | ;; |
392 | esac | |
ef763129 JS |
393 | done |
394 | ||
2a07e437 | 395 | eval set -- $REV |
ef763129 JS |
396 | |
397 | case $# in | |
398 | 0) | |
b1440ce2 | 399 | have_stash || die "$(gettext "No stash found.")" |
ef763129 JS |
400 | set -- ${ref_stash}@{0} |
401 | ;; | |
402 | 1) | |
403 | : | |
404 | ;; | |
405 | *) | |
33ceddcf | 406 | die "$(eval_gettext "Too many revisions specified: \$REV")" |
ef763129 JS |
407 | ;; |
408 | esac | |
409 | ||
1956dfa8 | 410 | REV=$(git rev-parse --symbolic --verify --quiet "$1") || { |
155da748 | 411 | reference="$1" |
ad5fe377 | 412 | die "$(eval_gettext "\$reference is not a valid reference")" |
155da748 | 413 | } |
ef763129 | 414 | |
1956dfa8 | 415 | i_commit=$(git rev-parse --verify --quiet "$REV^2") && |
2a07e437 | 416 | set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) && |
ef763129 JS |
417 | s=$1 && |
418 | w_commit=$1 && | |
419 | b_commit=$2 && | |
420 | w_tree=$3 && | |
421 | b_tree=$4 && | |
422 | i_tree=$5 && | |
423 | IS_STASH_LIKE=t && | |
424 | test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" && | |
425 | IS_STASH_REF=t | |
78751302 | 426 | |
1956dfa8 | 427 | u_commit=$(git rev-parse --verify --quiet "$REV^3") && |
2a07e437 | 428 | u_tree=$(git rev-parse "$REV^3:" 2>/dev/null) |
ef763129 JS |
429 | } |
430 | ||
431 | is_stash_like() | |
432 | { | |
433 | parse_flags_and_rev "$@" | |
434 | test -n "$IS_STASH_LIKE" | |
435 | } | |
436 | ||
437 | assert_stash_like() { | |
777b6f13 ÆAB |
438 | is_stash_like "$@" || { |
439 | args="$*" | |
440 | die "$(eval_gettext "'\$args' is not a stash-like commit")" | |
441 | } | |
ef763129 JS |
442 | } |
443 | ||
444 | is_stash_ref() { | |
445 | is_stash_like "$@" && test -n "$IS_STASH_REF" | |
446 | } | |
447 | ||
448 | assert_stash_ref() { | |
777b6f13 ÆAB |
449 | is_stash_ref "$@" || { |
450 | args="$*" | |
451 | die "$(eval_gettext "'\$args' is not a stash reference")" | |
452 | } | |
ef763129 JS |
453 | } |
454 | ||
f2c66ed1 | 455 | apply_stash () { |
fcdd0e92 | 456 | |
064ed100 | 457 | assert_stash_like "$@" |
f2c66ed1 | 458 | |
b1440ce2 | 459 | git update-index -q --refresh || die "$(gettext "unable to refresh index")" |
5fd448f1 OA |
460 | |
461 | # current index state | |
462 | c_tree=$(git write-tree) || | |
b1440ce2 | 463 | die "$(gettext "Cannot apply a stash in the middle of a merge")" |
5fd448f1 | 464 | |
cbeaccc3 | 465 | unstashed_index_tree= |
064ed100 | 466 | if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" && |
7bedebca | 467 | test "$c_tree" != "$i_tree" |
cbeaccc3 | 468 | then |
89d750bf | 469 | git diff-tree --binary $s^2^..$s^2 | git apply --cached |
150937c4 | 470 | test $? -ne 0 && |
b1440ce2 | 471 | die "$(gettext "Conflicts in index. Try without --index.")" |
52070790 | 472 | unstashed_index_tree=$(git write-tree) || |
b1440ce2 | 473 | die "$(gettext "Could not save index tree")" |
150937c4 | 474 | git reset |
cbeaccc3 | 475 | fi |
150937c4 | 476 | |
78751302 DC |
477 | if test -n "$u_tree" |
478 | then | |
479 | GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" && | |
480 | GIT_INDEX_FILE="$TMPindex" git checkout-index --all && | |
481 | rm -f "$TMPindex" || | |
482 | die 'Could not restore untracked files from stash' | |
483 | fi | |
484 | ||
f2c66ed1 NS |
485 | eval " |
486 | GITHEAD_$w_tree='Stashed changes' && | |
487 | GITHEAD_$c_tree='Updated upstream' && | |
488 | GITHEAD_$b_tree='Version stash was based on' && | |
489 | export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree | |
490 | " | |
491 | ||
fcdd0e92 SB |
492 | if test -n "$GIT_QUIET" |
493 | then | |
69ae92bd | 494 | GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY |
fcdd0e92 | 495 | fi |
52070790 | 496 | if git merge-recursive $b_tree -- $c_tree $w_tree |
f2c66ed1 NS |
497 | then |
498 | # No conflict | |
cbeaccc3 JH |
499 | if test -n "$unstashed_index_tree" |
500 | then | |
501 | git read-tree "$unstashed_index_tree" | |
83b3df7d JH |
502 | else |
503 | a="$TMP-added" && | |
89d750bf | 504 | git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" && |
83b3df7d JH |
505 | git read-tree --reset $c_tree && |
506 | git update-index --add --stdin <"$a" || | |
b1440ce2 | 507 | die "$(gettext "Cannot unstage modified files")" |
83b3df7d | 508 | rm -f "$a" |
cbeaccc3 | 509 | fi |
fcdd0e92 SB |
510 | squelch= |
511 | if test -n "$GIT_QUIET" | |
512 | then | |
513 | squelch='>/dev/null 2>&1' | |
514 | fi | |
26b59b48 | 515 | (cd "$START_DIR" && eval "git status $squelch") || : |
f2c66ed1 NS |
516 | else |
517 | # Merge conflict; keep the exit status from merge-recursive | |
150937c4 | 518 | status=$? |
743bf6d8 | 519 | git rerere |
064ed100 | 520 | if test -n "$INDEX_OPTION" |
cbeaccc3 | 521 | then |
6fdd50e9 | 522 | gettextln "Index was not unstashed." >&2 |
cbeaccc3 | 523 | fi |
150937c4 | 524 | exit $status |
f2c66ed1 NS |
525 | fi |
526 | } | |
527 | ||
f276872d JS |
528 | pop_stash() { |
529 | assert_stash_ref "$@" | |
530 | ||
2d4c9933 JH |
531 | if apply_stash "$@" |
532 | then | |
533 | drop_stash "$@" | |
534 | else | |
535 | status=$? | |
536 | say "The stash is kept in case you need it again." | |
537 | exit $status | |
538 | fi | |
f276872d JS |
539 | } |
540 | ||
e25d5f9c | 541 | drop_stash () { |
92e39e44 | 542 | assert_stash_ref "$@" |
e25d5f9c | 543 | |
92e39e44 | 544 | git reflog delete --updateref --rewrite "${REV}" && |
d4ca6c8b ÆAB |
545 | say "$(eval_gettext "Dropped \${REV} (\$s)")" || |
546 | die "$(eval_gettext "\${REV}: Could not drop stash entry")" | |
e25d5f9c BC |
547 | |
548 | # clear_stash if we just dropped the last stash entry | |
1956dfa8 DA |
549 | git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null || |
550 | clear_stash | |
e25d5f9c BC |
551 | } |
552 | ||
656b5034 | 553 | apply_to_branch () { |
b1440ce2 | 554 | test -n "$1" || die "$(gettext "No branch name specified")" |
656b5034 | 555 | branch=$1 |
fb433dc9 | 556 | shift 1 |
656b5034 | 557 | |
fb433dc9 JS |
558 | set -- --index "$@" |
559 | assert_stash_like "$@" | |
560 | ||
561 | git checkout -b $branch $REV^ && | |
57693d03 JS |
562 | apply_stash "$@" && { |
563 | test -z "$IS_STASH_REF" || drop_stash "$@" | |
564 | } | |
656b5034 AMS |
565 | } |
566 | ||
ef763129 | 567 | PARSE_CACHE='--not-parsed' |
3c2eb80f MM |
568 | # The default command is "save" if nothing but options are given |
569 | seen_non_option= | |
570 | for opt | |
571 | do | |
572 | case "$opt" in | |
573 | -*) ;; | |
574 | *) seen_non_option=t; break ;; | |
575 | esac | |
576 | done | |
577 | ||
578 | test -n "$seen_non_option" || set "save" "$@" | |
579 | ||
f2c66ed1 NS |
580 | # Main command set |
581 | case "$1" in | |
fcb10a96 JH |
582 | list) |
583 | shift | |
f2c66ed1 NS |
584 | list_stash "$@" |
585 | ;; | |
586 | show) | |
587 | shift | |
588 | show_stash "$@" | |
589 | ;; | |
683befa1 KL |
590 | save) |
591 | shift | |
47629dcf | 592 | save_stash "$@" |
683befa1 | 593 | ;; |
f2c66ed1 NS |
594 | apply) |
595 | shift | |
596 | apply_stash "$@" | |
597 | ;; | |
598 | clear) | |
3023dc69 JH |
599 | shift |
600 | clear_stash "$@" | |
f2c66ed1 | 601 | ;; |
bc9e7399 | 602 | create) |
0719f300 | 603 | shift |
bc9e7399 JH |
604 | create_stash "$*" && echo "$w_commit" |
605 | ;; | |
bd514cad RR |
606 | store) |
607 | shift | |
608 | store_stash "$@" | |
609 | ;; | |
e25d5f9c BC |
610 | drop) |
611 | shift | |
612 | drop_stash "$@" | |
613 | ;; | |
bd56ff54 BC |
614 | pop) |
615 | shift | |
f276872d | 616 | pop_stash "$@" |
bd56ff54 | 617 | ;; |
656b5034 AMS |
618 | branch) |
619 | shift | |
620 | apply_to_branch "$@" | |
621 | ;; | |
f2c66ed1 | 622 | *) |
3c2eb80f MM |
623 | case $# in |
624 | 0) | |
97bc00a4 | 625 | save_stash && |
5a175871 | 626 | say "$(gettext "(To restore them type \"git stash apply\")")" |
ea41cfc4 JS |
627 | ;; |
628 | *) | |
683befa1 | 629 | usage |
ea41cfc4 | 630 | esac |
9f62e18a | 631 | ;; |
f2c66ed1 | 632 | esac |