Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100755 437 lines (380 sloc) 8.638 kB
f2c66ed Add git-stash script
しらいしななこ authored
1 #!/bin/sh
2 # Copyright (c) 2007, Nanako Shiraishi
3
a5ab00c @sbeyer git-stash: improve synopsis in help and manual page
sbeyer authored
4 dashless=$(basename "$0" | sed -e 's/-/ /')
5 USAGE="list [<options>]
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
6 or: $dashless show [<stash>]
7 or: $dashless drop [-q|--quiet] [<stash>]
8 or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
a5ab00c @sbeyer git-stash: improve synopsis in help and manual page
sbeyer authored
9 or: $dashless branch <branchname> [<stash>]
dc89689 @moy stash: mention --patch in usage string.
moy authored
10 or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]]
a5ab00c @sbeyer git-stash: improve synopsis in help and manual page
sbeyer authored
11 or: $dashless clear"
f2c66ed Add git-stash script
しらいしななこ authored
12
3cd2491 stash: allow running from a subdirectory
James Bowes authored
13 SUBDIRECTORY_OK=Yes
8f321a3 @gitster scripts: Add placeholders for OPTIONS_SPEC
gitster authored
14 OPTIONS_SPEC=
f2c66ed Add git-stash script
しらいしななこ authored
15 . git-sh-setup
16 require_work_tree
ceff079 @gitster Make sure git-stash works from subdirectory.
gitster authored
17 cd_to_toplevel
f2c66ed Add git-stash script
しらいしななこ authored
18
19 TMP="$GIT_DIR/.git-stash.$$"
20 trap 'rm -f "$TMP-*"' 0
21
22 ref_stash=refs/stash
23
dda1f2a @trast Implement 'git stash save --patch'
trast authored
24 if git config --get-colorbool color.interactive; then
25 help_color="$(git config --get-color color.interactive.help 'red bold')"
26 reset_color="$(git config --get-color '' reset)"
27 else
28 help_color=
29 reset_color=
30 fi
31
f2c66ed Add git-stash script
しらいしななこ authored
32 no_changes () {
6848d58 @dscho Ignore dirty submodule states during rebase and stash
dscho authored
33 git diff-index --quiet --cached HEAD --ignore-submodules -- &&
34 git diff-files --quiet --ignore-submodules
f2c66ed Add git-stash script
しらいしななこ authored
35 }
36
37 clear_stash () {
3023dc6 @gitster git-stash clear: refuse to work with extra parameter for now
gitster authored
38 if test $# != 0
39 then
40 die "git stash clear with parameters is unimplemented"
41 fi
0e32126 @gitster Revert "git-stash: use git rev-parse -q"
gitster authored
42 if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
7ab3cc7 @gitster git-stash: do not remove a ref by hand.
gitster authored
43 then
a9ee9bf git-stash: Fix listing stashes
Emil Medve authored
44 git update-ref -d $ref_stash $current
7ab3cc7 @gitster git-stash: do not remove a ref by hand.
gitster authored
45 fi
f2c66ed Add git-stash script
しらいしななこ authored
46 }
47
bc9e739 @gitster stash: implement "stash create"
gitster authored
48 create_stash () {
9f62e18 @gitster git-stash: allow more descriptive reminder message when saving
gitster authored
49 stash_msg="$1"
50
1eff26c @gitster stash: refresh the index before deciding if the work tree is dirty
gitster authored
51 git update-index -q --refresh
f2c66ed Add git-stash script
しらいしななこ authored
52 if no_changes
53 then
54 exit 0
55 fi
f12e925 git-stash: Make sure reflog is created for refs/stash
しらいしななこ authored
56
f2c66ed Add git-stash script
しらいしななこ authored
57 # state of the base commit
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored
58 if b_commit=$(git rev-parse --verify HEAD)
f2c66ed Add git-stash script
しらいしななこ authored
59 then
aa4f31d git-stash: do not get fooled with "color.diff = true"
Pascal Obry authored
60 head=$(git log --no-color --abbrev-commit --pretty=oneline -n 1 HEAD --)
f2c66ed Add git-stash script
しらいしななこ authored
61 else
62 die "You do not have the initial commit yet"
63 fi
64
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored
65 if branch=$(git symbolic-ref -q HEAD)
f2c66ed Add git-stash script
しらいしななこ authored
66 then
67 branch=${branch#refs/heads/}
68 else
69 branch='(no branch)'
70 fi
71 msg=$(printf '%s: %s' "$branch" "$head")
72
73 # state of the index
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored
74 i_tree=$(git write-tree) &&
6143fa2 @jlherren stash: end index commit log with a newline
jlherren authored
75 i_commit=$(printf 'index on %s\n' "$msg" |
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored
76 git commit-tree $i_tree -p $b_commit) ||
f2c66ed Add git-stash script
しらいしななこ authored
77 die "Cannot save the current index state"
78
dda1f2a @trast Implement 'git stash save --patch'
trast authored
79 if test -z "$patch_mode"
80 then
81
82 # state of the working tree
83 w_tree=$( (
84 rm -f "$TMP-index" &&
85 cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
86 GIT_INDEX_FILE="$TMP-index" &&
87 export GIT_INDEX_FILE &&
88 git read-tree -m $i_tree &&
89 git add -u &&
90 git write-tree &&
91 rm -f "$TMP-index"
92 ) ) ||
93 die "Cannot save the current worktree state"
94
95 else
96
b24f56d @gitster git-stash: try reusing cached stat info as much as possible
gitster authored
97 rm -f "$TMP-index" &&
dda1f2a @trast Implement 'git stash save --patch'
trast authored
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) ||
f2c66ed Add git-stash script
しらいしななこ authored
106 die "Cannot save the current worktree state"
107
dda1f2a @trast Implement 'git stash save --patch'
trast authored
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
f2c66ed Add git-stash script
しらいしななこ authored
117 # create the stash
9f62e18 @gitster git-stash: allow more descriptive reminder message when saving
gitster authored
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" |
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored
125 git commit-tree $w_tree -p $b_commit -p $i_commit) ||
f2c66ed Add git-stash script
しらいしななこ authored
126 die "Cannot record working tree state"
bc9e739 @gitster stash: implement "stash create"
gitster authored
127 }
f2c66ed Add git-stash script
しらいしななこ authored
128
bc9e739 @gitster stash: implement "stash create"
gitster authored
129 save_stash () {
7bedebc @szeder stash: introduce 'stash save --keep-index' option
szeder authored
130 keep_index=
dda1f2a @trast Implement 'git stash save --patch'
trast authored
131 patch_mode=
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
132 while test $# != 0
133 do
134 case "$1" in
ea41cfc @dscho Make 'git stash -k' a short form for 'git stash save --keep-index'
dscho authored
135 -k|--keep-index)
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
136 keep_index=t
137 ;;
dda1f2a @trast Implement 'git stash save --patch'
trast authored
138 --no-keep-index)
139 keep_index=
140 ;;
141 -p|--patch)
142 patch_mode=t
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
143 keep_index=t
144 ;;
145 -q|--quiet)
146 GIT_QUIET=t
147 ;;
3c2eb80 @moy stash: simplify defaulting to "save" and reject unknown options
moy authored
148 --)
149 shift
150 break
151 ;;
152 -*)
153 echo "error: unknown option for 'stash save': $1"
154 usage
155 ;;
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
156 *)
157 break
158 ;;
159 esac
7bedebc @szeder stash: introduce 'stash save --keep-index' option
szeder authored
160 shift
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
161 done
7bedebc @szeder stash: introduce 'stash save --keep-index' option
szeder authored
162
47629dc @gitster stash save: fix parameter handling
gitster authored
163 stash_msg="$*"
bc9e739 @gitster stash: implement "stash create"
gitster authored
164
1eff26c @gitster stash: refresh the index before deciding if the work tree is dirty
gitster authored
165 git update-index -q --refresh
bc9e739 @gitster stash: implement "stash create"
gitster authored
166 if no_changes
167 then
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
168 say 'No local changes to save'
bc9e739 @gitster stash: implement "stash create"
gitster authored
169 exit 0
170 fi
171 test -f "$GIT_DIR/logs/$ref_stash" ||
172 clear_stash || die "Cannot initialize stash"
173
174 create_stash "$stash_msg"
a9ee9bf git-stash: Fix listing stashes
Emil Medve authored
175
176 # Make sure the reflog for stash is kept.
177 : >>"$GIT_DIR/logs/$ref_stash"
f2c66ed Add git-stash script
しらいしななこ authored
178
9f62e18 @gitster git-stash: allow more descriptive reminder message when saving
gitster authored
179 git update-ref -m "$stash_msg" $ref_stash $w_commit ||
f2c66ed Add git-stash script
しらいしななこ authored
180 die "Cannot save the current status"
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
181 say Saved working directory and index state "$stash_msg"
7bedebc @szeder stash: introduce 'stash save --keep-index' option
szeder authored
182
dda1f2a @trast Implement 'git stash save --patch'
trast authored
183 if test -z "$patch_mode"
7bedebc @szeder stash: introduce 'stash save --keep-index' option
szeder authored
184 then
dda1f2a @trast Implement 'git stash save --patch'
trast authored
185 git reset --hard ${GIT_QUIET:+-q}
186
187 if test -n "$keep_index" && test -n $i_tree
188 then
189 git read-tree --reset -u $i_tree
190 fi
191 else
192 git apply -R < "$TMP-patch" ||
193 die "Cannot remove worktree changes"
194
195 if test -z "$keep_index"
196 then
197 git reset
198 fi
7bedebc @szeder stash: introduce 'stash save --keep-index' option
szeder authored
199 fi
f2c66ed Add git-stash script
しらいしななこ authored
200 }
201
401de40 @peff git-stash: don't complain when listing in a repo with no stash
peff authored
202 have_stash () {
0e32126 @gitster Revert "git-stash: use git rev-parse -q"
gitster authored
203 git rev-parse --verify $ref_stash >/dev/null 2>&1
401de40 @peff git-stash: don't complain when listing in a repo with no stash
peff authored
204 }
205
f2c66ed Add git-stash script
しらいしななこ authored
206 list_stash () {
401de40 @peff git-stash: don't complain when listing in a repo with no stash
peff authored
207 have_stash || return 0
391c53b @trast stash list: use new %g formats instead of sed
trast authored
208 git log --format="%gd: %gs" -g "$@" $ref_stash --
f2c66ed Add git-stash script
しらいしななこ authored
209 }
210
211 show_stash () {
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored
212 flags=$(git rev-parse --no-revs --flags "$@")
f2c66ed Add git-stash script
しらいしななこ authored
213 if test -z "$flags"
214 then
215 flags=--stat
216 fi
da65e7c git-stash.sh: don't default to refs/stash if invalid ref supplied
Brandon Casey authored
217
875471c git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
Brandon Casey authored
218 w_commit=$(git rev-parse --verify --default $ref_stash "$@") &&
219 b_commit=$(git rev-parse --verify "$w_commit^") &&
e7187e4 @spearce Paper bag fix diff invocation in 'git stash show'
spearce authored
220 git diff $flags $b_commit $w_commit
f2c66ed Add git-stash script
しらいしななこ authored
221 }
222
223 apply_stash () {
150937c @dscho Teach git-stash to "apply --index"
dscho authored
224 unstash_index=
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
225
226 while test $# != 0
227 do
228 case "$1" in
229 --index)
230 unstash_index=t
231 ;;
232 -q|--quiet)
233 GIT_QUIET=t
234 ;;
235 *)
236 break
237 ;;
238 esac
150937c @dscho Teach git-stash to "apply --index"
dscho authored
239 shift
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
240 done
150937c @dscho Teach git-stash to "apply --index"
dscho authored
241
5fd448f @salty-horse git stash: Give friendlier errors when there is nothing to apply
salty-horse authored
242 if test $# = 0
243 then
244 have_stash || die 'Nothing to apply'
245 fi
f2c66ed Add git-stash script
しらいしななこ authored
246
cbeaccc @gitster Fix git-stash apply --index
gitster authored
247 # stash records the work tree, and is a merge between the
248 # base commit (first parent) and the index tree (second parent).
5fd448f @salty-horse git stash: Give friendlier errors when there is nothing to apply
salty-horse authored
249 s=$(git rev-parse --quiet --verify --default $ref_stash "$@") &&
250 w_tree=$(git rev-parse --quiet --verify "$s:") &&
251 b_tree=$(git rev-parse --quiet --verify "$s^1:") &&
252 i_tree=$(git rev-parse --quiet --verify "$s^2:") ||
f2c66ed Add git-stash script
しらいしななこ authored
253 die "$*: no valid stashed state found"
254
5fd448f @salty-horse git stash: Give friendlier errors when there is nothing to apply
salty-horse authored
255 git update-index -q --refresh &&
256 git diff-files --quiet --ignore-submodules ||
257 die 'Cannot apply to a dirty working tree, please stage your changes'
258
259 # current index state
260 c_tree=$(git write-tree) ||
261 die 'Cannot apply a stash in the middle of a merge'
262
cbeaccc @gitster Fix git-stash apply --index
gitster authored
263 unstashed_index_tree=
7bedebc @szeder stash: introduce 'stash save --keep-index' option
szeder authored
264 if test -n "$unstash_index" && test "$b_tree" != "$i_tree" &&
265 test "$c_tree" != "$i_tree"
cbeaccc @gitster Fix git-stash apply --index
gitster authored
266 then
89d750b @spearce Avoid invoking diff drivers during git-stash
spearce authored
267 git diff-tree --binary $s^2^..$s^2 | git apply --cached
150937c @dscho Teach git-stash to "apply --index"
dscho authored
268 test $? -ne 0 &&
269 die 'Conflicts in index. Try without --index.'
5207079 git stash: modernize use of "dashed" git-XXX calls
Martin Koegler authored
270 unstashed_index_tree=$(git write-tree) ||
150937c @dscho Teach git-stash to "apply --index"
dscho authored
271 die 'Could not save index tree'
272 git reset
cbeaccc @gitster Fix git-stash apply --index
gitster authored
273 fi
150937c @dscho Teach git-stash to "apply --index"
dscho authored
274
f2c66ed Add git-stash script
しらいしななこ authored
275 eval "
276 GITHEAD_$w_tree='Stashed changes' &&
277 GITHEAD_$c_tree='Updated upstream' &&
278 GITHEAD_$b_tree='Version stash was based on' &&
279 export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
280 "
281
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
282 if test -n "$GIT_QUIET"
283 then
284 export GIT_MERGE_VERBOSITY=0
285 fi
5207079 git stash: modernize use of "dashed" git-XXX calls
Martin Koegler authored
286 if git merge-recursive $b_tree -- $c_tree $w_tree
f2c66ed Add git-stash script
しらいしななこ authored
287 then
288 # No conflict
cbeaccc @gitster Fix git-stash apply --index
gitster authored
289 if test -n "$unstashed_index_tree"
290 then
291 git read-tree "$unstashed_index_tree"
83b3df7 @gitster git-stash apply --index: optimize postprocessing
gitster authored
292 else
293 a="$TMP-added" &&
89d750b @spearce Avoid invoking diff drivers during git-stash
spearce authored
294 git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" &&
83b3df7 @gitster git-stash apply --index: optimize postprocessing
gitster authored
295 git read-tree --reset $c_tree &&
296 git update-index --add --stdin <"$a" ||
297 die "Cannot unstage modified files"
298 rm -f "$a"
cbeaccc @gitster Fix git-stash apply --index
gitster authored
299 fi
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
300 squelch=
301 if test -n "$GIT_QUIET"
302 then
303 squelch='>/dev/null 2>&1'
304 fi
305 eval "git status $squelch" || :
f2c66ed Add git-stash script
しらいしななこ authored
306 else
307 # Merge conflict; keep the exit status from merge-recursive
150937c @dscho Teach git-stash to "apply --index"
dscho authored
308 status=$?
cbeaccc @gitster Fix git-stash apply --index
gitster authored
309 if test -n "$unstash_index"
310 then
311 echo >&2 'Index was not unstashed.'
312 fi
150937c @dscho Teach git-stash to "apply --index"
dscho authored
313 exit $status
f2c66ed Add git-stash script
しらいしななこ authored
314 fi
315 }
316
e25d5f9 git-stash: add new 'drop' subcommand
Brandon Casey authored
317 drop_stash () {
318 have_stash || die 'No stash entries to drop'
319
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
320 while test $# != 0
321 do
322 case "$1" in
323 -q|--quiet)
324 GIT_QUIET=t
325 ;;
326 *)
327 break
328 ;;
329 esac
330 shift
331 done
332
e25d5f9 git-stash: add new 'drop' subcommand
Brandon Casey authored
333 if test $# = 0
334 then
335 set x "$ref_stash@{0}"
336 shift
337 fi
338 # Verify supplied argument looks like a stash entry
875471c git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
Brandon Casey authored
339 s=$(git rev-parse --verify "$@") &&
0e32126 @gitster Revert "git-stash: use git rev-parse -q"
gitster authored
340 git rev-parse --verify "$s:" > /dev/null 2>&1 &&
341 git rev-parse --verify "$s^1:" > /dev/null 2>&1 &&
342 git rev-parse --verify "$s^2:" > /dev/null 2>&1 ||
e25d5f9 git-stash: add new 'drop' subcommand
Brandon Casey authored
343 die "$*: not a valid stashed state"
344
345 git reflog delete --updateref --rewrite "$@" &&
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
346 say "Dropped $* ($s)" || die "$*: Could not drop stash entry"
e25d5f9 git-stash: add new 'drop' subcommand
Brandon Casey authored
347
348 # clear_stash if we just dropped the last stash entry
0e32126 @gitster Revert "git-stash: use git rev-parse -q"
gitster authored
349 git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash
e25d5f9 git-stash: add new 'drop' subcommand
Brandon Casey authored
350 }
351
656b503 @amenonsen Implement "git stash branch <newbranch> <stash>"
amenonsen authored
352 apply_to_branch () {
353 have_stash || die 'Nothing to apply'
354
355 test -n "$1" || die 'No branch name specified'
356 branch=$1
357
358 if test -z "$2"
359 then
360 set x "$ref_stash@{0}"
361 fi
362 stash=$2
363
5207079 git stash: modernize use of "dashed" git-XXX calls
Martin Koegler authored
364 git checkout -b $branch $stash^ &&
656b503 @amenonsen Implement "git stash branch <newbranch> <stash>"
amenonsen authored
365 apply_stash --index $stash &&
366 drop_stash $stash
367 }
368
3c2eb80 @moy stash: simplify defaulting to "save" and reject unknown options
moy authored
369 # The default command is "save" if nothing but options are given
370 seen_non_option=
371 for opt
372 do
373 case "$opt" in
374 -*) ;;
375 *) seen_non_option=t; break ;;
376 esac
377 done
378
379 test -n "$seen_non_option" || set "save" "$@"
380
f2c66ed Add git-stash script
しらいしななこ authored
381 # Main command set
382 case "$1" in
fcb10a9 @gitster git-stash: make "save" the default action again.
gitster authored
383 list)
384 shift
f2c66ed Add git-stash script
しらいしななこ authored
385 list_stash "$@"
386 ;;
387 show)
388 shift
389 show_stash "$@"
390 ;;
683befa @kevinlsk git-stash: Display help message if git-stash is run with wrong sub-co…
kevinlsk authored
391 save)
392 shift
47629dc @gitster stash save: fix parameter handling
gitster authored
393 save_stash "$@"
683befa @kevinlsk git-stash: Display help message if git-stash is run with wrong sub-co…
kevinlsk authored
394 ;;
f2c66ed Add git-stash script
しらいしななこ authored
395 apply)
396 shift
397 apply_stash "$@"
398 ;;
399 clear)
3023dc6 @gitster git-stash clear: refuse to work with extra parameter for now
gitster authored
400 shift
401 clear_stash "$@"
f2c66ed Add git-stash script
しらいしななこ authored
402 ;;
bc9e739 @gitster stash: implement "stash create"
gitster authored
403 create)
404 if test $# -gt 0 && test "$1" = create
405 then
406 shift
407 fi
408 create_stash "$*" && echo "$w_commit"
409 ;;
e25d5f9 git-stash: add new 'drop' subcommand
Brandon Casey authored
410 drop)
411 shift
412 drop_stash "$@"
413 ;;
bd56ff5 git-stash: add new 'pop' subcommand
Brandon Casey authored
414 pop)
415 shift
416 if apply_stash "$@"
417 then
418 test -z "$unstash_index" || shift
419 drop_stash "$@"
420 fi
421 ;;
656b503 @amenonsen Implement "git stash branch <newbranch> <stash>"
amenonsen authored
422 branch)
423 shift
424 apply_to_branch "$@"
425 ;;
f2c66ed Add git-stash script
しらいしななこ authored
426 *)
3c2eb80 @moy stash: simplify defaulting to "save" and reject unknown options
moy authored
427 case $# in
428 0)
97bc00a @wincent Emit helpful status for accidental "git stash" save
wincent authored
429 save_stash &&
fcdd0e9 @bebarino stash: teach quiet option
bebarino authored
430 say '(To restore them type "git stash apply")'
ea41cfc @dscho Make 'git stash -k' a short form for 'git stash save --keep-index'
dscho authored
431 ;;
432 *)
683befa @kevinlsk git-stash: Display help message if git-stash is run with wrong sub-co…
kevinlsk authored
433 usage
ea41cfc @dscho Make 'git stash -k' a short form for 'git stash save --keep-index'
dscho authored
434 esac
9f62e18 @gitster git-stash: allow more descriptive reminder message when saving
gitster authored
435 ;;
f2c66ed Add git-stash script
しらいしななこ authored
436 esac
Something went wrong with that request. Please try again.