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