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