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