🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.4.1 / . / git-stash.sh
blob: d4cf818be9488f1b94fdf4766a8f73db6bfd1029 [file] [log] [blame]
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]1#!/bin/sh
2# Copyright (c) 2007, Nanako Shiraishi
3
Stephan Beyera5ab00c2008-08-16 03:27:31[diff] [blame]4dashless=$(basename "$0" | sed -e 's/-/ /')
5USAGE="list [<options>]
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]6 or: $dashless show [<stash>]
7 or: $dashless drop [-q|--quiet] [<stash>]
8 or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
Stephan Beyera5ab00c2008-08-16 03:27:31[diff] [blame]9 or: $dashless branch <branchname> [<stash>]
David Caldwell78751302011-06-25 00:56:06[diff] [blame]10 or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
11 [-u|--include-untracked] [-a|--all] [<message>]]
Stephan Beyera5ab00c2008-08-16 03:27:31[diff] [blame]12 or: $dashless clear"
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]13
James Bowes3cd24912007-07-06 19:57:47[diff] [blame]14SUBDIRECTORY_OK=Yes
Junio C Hamano8f321a32007-11-06 09:50:02[diff] [blame]15OPTIONS_SPEC=
Elia Pintod0ea45b2014-04-23 13:44:01[diff] [blame]16START_DIR=$(pwd)
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]17. git-sh-setup
Ævar Arnfjörð Bjarmason8a583be2011-05-21 18:44:10[diff] [blame]18. git-sh-i18n
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]19require_work_tree
Junio C Hamanoceff0792007-07-25 22:32:22[diff] [blame]20cd_to_toplevel
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]21
22TMP="$GIT_DIR/.git-stash.$$"
Johannes Sixt3ba2e862011-03-16 08:18:49[diff] [blame]23TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$
24trap 'rm -f "$TMP-"* "$TMPindex"' 0
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]25
26ref_stash=refs/stash
27
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]28if git config --get-colorbool color.interactive; then
29 help_color="$(git config --get-color color.interactive.help 'red bold')"
30 reset_color="$(git config --get-color '' reset)"
31else
32 help_color=
33 reset_color=
34fi
35
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]36no_changes () {
Johannes Schindelin6848d582008-05-14 17:03:59[diff] [blame]37 git diff-index --quiet --cached HEAD --ignore-submodules -- &&
David Caldwell78751302011-06-25 00:56:06[diff] [blame]38 git diff-files --quiet --ignore-submodules &&
39 (test -z "$untracked" || test -z "$(untracked_files)")
40}
41
42untracked_files () {
43 excl_opt=--exclude-standard
44 test "$untracked" = "all" && excl_opt=
45 git ls-files -o -z $excl_opt
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]46}
47
48clear_stash () {
Junio C Hamano3023dc62008-01-05 09:35:54[diff] [blame]49 if test $# != 0
50 then
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]51 die "$(gettext "git stash clear with parameters is unimplemented")"
Junio C Hamano3023dc62008-01-05 09:35:54[diff] [blame]52 fi
David Aguilar1956dfa2014-09-16 03:24:10[diff] [blame]53 if current=$(git rev-parse --verify --quiet $ref_stash)
Junio C Hamano7ab3cc72007-07-27 06:24:28[diff] [blame]54 then
Emil Medvea9ee9bf2007-11-07 21:10:27[diff] [blame]55 git update-ref -d $ref_stash $current
Junio C Hamano7ab3cc72007-07-27 06:24:28[diff] [blame]56 fi
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]57}
58
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]59create_stash () {
Junio C Hamano9f62e182007-07-05 05:46:09[diff] [blame]60 stash_msg="$1"
David Caldwell78751302011-06-25 00:56:06[diff] [blame]61 untracked="$2"
Junio C Hamano9f62e182007-07-05 05:46:09[diff] [blame]62
Junio C Hamano1eff26c2008-09-04 09:41:22[diff] [blame]63 git update-index -q --refresh
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]64 if no_changes
65 then
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]66 exit 0
67 fi
しらいしななこf12e9252007-07-28 01:44:48[diff] [blame]68
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]69 # state of the base commit
Junio C Hamano5be60072007-07-03 05:52:14[diff] [blame]70 if b_commit=$(git rev-parse --verify HEAD)
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]71 then
Jeff Kingb0e621a2010-04-08 19:42:37[diff] [blame]72 head=$(git rev-list --oneline -n 1 HEAD --)
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]73 else
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]74 die "$(gettext "You do not have the initial commit yet")"
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]75 fi
76
Junio C Hamano5be60072007-07-03 05:52:14[diff] [blame]77 if branch=$(git symbolic-ref -q HEAD)
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]78 then
79 branch=${branch#refs/heads/}
80 else
81 branch='(no branch)'
82 fi
83 msg=$(printf '%s: %s' "$branch" "$head")
84
85 # state of the index
Junio C Hamano5be60072007-07-03 05:52:14[diff] [blame]86 i_tree=$(git write-tree) &&
Jean-Luc Herren6143fa22007-09-12 18:45:03[diff] [blame]87 i_commit=$(printf 'index on %s\n' "$msg" |
Junio C Hamano5be60072007-07-03 05:52:14[diff] [blame]88 git commit-tree $i_tree -p $b_commit) ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]89 die "$(gettext "Cannot save the current index state")"
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]90
David Caldwell78751302011-06-25 00:56:06[diff] [blame]91 if test -n "$untracked"
92 then
93 # Untracked files are stored by themselves in a parentless commit, for
94 # ease of unpacking later.
95 u_commit=$(
96 untracked_files | (
Elia Pintobed137d2014-05-23 10:15:31[diff] [blame]97 GIT_INDEX_FILE="$TMPindex" &&
98 export GIT_INDEX_FILE &&
David Caldwell78751302011-06-25 00:56:06[diff] [blame]99 rm -f "$TMPindex" &&
100 git update-index -z --add --remove --stdin &&
101 u_tree=$(git write-tree) &&
102 printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree &&
103 rm -f "$TMPindex"
104 ) ) || die "Cannot save the untracked files"
105
106 untracked_commit_option="-p $u_commit";
107 else
108 untracked_commit_option=
109 fi
110
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]111 if test -z "$patch_mode"
112 then
113
114 # state of the working tree
115 w_tree=$( (
Johannes Sixt3ba2e862011-03-16 08:18:49[diff] [blame]116 git read-tree --index-output="$TMPindex" -m $i_tree &&
117 GIT_INDEX_FILE="$TMPindex" &&
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]118 export GIT_INDEX_FILE &&
Jonathon Mah44df2e22011-12-31 00:14:01[diff] [blame]119 git diff --name-only -z HEAD -- >"$TMP-stagenames" &&
120 git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]121 git write-tree &&
Johannes Sixt3ba2e862011-03-16 08:18:49[diff] [blame]122 rm -f "$TMPindex"
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]123 ) ) ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]124 die "$(gettext "Cannot save the current worktree state")"
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]125
126 else
127
Junio C Hamanob24f56d2007-07-08 08:28:18[diff] [blame]128 rm -f "$TMP-index" &&
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]129 GIT_INDEX_FILE="$TMP-index" git read-tree HEAD &&
130
131 # find out what the user wants
132 GIT_INDEX_FILE="$TMP-index" \
133 git add--interactive --patch=stash -- &&
134
135 # state of the working tree
136 w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]137 die "$(gettext "Cannot save the current worktree state")"
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]138
Jonathon Mah44df2e22011-12-31 00:14:01[diff] [blame]139 git diff-tree -p HEAD $w_tree -- >"$TMP-patch" &&
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]140 test -s "$TMP-patch" ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]141 die "$(gettext "No changes selected")"
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]142
143 rm -f "$TMP-index" ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]144 die "$(gettext "Cannot remove temporary index (can't happen)")"
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]145
146 fi
147
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]148 # create the stash
Junio C Hamano9f62e182007-07-05 05:46:09[diff] [blame]149 if test -z "$stash_msg"
150 then
151 stash_msg=$(printf 'WIP on %s' "$msg")
152 else
153 stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg")
154 fi
155 w_commit=$(printf '%s\n' "$stash_msg" |
Junio C Hamano22f41282011-07-22 21:46:28[diff] [blame]156 git commit-tree $w_tree -p $b_commit -p $i_commit $untracked_commit_option) ||
157 die "$(gettext "Cannot record working tree state")"
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]158}
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]159
Ramkumar Ramachandrabd514ca2013-06-15 13:13:25[diff] [blame]160store_stash () {
161 while test $# != 0
162 do
163 case "$1" in
164 -m|--message)
165 shift
166 stash_msg="$1"
167 ;;
168 -q|--quiet)
169 quiet=t
170 ;;
171 *)
172 break
173 ;;
174 esac
175 shift
176 done
177 test $# = 1 ||
178 die "$(eval_gettext "\"$dashless store\" requires one <commit> argument")"
179
180 w_commit="$1"
181 if test -z "$stash_msg"
182 then
183 stash_msg="Created via \"git stash store\"."
184 fi
185
186 # Make sure the reflog for stash is kept.
187 : >>"$GIT_DIR/logs/$ref_stash"
188 git update-ref -m "$stash_msg" $ref_stash $w_commit
189 ret=$?
190 test $ret != 0 && test -z $quiet &&
191 die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")"
192 return $ret
193}
194
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]195save_stash () {
SZEDER Gábor7bedebc2008-06-27 14:37:15[diff] [blame]196 keep_index=
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]197 patch_mode=
David Caldwell78751302011-06-25 00:56:06[diff] [blame]198 untracked=
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]199 while test $# != 0
200 do
201 case "$1" in
Johannes Schindelinea41cfc2009-07-27 18:37:10[diff] [blame]202 -k|--keep-index)
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]203 keep_index=t
204 ;;
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]205 --no-keep-index)
Dan McGee3a243f72011-04-07 17:04:20[diff] [blame]206 keep_index=n
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]207 ;;
208 -p|--patch)
209 patch_mode=t
Dan McGee3a243f72011-04-07 17:04:20[diff] [blame]210 # only default to keep if we don't already have an override
211 test -z "$keep_index" && keep_index=t
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]212 ;;
213 -q|--quiet)
214 GIT_QUIET=t
215 ;;
David Caldwell78751302011-06-25 00:56:06[diff] [blame]216 -u|--include-untracked)
217 untracked=untracked
218 ;;
219 -a|--all)
220 untracked=all
221 ;;
Matthieu Moy3c2eb802009-08-18 21:38:40[diff] [blame]222 --)
223 shift
224 break
225 ;;
226 -*)
Ævar Arnfjörð Bjarmasoneed10642011-05-21 18:44:17[diff] [blame]227 option="$1"
228 # TRANSLATORS: $option is an invalid option, like
229 # `--blah-blah'. The 7 spaces at the beginning of the
230 # second line correspond to "error: ". So you should line
231 # up the second line with however many characters the
232 # translation of "error: " takes in your language. E.g. in
233 # English this is:
234 #
235 # $ git stash save --blah-blah 2>&1 | head -n 2
236 # error: unknown option for 'stash save': --blah-blah
237 # To provide a message, use git stash save -- '--blah-blah'
Ross Lagerwalled3c4002012-04-14 12:37:29[diff] [blame]238 eval_gettextln "error: unknown option for 'stash save': \$option
239 To provide a message, use git stash save -- '\$option'"
Matthieu Moy3c2eb802009-08-18 21:38:40[diff] [blame]240 usage
241 ;;
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]242 *)
243 break
244 ;;
245 esac
SZEDER Gábor7bedebc2008-06-27 14:37:15[diff] [blame]246 shift
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]247 done
SZEDER Gábor7bedebc2008-06-27 14:37:15[diff] [blame]248
David Caldwell78751302011-06-25 00:56:06[diff] [blame]249 if test -n "$patch_mode" && test -n "$untracked"
250 then
Brandon Caseyd88acc92011-08-27 00:59:25[diff] [blame]251 die "Can't use --patch and --include-untracked or --all at the same time"
David Caldwell78751302011-06-25 00:56:06[diff] [blame]252 fi
253
Junio C Hamano47629dc2008-07-23 20:33:44[diff] [blame]254 stash_msg="$*"
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]255
Junio C Hamano1eff26c2008-09-04 09:41:22[diff] [blame]256 git update-index -q --refresh
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]257 if no_changes
258 then
Ævar Arnfjörð Bjarmason5a175872011-05-21 18:44:12[diff] [blame]259 say "$(gettext "No local changes to save")"
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]260 exit 0
261 fi
262 test -f "$GIT_DIR/logs/$ref_stash" ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]263 clear_stash || die "$(gettext "Cannot initialize stash")"
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]264
David Caldwell78751302011-06-25 00:56:06[diff] [blame]265 create_stash "$stash_msg" $untracked
Ramkumar Ramachandrabd514ca2013-06-15 13:13:25[diff] [blame]266 store_stash -m "$stash_msg" -q $w_commit ||
267 die "$(gettext "Cannot save the current status")"
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]268 say Saved working directory and index state "$stash_msg"
SZEDER Gábor7bedebc2008-06-27 14:37:15[diff] [blame]269
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]270 if test -z "$patch_mode"
SZEDER Gábor7bedebc2008-06-27 14:37:15[diff] [blame]271 then
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]272 git reset --hard ${GIT_QUIET:+-q}
David Caldwell78751302011-06-25 00:56:06[diff] [blame]273 test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
274 if test -n "$untracked"
275 then
Brandon Casey7474b8b2011-08-27 00:59:27[diff] [blame]276 git clean --force --quiet -d $CLEAN_X_OPTION
David Caldwell78751302011-06-25 00:56:06[diff] [blame]277 fi
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]278
Dan McGee3a243f72011-04-07 17:04:20[diff] [blame]279 if test "$keep_index" = "t" && test -n $i_tree
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]280 then
281 git read-tree --reset -u $i_tree
282 fi
283 else
284 git apply -R < "$TMP-patch" ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]285 die "$(gettext "Cannot remove worktree changes")"
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]286
Dan McGee3a243f72011-04-07 17:04:20[diff] [blame]287 if test "$keep_index" != "t"
Thomas Rastdda1f2a2009-08-13 12:29:44[diff] [blame]288 then
289 git reset
290 fi
SZEDER Gábor7bedebc2008-06-27 14:37:15[diff] [blame]291 fi
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]292}
293
Jeff King401de402007-07-02 04:21:24[diff] [blame]294have_stash () {
David Aguilar1956dfa2014-09-16 03:24:10[diff] [blame]295 git rev-parse --verify --quiet $ref_stash >/dev/null
Jeff King401de402007-07-02 04:21:24[diff] [blame]296}
297
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]298list_stash () {
Jeff King401de402007-07-02 04:21:24[diff] [blame]299 have_stash || return 0
Jeff King288c67c2014-08-06 18:35:25[diff] [blame]300 git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash --
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]301}
302
303show_stash () {
Jon Seymoura9bf09e2010-08-21 04:09:02[diff] [blame]304 assert_stash_like "$@"
Gustaf Hendeby14cd4582010-03-16 17:52:37[diff] [blame]305
Jon Seymoura9bf09e2010-08-21 04:09:02[diff] [blame]306 git diff ${FLAGS:---stat} $b_commit $w_commit
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]307}
308
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]309#
310# Parses the remaining options looking for flags and
311# at most one revision defaulting to ${ref_stash}@{0}
312# if none found.
313#
314# Derives related tree and commit objects from the
315# revision, if one is found.
316#
317# stash records the work tree, and is a merge between the
318# base commit (first parent) and the index tree (second parent).
319#
320# REV is set to the symbolic version of the specified stash-like commit
321# IS_STASH_LIKE is non-blank if ${REV} looks like a stash
322# IS_STASH_REF is non-blank if the ${REV} looks like a stash ref
323# s is set to the SHA1 of the stash commit
324# w_commit is set to the commit containing the working tree
325# b_commit is set to the base commit
326# i_commit is set to the commit containing the index tree
David Caldwell78751302011-06-25 00:56:06[diff] [blame]327# u_commit is set to the commit containing the untracked files tree
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]328# w_tree is set to the working tree
329# b_tree is set to the base tree
330# i_tree is set to the index tree
David Caldwell78751302011-06-25 00:56:06[diff] [blame]331# u_tree is set to the untracked files tree
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]332#
333# GIT_QUIET is set to t if -q is specified
334# INDEX_OPTION is set to --index if --index is specified.
335# FLAGS is set to the remaining flags
336#
337# dies if:
338# * too many revisions specified
339# * no revision is specified and there is no stash stack
340# * a revision is specified which cannot be resolve to a SHA1
341# * a non-existent stash reference is specified
342#
343
344parse_flags_and_rev()
345{
346 test "$PARSE_CACHE" = "$*" && return 0 # optimisation
347 PARSE_CACHE="$*"
348
349 IS_STASH_LIKE=
350 IS_STASH_REF=
351 INDEX_OPTION=
352 s=
353 w_commit=
354 b_commit=
355 i_commit=
David Caldwell78751302011-06-25 00:56:06[diff] [blame]356 u_commit=
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]357 w_tree=
358 b_tree=
359 i_tree=
David Caldwell78751302011-06-25 00:56:06[diff] [blame]360 u_tree=
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]361
Øystein Walle2a07e432014-01-07 08:22:15[diff] [blame]362 REV=$(git rev-parse --no-flags --symbolic --sq "$@") || exit 1
Jon Seymour2bea5932010-09-27 15:32:45[diff] [blame]363
364 FLAGS=
Brian Gernhardt9027fa92010-09-24 22:15:34[diff] [blame]365 for opt
366 do
367 case "$opt" in
Jon Seymour2bea5932010-09-27 15:32:45[diff] [blame]368 -q|--quiet)
369 GIT_QUIET=-t
Brian Gernhardt9027fa92010-09-24 22:15:34[diff] [blame]370 ;;
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]371 --index)
372 INDEX_OPTION=--index
373 ;;
Jon Seymour2bea5932010-09-27 15:32:45[diff] [blame]374 -*)
375 FLAGS="${FLAGS}${FLAGS:+ }$opt"
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]376 ;;
377 esac
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]378 done
379
Øystein Walle2a07e432014-01-07 08:22:15[diff] [blame]380 eval set -- $REV
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]381
382 case $# in
383 0)
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]384 have_stash || die "$(gettext "No stash found.")"
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]385 set -- ${ref_stash}@{0}
386 ;;
387 1)
388 :
389 ;;
390 *)
Ævar Arnfjörð Bjarmason33ceddc2011-05-21 18:44:14[diff] [blame]391 die "$(eval_gettext "Too many revisions specified: \$REV")"
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]392 ;;
393 esac
394
David Aguilar1956dfa2014-09-16 03:24:10[diff] [blame]395 REV=$(git rev-parse --symbolic --verify --quiet "$1") || {
Ævar Arnfjörð Bjarmason155da742011-05-21 18:44:16[diff] [blame]396 reference="$1"
Alex Henriead5fe372014-08-30 19:56:01[diff] [blame]397 die "$(eval_gettext "\$reference is not a valid reference")"
Ævar Arnfjörð Bjarmason155da742011-05-21 18:44:16[diff] [blame]398 }
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]399
David Aguilar1956dfa2014-09-16 03:24:10[diff] [blame]400 i_commit=$(git rev-parse --verify --quiet "$REV^2") &&
Øystein Walle2a07e432014-01-07 08:22:15[diff] [blame]401 set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]402 s=$1 &&
403 w_commit=$1 &&
404 b_commit=$2 &&
405 w_tree=$3 &&
406 b_tree=$4 &&
407 i_tree=$5 &&
408 IS_STASH_LIKE=t &&
409 test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
410 IS_STASH_REF=t
David Caldwell78751302011-06-25 00:56:06[diff] [blame]411
David Aguilar1956dfa2014-09-16 03:24:10[diff] [blame]412 u_commit=$(git rev-parse --verify --quiet "$REV^3") &&
Øystein Walle2a07e432014-01-07 08:22:15[diff] [blame]413 u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]414}
415
416is_stash_like()
417{
418 parse_flags_and_rev "$@"
419 test -n "$IS_STASH_LIKE"
420}
421
422assert_stash_like() {
Ævar Arnfjörð Bjarmason777b6f12011-05-21 18:44:15[diff] [blame]423 is_stash_like "$@" || {
424 args="$*"
425 die "$(eval_gettext "'\$args' is not a stash-like commit")"
426 }
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]427}
428
429is_stash_ref() {
430 is_stash_like "$@" && test -n "$IS_STASH_REF"
431}
432
433assert_stash_ref() {
Ævar Arnfjörð Bjarmason777b6f12011-05-21 18:44:15[diff] [blame]434 is_stash_ref "$@" || {
435 args="$*"
436 die "$(eval_gettext "'\$args' is not a stash reference")"
437 }
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]438}
439
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]440apply_stash () {
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]441
Jon Seymour064ed102010-08-21 04:08:58[diff] [blame]442 assert_stash_like "$@"
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]443
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]444 git update-index -q --refresh || die "$(gettext "unable to refresh index")"
Ori Avtalion5fd448f2009-08-11 11:12:13[diff] [blame]445
446 # current index state
447 c_tree=$(git write-tree) ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]448 die "$(gettext "Cannot apply a stash in the middle of a merge")"
Ori Avtalion5fd448f2009-08-11 11:12:13[diff] [blame]449
Junio C Hamanocbeaccc2007-07-28 06:41:31[diff] [blame]450 unstashed_index_tree=
Jon Seymour064ed102010-08-21 04:08:58[diff] [blame]451 if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" &&
SZEDER Gábor7bedebc2008-06-27 14:37:15[diff] [blame]452 test "$c_tree" != "$i_tree"
Junio C Hamanocbeaccc2007-07-28 06:41:31[diff] [blame]453 then
Shawn O. Pearce89d750b2007-10-19 01:28:43[diff] [blame]454 git diff-tree --binary $s^2^..$s^2 | git apply --cached
Johannes Schindelin150937c2007-07-02 11:14:49[diff] [blame]455 test $? -ne 0 &&
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]456 die "$(gettext "Conflicts in index. Try without --index.")"
Martin Koegler52070792009-07-22 05:30:58[diff] [blame]457 unstashed_index_tree=$(git write-tree) ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]458 die "$(gettext "Could not save index tree")"
Johannes Schindelin150937c2007-07-02 11:14:49[diff] [blame]459 git reset
Junio C Hamanocbeaccc2007-07-28 06:41:31[diff] [blame]460 fi
Johannes Schindelin150937c2007-07-02 11:14:49[diff] [blame]461
David Caldwell78751302011-06-25 00:56:06[diff] [blame]462 if test -n "$u_tree"
463 then
464 GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
465 GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
466 rm -f "$TMPindex" ||
467 die 'Could not restore untracked files from stash'
468 fi
469
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]470 eval "
471 GITHEAD_$w_tree='Stashed changes' &&
472 GITHEAD_$c_tree='Updated upstream' &&
473 GITHEAD_$b_tree='Version stash was based on' &&
474 export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
475 "
476
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]477 if test -n "$GIT_QUIET"
478 then
Junio C Hamano69ae92b2010-10-13 18:36:36[diff] [blame]479 GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]480 fi
Martin Koegler52070792009-07-22 05:30:58[diff] [blame]481 if git merge-recursive $b_tree -- $c_tree $w_tree
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]482 then
483 # No conflict
Junio C Hamanocbeaccc2007-07-28 06:41:31[diff] [blame]484 if test -n "$unstashed_index_tree"
485 then
486 git read-tree "$unstashed_index_tree"
Junio C Hamano83b3df72007-07-28 06:51:45[diff] [blame]487 else
488 a="$TMP-added" &&
Shawn O. Pearce89d750b2007-10-19 01:28:43[diff] [blame]489 git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" &&
Junio C Hamano83b3df72007-07-28 06:51:45[diff] [blame]490 git read-tree --reset $c_tree &&
491 git update-index --add --stdin <"$a" ||
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]492 die "$(gettext "Cannot unstage modified files")"
Junio C Hamano83b3df72007-07-28 06:51:45[diff] [blame]493 rm -f "$a"
Junio C Hamanocbeaccc2007-07-28 06:41:31[diff] [blame]494 fi
Stephen Boydfcdd0e92009-06-18 01:07:37[diff] [blame]495 squelch=
496 if test -n "$GIT_QUIET"
497 then
498 squelch='>/dev/null 2>&1'
499 fi
Piotr Krukowiecki26b59b42011-03-12 08:57:46[diff] [blame]500 (cd "$START_DIR" && eval "git status $squelch") || :
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]501 else
502 # Merge conflict; keep the exit status from merge-recursive
Johannes Schindelin150937c2007-07-02 11:14:49[diff] [blame]503 status=$?
Phil Hord743bf6d2012-07-10 22:52:28[diff] [blame]504 git rerere
Jon Seymour064ed102010-08-21 04:08:58[diff] [blame]505 if test -n "$INDEX_OPTION"
Junio C Hamanocbeaccc2007-07-28 06:41:31[diff] [blame]506 then
Jon Seymour6fdd50e2011-08-07 11:58:16[diff] [blame]507 gettextln "Index was not unstashed." >&2
Junio C Hamanocbeaccc2007-07-28 06:41:31[diff] [blame]508 fi
Johannes Schindelin150937c2007-07-02 11:14:49[diff] [blame]509 exit $status
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]510 fi
511}
512
Jon Seymourf2768722010-08-21 04:09:00[diff] [blame]513pop_stash() {
514 assert_stash_ref "$@"
515
Junio C Hamano2d4c9932014-02-26 22:18:54[diff] [blame]516 if apply_stash "$@"
517 then
518 drop_stash "$@"
519 else
520 status=$?
521 say "The stash is kept in case you need it again."
522 exit $status
523 fi
Jon Seymourf2768722010-08-21 04:09:00[diff] [blame]524}
525
Brandon Caseye25d5f92008-02-22 19:04:54[diff] [blame]526drop_stash () {
Jon Seymour92e39e42010-08-21 04:08:59[diff] [blame]527 assert_stash_ref "$@"
Brandon Caseye25d5f92008-02-22 19:04:54[diff] [blame]528
Jon Seymour92e39e42010-08-21 04:08:59[diff] [blame]529 git reflog delete --updateref --rewrite "${REV}" &&
Ævar Arnfjörð Bjarmasond4ca6c82011-05-21 18:44:18[diff] [blame]530 say "$(eval_gettext "Dropped \${REV} (\$s)")" ||
531 die "$(eval_gettext "\${REV}: Could not drop stash entry")"
Brandon Caseye25d5f92008-02-22 19:04:54[diff] [blame]532
533 # clear_stash if we just dropped the last stash entry
David Aguilar1956dfa2014-09-16 03:24:10[diff] [blame]534 git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null ||
535 clear_stash
Brandon Caseye25d5f92008-02-22 19:04:54[diff] [blame]536}
537
Abhijit Menon-Sen656b5032008-07-03 06:16:05[diff] [blame]538apply_to_branch () {
Ævar Arnfjörð Bjarmasonb1440ce2011-05-21 18:44:13[diff] [blame]539 test -n "$1" || die "$(gettext "No branch name specified")"
Abhijit Menon-Sen656b5032008-07-03 06:16:05[diff] [blame]540 branch=$1
Jon Seymourfb433dc2010-08-21 04:09:01[diff] [blame]541 shift 1
Abhijit Menon-Sen656b5032008-07-03 06:16:05[diff] [blame]542
Jon Seymourfb433dc2010-08-21 04:09:01[diff] [blame]543 set -- --index "$@"
544 assert_stash_like "$@"
Abhijit Menon-Sen656b5032008-07-03 06:16:05[diff] [blame]545
Jon Seymourfb433dc2010-08-21 04:09:01[diff] [blame]546 git checkout -b $branch $REV^ &&
Jon Seymour57693d02010-09-28 13:19:52[diff] [blame]547 apply_stash "$@" && {
548 test -z "$IS_STASH_REF" || drop_stash "$@"
549 }
Abhijit Menon-Sen656b5032008-07-03 06:16:05[diff] [blame]550}
551
Jon Seymouref763122010-08-21 04:46:22[diff] [blame]552PARSE_CACHE='--not-parsed'
Matthieu Moy3c2eb802009-08-18 21:38:40[diff] [blame]553# The default command is "save" if nothing but options are given
554seen_non_option=
555for opt
556do
557 case "$opt" in
558 -*) ;;
559 *) seen_non_option=t; break ;;
560 esac
561done
562
563test -n "$seen_non_option" || set "save" "$@"
564
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]565# Main command set
566case "$1" in
Junio C Hamanofcb10a92007-07-03 06:15:45[diff] [blame]567list)
568 shift
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]569 list_stash "$@"
570 ;;
571show)
572 shift
573 show_stash "$@"
574 ;;
Kevin Leung683befa2007-12-03 02:34:05[diff] [blame]575save)
576 shift
Junio C Hamano47629dc2008-07-23 20:33:44[diff] [blame]577 save_stash "$@"
Kevin Leung683befa2007-12-03 02:34:05[diff] [blame]578 ;;
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]579apply)
580 shift
581 apply_stash "$@"
582 ;;
583clear)
Junio C Hamano3023dc62008-01-05 09:35:54[diff] [blame]584 shift
585 clear_stash "$@"
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]586 ;;
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]587create)
Ramkumar Ramachandra0719f302013-06-15 13:13:24[diff] [blame]588 shift
Junio C Hamanobc9e7392007-07-08 08:38:32[diff] [blame]589 create_stash "$*" && echo "$w_commit"
590 ;;
Ramkumar Ramachandrabd514ca2013-06-15 13:13:25[diff] [blame]591store)
592 shift
593 store_stash "$@"
594 ;;
Brandon Caseye25d5f92008-02-22 19:04:54[diff] [blame]595drop)
596 shift
597 drop_stash "$@"
598 ;;
Brandon Caseybd56ff52008-02-22 22:52:50[diff] [blame]599pop)
600 shift
Jon Seymourf2768722010-08-21 04:09:00[diff] [blame]601 pop_stash "$@"
Brandon Caseybd56ff52008-02-22 22:52:50[diff] [blame]602 ;;
Abhijit Menon-Sen656b5032008-07-03 06:16:05[diff] [blame]603branch)
604 shift
605 apply_to_branch "$@"
606 ;;
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]607*)
Matthieu Moy3c2eb802009-08-18 21:38:40[diff] [blame]608 case $# in
609 0)
Wincent Colaiuta97bc00a2007-12-22 17:31:25[diff] [blame]610 save_stash &&
Ævar Arnfjörð Bjarmason5a175872011-05-21 18:44:12[diff] [blame]611 say "$(gettext "(To restore them type \"git stash apply\")")"
Johannes Schindelinea41cfc2009-07-27 18:37:10[diff] [blame]612 ;;
613 *)
Kevin Leung683befa2007-12-03 02:34:05[diff] [blame]614 usage
Johannes Schindelinea41cfc2009-07-27 18:37:10[diff] [blame]615 esac
Junio C Hamano9f62e182007-07-05 05:46:09[diff] [blame]616 ;;
しらいしななこf2c66ed2007-06-30 05:37:09[diff] [blame]617esac