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