]>
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>] |
dc89689e | 10 | or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] |
a5ab00c5 | 11 | or: $dashless clear" |
f2c66ed1 | 12 | |
3cd2491a | 13 | SUBDIRECTORY_OK=Yes |
8f321a39 | 14 | OPTIONS_SPEC= |
26b59b48 | 15 | START_DIR=`pwd` |
f2c66ed1 | 16 | . git-sh-setup |
8a583bec | 17 | . git-sh-i18n |
f2c66ed1 | 18 | require_work_tree |
ceff079b | 19 | cd_to_toplevel |
f2c66ed1 NS |
20 | |
21 | TMP="$GIT_DIR/.git-stash.$$" | |
3ba2e865 JS |
22 | TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$ |
23 | trap 'rm -f "$TMP-"* "$TMPindex"' 0 | |
f2c66ed1 NS |
24 | |
25 | ref_stash=refs/stash | |
26 | ||
dda1f2a5 TR |
27 | if git config --get-colorbool color.interactive; then |
28 | help_color="$(git config --get-color color.interactive.help 'red bold')" | |
29 | reset_color="$(git config --get-color '' reset)" | |
30 | else | |
31 | help_color= | |
32 | reset_color= | |
33 | fi | |
34 | ||
f2c66ed1 | 35 | no_changes () { |
6848d58c JS |
36 | git diff-index --quiet --cached HEAD --ignore-submodules -- && |
37 | git diff-files --quiet --ignore-submodules | |
f2c66ed1 NS |
38 | } |
39 | ||
40 | clear_stash () { | |
3023dc69 JH |
41 | if test $# != 0 |
42 | then | |
b1440ce2 | 43 | die "$(gettext "git stash clear with parameters is unimplemented")" |
3023dc69 | 44 | fi |
0e32126f | 45 | if current=$(git rev-parse --verify $ref_stash 2>/dev/null) |
7ab3cc70 | 46 | then |
a9ee9bf9 | 47 | git update-ref -d $ref_stash $current |
7ab3cc70 | 48 | fi |
f2c66ed1 NS |
49 | } |
50 | ||
bc9e7399 | 51 | create_stash () { |
9f62e18a JH |
52 | stash_msg="$1" |
53 | ||
1eff26c0 | 54 | git update-index -q --refresh |
f2c66ed1 NS |
55 | if no_changes |
56 | then | |
f2c66ed1 NS |
57 | exit 0 |
58 | fi | |
f12e925a | 59 | |
f2c66ed1 | 60 | # state of the base commit |
5be60078 | 61 | if b_commit=$(git rev-parse --verify HEAD) |
f2c66ed1 | 62 | then |
b0e621ad | 63 | head=$(git rev-list --oneline -n 1 HEAD --) |
f2c66ed1 | 64 | else |
b1440ce2 | 65 | die "$(gettext "You do not have the initial commit yet")" |
f2c66ed1 NS |
66 | fi |
67 | ||
5be60078 | 68 | if branch=$(git symbolic-ref -q HEAD) |
f2c66ed1 NS |
69 | then |
70 | branch=${branch#refs/heads/} | |
71 | else | |
72 | branch='(no branch)' | |
73 | fi | |
74 | msg=$(printf '%s: %s' "$branch" "$head") | |
75 | ||
76 | # state of the index | |
5be60078 | 77 | i_tree=$(git write-tree) && |
6143fa2c | 78 | i_commit=$(printf 'index on %s\n' "$msg" | |
5be60078 | 79 | git commit-tree $i_tree -p $b_commit) || |
b1440ce2 | 80 | die "$(gettext "Cannot save the current index state")" |
f2c66ed1 | 81 | |
dda1f2a5 TR |
82 | if test -z "$patch_mode" |
83 | then | |
84 | ||
85 | # state of the working tree | |
86 | w_tree=$( ( | |
3ba2e865 JS |
87 | git read-tree --index-output="$TMPindex" -m $i_tree && |
88 | GIT_INDEX_FILE="$TMPindex" && | |
dda1f2a5 | 89 | export GIT_INDEX_FILE && |
7aa5d43c | 90 | git diff --name-only -z HEAD | git update-index -z --add --remove --stdin && |
dda1f2a5 | 91 | git write-tree && |
3ba2e865 | 92 | rm -f "$TMPindex" |
dda1f2a5 | 93 | ) ) || |
b1440ce2 | 94 | die "$(gettext "Cannot save the current worktree state")" |
dda1f2a5 TR |
95 | |
96 | else | |
97 | ||
b24f56d6 | 98 | rm -f "$TMP-index" && |
dda1f2a5 TR |
99 | GIT_INDEX_FILE="$TMP-index" git read-tree HEAD && |
100 | ||
101 | # find out what the user wants | |
102 | GIT_INDEX_FILE="$TMP-index" \ | |
103 | git add--interactive --patch=stash -- && | |
104 | ||
105 | # state of the working tree | |
106 | w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || | |
b1440ce2 | 107 | die "$(gettext "Cannot save the current worktree state")" |
f2c66ed1 | 108 | |
dda1f2a5 TR |
109 | git diff-tree -p HEAD $w_tree > "$TMP-patch" && |
110 | test -s "$TMP-patch" || | |
b1440ce2 | 111 | die "$(gettext "No changes selected")" |
dda1f2a5 TR |
112 | |
113 | rm -f "$TMP-index" || | |
b1440ce2 | 114 | die "$(gettext "Cannot remove temporary index (can't happen)")" |
dda1f2a5 TR |
115 | |
116 | fi | |
117 | ||
f2c66ed1 | 118 | # create the stash |
9f62e18a JH |
119 | if test -z "$stash_msg" |
120 | then | |
121 | stash_msg=$(printf 'WIP on %s' "$msg") | |
122 | else | |
123 | stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg") | |
124 | fi | |
125 | w_commit=$(printf '%s\n' "$stash_msg" | | |
5be60078 | 126 | git commit-tree $w_tree -p $b_commit -p $i_commit) || |
b1440ce2 | 127 | die "$(gettext "Cannot record working tree state")" |
bc9e7399 | 128 | } |
f2c66ed1 | 129 | |
bc9e7399 | 130 | save_stash () { |
7bedebca | 131 | keep_index= |
dda1f2a5 | 132 | patch_mode= |
fcdd0e92 SB |
133 | while test $# != 0 |
134 | do | |
135 | case "$1" in | |
ea41cfc4 | 136 | -k|--keep-index) |
fcdd0e92 SB |
137 | keep_index=t |
138 | ;; | |
dda1f2a5 | 139 | --no-keep-index) |
3a243f70 | 140 | keep_index=n |
dda1f2a5 TR |
141 | ;; |
142 | -p|--patch) | |
143 | patch_mode=t | |
3a243f70 DM |
144 | # only default to keep if we don't already have an override |
145 | test -z "$keep_index" && keep_index=t | |
fcdd0e92 SB |
146 | ;; |
147 | -q|--quiet) | |
148 | GIT_QUIET=t | |
149 | ;; | |
3c2eb80f MM |
150 | --) |
151 | shift | |
152 | break | |
153 | ;; | |
154 | -*) | |
155 | echo "error: unknown option for 'stash save': $1" | |
5d005922 | 156 | echo " To provide a message, use git stash save -- '$1'" |
3c2eb80f MM |
157 | usage |
158 | ;; | |
fcdd0e92 SB |
159 | *) |
160 | break | |
161 | ;; | |
162 | esac | |
7bedebca | 163 | shift |
fcdd0e92 | 164 | done |
7bedebca | 165 | |
47629dcf | 166 | stash_msg="$*" |
bc9e7399 | 167 | |
1eff26c0 | 168 | git update-index -q --refresh |
bc9e7399 JH |
169 | if no_changes |
170 | then | |
5a175871 | 171 | say "$(gettext "No local changes to save")" |
bc9e7399 JH |
172 | exit 0 |
173 | fi | |
174 | test -f "$GIT_DIR/logs/$ref_stash" || | |
b1440ce2 | 175 | clear_stash || die "$(gettext "Cannot initialize stash")" |
bc9e7399 JH |
176 | |
177 | create_stash "$stash_msg" | |
a9ee9bf9 EM |
178 | |
179 | # Make sure the reflog for stash is kept. | |
180 | : >>"$GIT_DIR/logs/$ref_stash" | |
f2c66ed1 | 181 | |
9f62e18a | 182 | git update-ref -m "$stash_msg" $ref_stash $w_commit || |
b1440ce2 | 183 | die "$(gettext "Cannot save the current status")" |
fcdd0e92 | 184 | say Saved working directory and index state "$stash_msg" |
7bedebca | 185 | |
dda1f2a5 | 186 | if test -z "$patch_mode" |
7bedebca | 187 | then |
dda1f2a5 TR |
188 | git reset --hard ${GIT_QUIET:+-q} |
189 | ||
3a243f70 | 190 | if test "$keep_index" = "t" && test -n $i_tree |
dda1f2a5 TR |
191 | then |
192 | git read-tree --reset -u $i_tree | |
193 | fi | |
194 | else | |
195 | git apply -R < "$TMP-patch" || | |
b1440ce2 | 196 | die "$(gettext "Cannot remove worktree changes")" |
dda1f2a5 | 197 | |
3a243f70 | 198 | if test "$keep_index" != "t" |
dda1f2a5 TR |
199 | then |
200 | git reset | |
201 | fi | |
7bedebca | 202 | fi |
f2c66ed1 NS |
203 | } |
204 | ||
401de405 | 205 | have_stash () { |
0e32126f | 206 | git rev-parse --verify $ref_stash >/dev/null 2>&1 |
401de405 JK |
207 | } |
208 | ||
f2c66ed1 | 209 | list_stash () { |
401de405 | 210 | have_stash || return 0 |
391c53bd | 211 | git log --format="%gd: %gs" -g "$@" $ref_stash -- |
f2c66ed1 NS |
212 | } |
213 | ||
214 | show_stash () { | |
a9bf09e1 | 215 | assert_stash_like "$@" |
14cd4581 | 216 | |
a9bf09e1 | 217 | git diff ${FLAGS:---stat} $b_commit $w_commit |
f2c66ed1 NS |
218 | } |
219 | ||
ef763129 JS |
220 | # |
221 | # Parses the remaining options looking for flags and | |
222 | # at most one revision defaulting to ${ref_stash}@{0} | |
223 | # if none found. | |
224 | # | |
225 | # Derives related tree and commit objects from the | |
226 | # revision, if one is found. | |
227 | # | |
228 | # stash records the work tree, and is a merge between the | |
229 | # base commit (first parent) and the index tree (second parent). | |
230 | # | |
231 | # REV is set to the symbolic version of the specified stash-like commit | |
232 | # IS_STASH_LIKE is non-blank if ${REV} looks like a stash | |
233 | # IS_STASH_REF is non-blank if the ${REV} looks like a stash ref | |
234 | # s is set to the SHA1 of the stash commit | |
235 | # w_commit is set to the commit containing the working tree | |
236 | # b_commit is set to the base commit | |
237 | # i_commit is set to the commit containing the index tree | |
238 | # w_tree is set to the working tree | |
239 | # b_tree is set to the base tree | |
240 | # i_tree is set to the index tree | |
241 | # | |
242 | # GIT_QUIET is set to t if -q is specified | |
243 | # INDEX_OPTION is set to --index if --index is specified. | |
244 | # FLAGS is set to the remaining flags | |
245 | # | |
246 | # dies if: | |
247 | # * too many revisions specified | |
248 | # * no revision is specified and there is no stash stack | |
249 | # * a revision is specified which cannot be resolve to a SHA1 | |
250 | # * a non-existent stash reference is specified | |
251 | # | |
252 | ||
253 | parse_flags_and_rev() | |
254 | { | |
255 | test "$PARSE_CACHE" = "$*" && return 0 # optimisation | |
256 | PARSE_CACHE="$*" | |
257 | ||
258 | IS_STASH_LIKE= | |
259 | IS_STASH_REF= | |
260 | INDEX_OPTION= | |
261 | s= | |
262 | w_commit= | |
263 | b_commit= | |
264 | i_commit= | |
265 | w_tree= | |
266 | b_tree= | |
267 | i_tree= | |
268 | ||
59d418fe | 269 | REV=$(git rev-parse --no-flags --symbolic "$@") || exit 1 |
ef763129 JS |
270 | |
271 | FLAGS= | |
2bea593b | 272 | for opt |
ef763129 | 273 | do |
2bea593b JS |
274 | case "$opt" in |
275 | -q|--quiet) | |
276 | GIT_QUIET=-t | |
277 | ;; | |
ef763129 JS |
278 | --index) |
279 | INDEX_OPTION=--index | |
280 | ;; | |
2bea593b JS |
281 | -*) |
282 | FLAGS="${FLAGS}${FLAGS:+ }$opt" | |
ef763129 JS |
283 | ;; |
284 | esac | |
ef763129 JS |
285 | done |
286 | ||
287 | set -- $REV | |
288 | ||
289 | case $# in | |
290 | 0) | |
b1440ce2 | 291 | have_stash || die "$(gettext "No stash found.")" |
ef763129 JS |
292 | set -- ${ref_stash}@{0} |
293 | ;; | |
294 | 1) | |
295 | : | |
296 | ;; | |
297 | *) | |
33ceddcf | 298 | die "$(eval_gettext "Too many revisions specified: \$REV")" |
ef763129 JS |
299 | ;; |
300 | esac | |
301 | ||
155da748 ÆAB |
302 | REV=$(git rev-parse --quiet --symbolic --verify $1 2>/dev/null) || { |
303 | reference="$1" | |
304 | die "$(eval_gettext "\$reference is not valid reference")" | |
305 | } | |
ef763129 JS |
306 | |
307 | i_commit=$(git rev-parse --quiet --verify $REV^2 2>/dev/null) && | |
308 | set -- $(git rev-parse $REV $REV^1 $REV: $REV^1: $REV^2: 2>/dev/null) && | |
309 | s=$1 && | |
310 | w_commit=$1 && | |
311 | b_commit=$2 && | |
312 | w_tree=$3 && | |
313 | b_tree=$4 && | |
314 | i_tree=$5 && | |
315 | IS_STASH_LIKE=t && | |
316 | test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" && | |
317 | IS_STASH_REF=t | |
ef763129 JS |
318 | } |
319 | ||
320 | is_stash_like() | |
321 | { | |
322 | parse_flags_and_rev "$@" | |
323 | test -n "$IS_STASH_LIKE" | |
324 | } | |
325 | ||
326 | assert_stash_like() { | |
777b6f13 ÆAB |
327 | is_stash_like "$@" || { |
328 | args="$*" | |
329 | die "$(eval_gettext "'\$args' is not a stash-like commit")" | |
330 | } | |
ef763129 JS |
331 | } |
332 | ||
333 | is_stash_ref() { | |
334 | is_stash_like "$@" && test -n "$IS_STASH_REF" | |
335 | } | |
336 | ||
337 | assert_stash_ref() { | |
777b6f13 ÆAB |
338 | is_stash_ref "$@" || { |
339 | args="$*" | |
340 | die "$(eval_gettext "'\$args' is not a stash reference")" | |
341 | } | |
ef763129 JS |
342 | } |
343 | ||
f2c66ed1 | 344 | apply_stash () { |
fcdd0e92 | 345 | |
064ed100 | 346 | assert_stash_like "$@" |
f2c66ed1 | 347 | |
b1440ce2 | 348 | git update-index -q --refresh || die "$(gettext "unable to refresh index")" |
5fd448f1 OA |
349 | |
350 | # current index state | |
351 | c_tree=$(git write-tree) || | |
b1440ce2 | 352 | die "$(gettext "Cannot apply a stash in the middle of a merge")" |
5fd448f1 | 353 | |
cbeaccc3 | 354 | unstashed_index_tree= |
064ed100 | 355 | if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" && |
7bedebca | 356 | test "$c_tree" != "$i_tree" |
cbeaccc3 | 357 | then |
89d750bf | 358 | git diff-tree --binary $s^2^..$s^2 | git apply --cached |
150937c4 | 359 | test $? -ne 0 && |
b1440ce2 | 360 | die "$(gettext "Conflicts in index. Try without --index.")" |
52070790 | 361 | unstashed_index_tree=$(git write-tree) || |
b1440ce2 | 362 | die "$(gettext "Could not save index tree")" |
150937c4 | 363 | git reset |
cbeaccc3 | 364 | fi |
150937c4 | 365 | |
f2c66ed1 NS |
366 | eval " |
367 | GITHEAD_$w_tree='Stashed changes' && | |
368 | GITHEAD_$c_tree='Updated upstream' && | |
369 | GITHEAD_$b_tree='Version stash was based on' && | |
370 | export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree | |
371 | " | |
372 | ||
fcdd0e92 SB |
373 | if test -n "$GIT_QUIET" |
374 | then | |
69ae92bd | 375 | GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY |
fcdd0e92 | 376 | fi |
52070790 | 377 | if git merge-recursive $b_tree -- $c_tree $w_tree |
f2c66ed1 NS |
378 | then |
379 | # No conflict | |
cbeaccc3 JH |
380 | if test -n "$unstashed_index_tree" |
381 | then | |
382 | git read-tree "$unstashed_index_tree" | |
83b3df7d JH |
383 | else |
384 | a="$TMP-added" && | |
89d750bf | 385 | git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" && |
83b3df7d JH |
386 | git read-tree --reset $c_tree && |
387 | git update-index --add --stdin <"$a" || | |
b1440ce2 | 388 | die "$(gettext "Cannot unstage modified files")" |
83b3df7d | 389 | rm -f "$a" |
cbeaccc3 | 390 | fi |
fcdd0e92 SB |
391 | squelch= |
392 | if test -n "$GIT_QUIET" | |
393 | then | |
394 | squelch='>/dev/null 2>&1' | |
395 | fi | |
26b59b48 | 396 | (cd "$START_DIR" && eval "git status $squelch") || : |
f2c66ed1 NS |
397 | else |
398 | # Merge conflict; keep the exit status from merge-recursive | |
150937c4 | 399 | status=$? |
064ed100 | 400 | if test -n "$INDEX_OPTION" |
cbeaccc3 | 401 | then |
365c656a ÆAB |
402 | ( |
403 | gettext "Index was not unstashed." && | |
404 | echo | |
405 | ) >&2 | |
cbeaccc3 | 406 | fi |
150937c4 | 407 | exit $status |
f2c66ed1 NS |
408 | fi |
409 | } | |
410 | ||
f276872d JS |
411 | pop_stash() { |
412 | assert_stash_ref "$@" | |
413 | ||
414 | apply_stash "$@" && | |
415 | drop_stash "$@" | |
416 | } | |
417 | ||
e25d5f9c | 418 | drop_stash () { |
92e39e44 | 419 | assert_stash_ref "$@" |
e25d5f9c | 420 | |
92e39e44 JS |
421 | git reflog delete --updateref --rewrite "${REV}" && |
422 | say "Dropped ${REV} ($s)" || die "${REV}: Could not drop stash entry" | |
e25d5f9c BC |
423 | |
424 | # clear_stash if we just dropped the last stash entry | |
0e32126f | 425 | git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash |
e25d5f9c BC |
426 | } |
427 | ||
656b5034 | 428 | apply_to_branch () { |
b1440ce2 | 429 | test -n "$1" || die "$(gettext "No branch name specified")" |
656b5034 | 430 | branch=$1 |
fb433dc9 | 431 | shift 1 |
656b5034 | 432 | |
fb433dc9 JS |
433 | set -- --index "$@" |
434 | assert_stash_like "$@" | |
435 | ||
436 | git checkout -b $branch $REV^ && | |
57693d03 JS |
437 | apply_stash "$@" && { |
438 | test -z "$IS_STASH_REF" || drop_stash "$@" | |
439 | } | |
656b5034 AMS |
440 | } |
441 | ||
ef763129 | 442 | PARSE_CACHE='--not-parsed' |
3c2eb80f MM |
443 | # The default command is "save" if nothing but options are given |
444 | seen_non_option= | |
445 | for opt | |
446 | do | |
447 | case "$opt" in | |
448 | -*) ;; | |
449 | *) seen_non_option=t; break ;; | |
450 | esac | |
451 | done | |
452 | ||
453 | test -n "$seen_non_option" || set "save" "$@" | |
454 | ||
f2c66ed1 NS |
455 | # Main command set |
456 | case "$1" in | |
fcb10a96 JH |
457 | list) |
458 | shift | |
f2c66ed1 NS |
459 | list_stash "$@" |
460 | ;; | |
461 | show) | |
462 | shift | |
463 | show_stash "$@" | |
464 | ;; | |
683befa1 KL |
465 | save) |
466 | shift | |
47629dcf | 467 | save_stash "$@" |
683befa1 | 468 | ;; |
f2c66ed1 NS |
469 | apply) |
470 | shift | |
471 | apply_stash "$@" | |
472 | ;; | |
473 | clear) | |
3023dc69 JH |
474 | shift |
475 | clear_stash "$@" | |
f2c66ed1 | 476 | ;; |
bc9e7399 JH |
477 | create) |
478 | if test $# -gt 0 && test "$1" = create | |
479 | then | |
480 | shift | |
481 | fi | |
482 | create_stash "$*" && echo "$w_commit" | |
483 | ;; | |
e25d5f9c BC |
484 | drop) |
485 | shift | |
486 | drop_stash "$@" | |
487 | ;; | |
bd56ff54 BC |
488 | pop) |
489 | shift | |
f276872d | 490 | pop_stash "$@" |
bd56ff54 | 491 | ;; |
656b5034 AMS |
492 | branch) |
493 | shift | |
494 | apply_to_branch "$@" | |
495 | ;; | |
f2c66ed1 | 496 | *) |
3c2eb80f MM |
497 | case $# in |
498 | 0) | |
97bc00a4 | 499 | save_stash && |
5a175871 | 500 | say "$(gettext "(To restore them type \"git stash apply\")")" |
ea41cfc4 JS |
501 | ;; |
502 | *) | |
683befa1 | 503 | usage |
ea41cfc4 | 504 | esac |
9f62e18a | 505 | ;; |
f2c66ed1 | 506 | esac |