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