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