2007-06-30 05:37:09 +00:00
|
|
|
#!/bin/sh
|
|
|
|
# Copyright (c) 2007, Nanako Shiraishi
|
|
|
|
|
2008-08-16 03:27:31 +00:00
|
|
|
dashless=$(basename "$0" | sed -e 's/-/ /')
|
|
|
|
USAGE="list [<options>]
|
2009-06-18 01:07:37 +00:00
|
|
|
or: $dashless show [<stash>]
|
|
|
|
or: $dashless drop [-q|--quiet] [<stash>]
|
|
|
|
or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
|
2008-08-16 03:27:31 +00:00
|
|
|
or: $dashless branch <branchname> [<stash>]
|
2011-06-25 00:56:06 +00:00
|
|
|
or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
|
|
|
|
[-u|--include-untracked] [-a|--all] [<message>]]
|
2008-08-16 03:27:31 +00:00
|
|
|
or: $dashless clear"
|
2007-06-30 05:37:09 +00:00
|
|
|
|
2007-07-06 19:57:47 +00:00
|
|
|
SUBDIRECTORY_OK=Yes
|
2007-11-06 09:50:02 +00:00
|
|
|
OPTIONS_SPEC=
|
2014-04-23 13:44:01 +00:00
|
|
|
START_DIR=$(pwd)
|
2007-06-30 05:37:09 +00:00
|
|
|
. git-sh-setup
|
2011-05-21 18:44:10 +00:00
|
|
|
. git-sh-i18n
|
2007-06-30 05:37:09 +00:00
|
|
|
require_work_tree
|
2007-07-25 22:32:22 +00:00
|
|
|
cd_to_toplevel
|
2007-06-30 05:37:09 +00:00
|
|
|
|
|
|
|
TMP="$GIT_DIR/.git-stash.$$"
|
2014-11-30 08:24:32 +00:00
|
|
|
TMPindex=${GIT_INDEX_FILE-"$(git rev-parse --git-path index)"}.stash.$$
|
2011-03-16 08:18:49 +00:00
|
|
|
trap 'rm -f "$TMP-"* "$TMPindex"' 0
|
2007-06-30 05:37:09 +00:00
|
|
|
|
|
|
|
ref_stash=refs/stash
|
|
|
|
|
2009-08-13 12:29:44 +00:00
|
|
|
if git config --get-colorbool color.interactive; then
|
|
|
|
help_color="$(git config --get-color color.interactive.help 'red bold')"
|
|
|
|
reset_color="$(git config --get-color '' reset)"
|
|
|
|
else
|
|
|
|
help_color=
|
|
|
|
reset_color=
|
|
|
|
fi
|
|
|
|
|
2007-06-30 05:37:09 +00:00
|
|
|
no_changes () {
|
2008-05-14 17:03:59 +00:00
|
|
|
git diff-index --quiet --cached HEAD --ignore-submodules -- &&
|
2011-06-25 00:56:06 +00:00
|
|
|
git diff-files --quiet --ignore-submodules &&
|
|
|
|
(test -z "$untracked" || test -z "$(untracked_files)")
|
|
|
|
}
|
|
|
|
|
|
|
|
untracked_files () {
|
|
|
|
excl_opt=--exclude-standard
|
|
|
|
test "$untracked" = "all" && excl_opt=
|
|
|
|
git ls-files -o -z $excl_opt
|
2007-06-30 05:37:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
clear_stash () {
|
2008-01-05 09:35:54 +00:00
|
|
|
if test $# != 0
|
|
|
|
then
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "git stash clear with parameters is unimplemented")"
|
2008-01-05 09:35:54 +00:00
|
|
|
fi
|
2014-09-16 03:24:10 +00:00
|
|
|
if current=$(git rev-parse --verify --quiet $ref_stash)
|
2007-07-27 06:24:28 +00:00
|
|
|
then
|
2007-11-07 21:10:27 +00:00
|
|
|
git update-ref -d $ref_stash $current
|
2007-07-27 06:24:28 +00:00
|
|
|
fi
|
2007-06-30 05:37:09 +00:00
|
|
|
}
|
|
|
|
|
2007-07-08 08:38:32 +00:00
|
|
|
create_stash () {
|
2007-07-05 05:46:09 +00:00
|
|
|
stash_msg="$1"
|
2011-06-25 00:56:06 +00:00
|
|
|
untracked="$2"
|
2007-07-05 05:46:09 +00:00
|
|
|
|
2008-09-04 09:41:22 +00:00
|
|
|
git update-index -q --refresh
|
2007-06-30 05:37:09 +00:00
|
|
|
if no_changes
|
|
|
|
then
|
|
|
|
exit 0
|
|
|
|
fi
|
2007-07-28 01:44:48 +00:00
|
|
|
|
2007-06-30 05:37:09 +00:00
|
|
|
# state of the base commit
|
2007-07-03 05:52:14 +00:00
|
|
|
if b_commit=$(git rev-parse --verify HEAD)
|
2007-06-30 05:37:09 +00:00
|
|
|
then
|
2010-04-08 19:42:37 +00:00
|
|
|
head=$(git rev-list --oneline -n 1 HEAD --)
|
2007-06-30 05:37:09 +00:00
|
|
|
else
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "You do not have the initial commit yet")"
|
2007-06-30 05:37:09 +00:00
|
|
|
fi
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
if branch=$(git symbolic-ref -q HEAD)
|
2007-06-30 05:37:09 +00:00
|
|
|
then
|
|
|
|
branch=${branch#refs/heads/}
|
|
|
|
else
|
|
|
|
branch='(no branch)'
|
|
|
|
fi
|
|
|
|
msg=$(printf '%s: %s' "$branch" "$head")
|
|
|
|
|
|
|
|
# state of the index
|
2007-07-03 05:52:14 +00:00
|
|
|
i_tree=$(git write-tree) &&
|
2007-09-12 18:45:03 +00:00
|
|
|
i_commit=$(printf 'index on %s\n' "$msg" |
|
2007-07-03 05:52:14 +00:00
|
|
|
git commit-tree $i_tree -p $b_commit) ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Cannot save the current index state")"
|
2007-06-30 05:37:09 +00:00
|
|
|
|
2011-06-25 00:56:06 +00:00
|
|
|
if test -n "$untracked"
|
|
|
|
then
|
|
|
|
# Untracked files are stored by themselves in a parentless commit, for
|
|
|
|
# ease of unpacking later.
|
|
|
|
u_commit=$(
|
|
|
|
untracked_files | (
|
2014-05-23 10:15:31 +00:00
|
|
|
GIT_INDEX_FILE="$TMPindex" &&
|
|
|
|
export GIT_INDEX_FILE &&
|
2011-06-25 00:56:06 +00:00
|
|
|
rm -f "$TMPindex" &&
|
|
|
|
git update-index -z --add --remove --stdin &&
|
|
|
|
u_tree=$(git write-tree) &&
|
|
|
|
printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree &&
|
|
|
|
rm -f "$TMPindex"
|
|
|
|
) ) || die "Cannot save the untracked files"
|
|
|
|
|
|
|
|
untracked_commit_option="-p $u_commit";
|
|
|
|
else
|
|
|
|
untracked_commit_option=
|
|
|
|
fi
|
|
|
|
|
2009-08-13 12:29:44 +00:00
|
|
|
if test -z "$patch_mode"
|
|
|
|
then
|
|
|
|
|
|
|
|
# state of the working tree
|
|
|
|
w_tree=$( (
|
2011-03-16 08:18:49 +00:00
|
|
|
git read-tree --index-output="$TMPindex" -m $i_tree &&
|
|
|
|
GIT_INDEX_FILE="$TMPindex" &&
|
2009-08-13 12:29:44 +00:00
|
|
|
export GIT_INDEX_FILE &&
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 00:14:01 +00:00
|
|
|
git diff --name-only -z HEAD -- >"$TMP-stagenames" &&
|
|
|
|
git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
|
2009-08-13 12:29:44 +00:00
|
|
|
git write-tree &&
|
2011-03-16 08:18:49 +00:00
|
|
|
rm -f "$TMPindex"
|
2009-08-13 12:29:44 +00:00
|
|
|
) ) ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Cannot save the current worktree state")"
|
2009-08-13 12:29:44 +00:00
|
|
|
|
|
|
|
else
|
|
|
|
|
2007-07-08 08:28:18 +00:00
|
|
|
rm -f "$TMP-index" &&
|
2009-08-13 12:29:44 +00:00
|
|
|
GIT_INDEX_FILE="$TMP-index" git read-tree HEAD &&
|
|
|
|
|
|
|
|
# find out what the user wants
|
|
|
|
GIT_INDEX_FILE="$TMP-index" \
|
|
|
|
git add--interactive --patch=stash -- &&
|
|
|
|
|
|
|
|
# state of the working tree
|
|
|
|
w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Cannot save the current worktree state")"
|
2007-06-30 05:37:09 +00:00
|
|
|
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 00:14:01 +00:00
|
|
|
git diff-tree -p HEAD $w_tree -- >"$TMP-patch" &&
|
2009-08-13 12:29:44 +00:00
|
|
|
test -s "$TMP-patch" ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "No changes selected")"
|
2009-08-13 12:29:44 +00:00
|
|
|
|
|
|
|
rm -f "$TMP-index" ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Cannot remove temporary index (can't happen)")"
|
2009-08-13 12:29:44 +00:00
|
|
|
|
|
|
|
fi
|
|
|
|
|
2007-06-30 05:37:09 +00:00
|
|
|
# create the stash
|
2007-07-05 05:46:09 +00:00
|
|
|
if test -z "$stash_msg"
|
|
|
|
then
|
|
|
|
stash_msg=$(printf 'WIP on %s' "$msg")
|
|
|
|
else
|
|
|
|
stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg")
|
|
|
|
fi
|
|
|
|
w_commit=$(printf '%s\n' "$stash_msg" |
|
2011-07-22 21:46:28 +00:00
|
|
|
git commit-tree $w_tree -p $b_commit -p $i_commit $untracked_commit_option) ||
|
|
|
|
die "$(gettext "Cannot record working tree state")"
|
2007-07-08 08:38:32 +00:00
|
|
|
}
|
2007-06-30 05:37:09 +00:00
|
|
|
|
2013-06-15 13:13:25 +00:00
|
|
|
store_stash () {
|
|
|
|
while test $# != 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-m|--message)
|
|
|
|
shift
|
|
|
|
stash_msg="$1"
|
|
|
|
;;
|
|
|
|
-q|--quiet)
|
|
|
|
quiet=t
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
test $# = 1 ||
|
|
|
|
die "$(eval_gettext "\"$dashless store\" requires one <commit> argument")"
|
|
|
|
|
|
|
|
w_commit="$1"
|
|
|
|
if test -z "$stash_msg"
|
|
|
|
then
|
|
|
|
stash_msg="Created via \"git stash store\"."
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Make sure the reflog for stash is kept.
|
2014-11-30 08:24:39 +00:00
|
|
|
: >>"$(git rev-parse --git-path logs/$ref_stash)"
|
2013-06-15 13:13:25 +00:00
|
|
|
git update-ref -m "$stash_msg" $ref_stash $w_commit
|
|
|
|
ret=$?
|
|
|
|
test $ret != 0 && test -z $quiet &&
|
|
|
|
die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")"
|
|
|
|
return $ret
|
|
|
|
}
|
|
|
|
|
2007-07-08 08:38:32 +00:00
|
|
|
save_stash () {
|
2008-06-27 14:37:15 +00:00
|
|
|
keep_index=
|
2009-08-13 12:29:44 +00:00
|
|
|
patch_mode=
|
2011-06-25 00:56:06 +00:00
|
|
|
untracked=
|
2009-06-18 01:07:37 +00:00
|
|
|
while test $# != 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
2009-07-27 18:37:10 +00:00
|
|
|
-k|--keep-index)
|
2009-06-18 01:07:37 +00:00
|
|
|
keep_index=t
|
|
|
|
;;
|
2009-08-13 12:29:44 +00:00
|
|
|
--no-keep-index)
|
2011-04-07 17:04:20 +00:00
|
|
|
keep_index=n
|
2009-08-13 12:29:44 +00:00
|
|
|
;;
|
|
|
|
-p|--patch)
|
|
|
|
patch_mode=t
|
2011-04-07 17:04:20 +00:00
|
|
|
# only default to keep if we don't already have an override
|
|
|
|
test -z "$keep_index" && keep_index=t
|
2009-06-18 01:07:37 +00:00
|
|
|
;;
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=t
|
|
|
|
;;
|
2011-06-25 00:56:06 +00:00
|
|
|
-u|--include-untracked)
|
|
|
|
untracked=untracked
|
|
|
|
;;
|
|
|
|
-a|--all)
|
|
|
|
untracked=all
|
|
|
|
;;
|
2009-08-18 21:38:40 +00:00
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
2011-05-21 18:44:17 +00:00
|
|
|
option="$1"
|
|
|
|
# TRANSLATORS: $option is an invalid option, like
|
|
|
|
# `--blah-blah'. The 7 spaces at the beginning of the
|
|
|
|
# second line correspond to "error: ". So you should line
|
|
|
|
# up the second line with however many characters the
|
|
|
|
# translation of "error: " takes in your language. E.g. in
|
|
|
|
# English this is:
|
|
|
|
#
|
|
|
|
# $ git stash save --blah-blah 2>&1 | head -n 2
|
|
|
|
# error: unknown option for 'stash save': --blah-blah
|
|
|
|
# To provide a message, use git stash save -- '--blah-blah'
|
2012-04-14 12:37:29 +00:00
|
|
|
eval_gettextln "error: unknown option for 'stash save': \$option
|
|
|
|
To provide a message, use git stash save -- '\$option'"
|
2009-08-18 21:38:40 +00:00
|
|
|
usage
|
|
|
|
;;
|
2009-06-18 01:07:37 +00:00
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
2008-06-27 14:37:15 +00:00
|
|
|
shift
|
2009-06-18 01:07:37 +00:00
|
|
|
done
|
2008-06-27 14:37:15 +00:00
|
|
|
|
2011-06-25 00:56:06 +00:00
|
|
|
if test -n "$patch_mode" && test -n "$untracked"
|
|
|
|
then
|
2011-08-27 00:59:25 +00:00
|
|
|
die "Can't use --patch and --include-untracked or --all at the same time"
|
2011-06-25 00:56:06 +00:00
|
|
|
fi
|
|
|
|
|
2008-07-23 20:33:44 +00:00
|
|
|
stash_msg="$*"
|
2007-07-08 08:38:32 +00:00
|
|
|
|
2008-09-04 09:41:22 +00:00
|
|
|
git update-index -q --refresh
|
2007-07-08 08:38:32 +00:00
|
|
|
if no_changes
|
|
|
|
then
|
2011-05-21 18:44:12 +00:00
|
|
|
say "$(gettext "No local changes to save")"
|
2007-07-08 08:38:32 +00:00
|
|
|
exit 0
|
|
|
|
fi
|
2014-11-30 08:24:39 +00:00
|
|
|
test -f "$(git rev-parse --git-path logs/$ref_stash)" ||
|
2011-05-21 18:44:13 +00:00
|
|
|
clear_stash || die "$(gettext "Cannot initialize stash")"
|
2007-07-08 08:38:32 +00:00
|
|
|
|
2011-06-25 00:56:06 +00:00
|
|
|
create_stash "$stash_msg" $untracked
|
2013-06-15 13:13:25 +00:00
|
|
|
store_stash -m "$stash_msg" -q $w_commit ||
|
|
|
|
die "$(gettext "Cannot save the current status")"
|
2009-06-18 01:07:37 +00:00
|
|
|
say Saved working directory and index state "$stash_msg"
|
2008-06-27 14:37:15 +00:00
|
|
|
|
2009-08-13 12:29:44 +00:00
|
|
|
if test -z "$patch_mode"
|
2008-06-27 14:37:15 +00:00
|
|
|
then
|
2009-08-13 12:29:44 +00:00
|
|
|
git reset --hard ${GIT_QUIET:+-q}
|
2011-06-25 00:56:06 +00:00
|
|
|
test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
|
|
|
|
if test -n "$untracked"
|
|
|
|
then
|
2011-08-27 00:59:27 +00:00
|
|
|
git clean --force --quiet -d $CLEAN_X_OPTION
|
2011-06-25 00:56:06 +00:00
|
|
|
fi
|
2009-08-13 12:29:44 +00:00
|
|
|
|
2011-04-07 17:04:20 +00:00
|
|
|
if test "$keep_index" = "t" && test -n $i_tree
|
2009-08-13 12:29:44 +00:00
|
|
|
then
|
|
|
|
git read-tree --reset -u $i_tree
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
git apply -R < "$TMP-patch" ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Cannot remove worktree changes")"
|
2009-08-13 12:29:44 +00:00
|
|
|
|
2011-04-07 17:04:20 +00:00
|
|
|
if test "$keep_index" != "t"
|
2009-08-13 12:29:44 +00:00
|
|
|
then
|
|
|
|
git reset
|
|
|
|
fi
|
2008-06-27 14:37:15 +00:00
|
|
|
fi
|
2007-06-30 05:37:09 +00:00
|
|
|
}
|
|
|
|
|
2007-07-02 04:21:24 +00:00
|
|
|
have_stash () {
|
2014-09-16 03:24:10 +00:00
|
|
|
git rev-parse --verify --quiet $ref_stash >/dev/null
|
2007-07-02 04:21:24 +00:00
|
|
|
}
|
|
|
|
|
2007-06-30 05:37:09 +00:00
|
|
|
list_stash () {
|
2007-07-02 04:21:24 +00:00
|
|
|
have_stash || return 0
|
stash: default listing to working-tree diff
When you list stashes, you can provide arbitrary git-log
options to change the display. However, adding just "-p"
does nothing, because each stash is actually a merge commit.
This implementation detail is easy to forget, leading to
confused users who think "-p" is not working. We can make
this easier by defaulting to "--first-parent -m", which will
show the diff against the working tree. This omits the
index portion of the stash entirely, but it's simple and it
matches what "git stash show" provides.
People who are more clueful about stash's true form can use
"--cc" to override the "-m", and the "--first-parent" will
then do nothing. For diffs, it only affects non-combined
diffs, so "--cc" overrides it. And for the traversal, we are
walking the linear reflog anyway, so we do not even care
about the parents.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-06 18:35:25 +00:00
|
|
|
git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash --
|
2007-06-30 05:37:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
show_stash () {
|
2010-08-21 04:09:02 +00:00
|
|
|
assert_stash_like "$@"
|
2010-03-16 17:52:37 +00:00
|
|
|
|
2010-08-21 04:09:02 +00:00
|
|
|
git diff ${FLAGS:---stat} $b_commit $w_commit
|
2007-06-30 05:37:09 +00:00
|
|
|
}
|
|
|
|
|
2010-08-21 04:46:22 +00:00
|
|
|
#
|
|
|
|
# Parses the remaining options looking for flags and
|
|
|
|
# at most one revision defaulting to ${ref_stash}@{0}
|
|
|
|
# if none found.
|
|
|
|
#
|
|
|
|
# Derives related tree and commit objects from the
|
|
|
|
# revision, if one is found.
|
|
|
|
#
|
|
|
|
# stash records the work tree, and is a merge between the
|
|
|
|
# base commit (first parent) and the index tree (second parent).
|
|
|
|
#
|
|
|
|
# REV is set to the symbolic version of the specified stash-like commit
|
|
|
|
# IS_STASH_LIKE is non-blank if ${REV} looks like a stash
|
|
|
|
# IS_STASH_REF is non-blank if the ${REV} looks like a stash ref
|
|
|
|
# s is set to the SHA1 of the stash commit
|
|
|
|
# w_commit is set to the commit containing the working tree
|
|
|
|
# b_commit is set to the base commit
|
|
|
|
# i_commit is set to the commit containing the index tree
|
2011-06-25 00:56:06 +00:00
|
|
|
# u_commit is set to the commit containing the untracked files tree
|
2010-08-21 04:46:22 +00:00
|
|
|
# w_tree is set to the working tree
|
|
|
|
# b_tree is set to the base tree
|
|
|
|
# i_tree is set to the index tree
|
2011-06-25 00:56:06 +00:00
|
|
|
# u_tree is set to the untracked files tree
|
2010-08-21 04:46:22 +00:00
|
|
|
#
|
|
|
|
# GIT_QUIET is set to t if -q is specified
|
|
|
|
# INDEX_OPTION is set to --index if --index is specified.
|
|
|
|
# FLAGS is set to the remaining flags
|
|
|
|
#
|
|
|
|
# dies if:
|
|
|
|
# * too many revisions specified
|
|
|
|
# * no revision is specified and there is no stash stack
|
|
|
|
# * a revision is specified which cannot be resolve to a SHA1
|
|
|
|
# * a non-existent stash reference is specified
|
|
|
|
#
|
|
|
|
|
|
|
|
parse_flags_and_rev()
|
|
|
|
{
|
|
|
|
test "$PARSE_CACHE" = "$*" && return 0 # optimisation
|
|
|
|
PARSE_CACHE="$*"
|
|
|
|
|
|
|
|
IS_STASH_LIKE=
|
|
|
|
IS_STASH_REF=
|
|
|
|
INDEX_OPTION=
|
|
|
|
s=
|
|
|
|
w_commit=
|
|
|
|
b_commit=
|
|
|
|
i_commit=
|
2011-06-25 00:56:06 +00:00
|
|
|
u_commit=
|
2010-08-21 04:46:22 +00:00
|
|
|
w_tree=
|
|
|
|
b_tree=
|
|
|
|
i_tree=
|
2011-06-25 00:56:06 +00:00
|
|
|
u_tree=
|
2010-08-21 04:46:22 +00:00
|
|
|
|
2014-01-07 08:22:15 +00:00
|
|
|
REV=$(git rev-parse --no-flags --symbolic --sq "$@") || exit 1
|
2010-08-21 04:46:22 +00:00
|
|
|
|
|
|
|
FLAGS=
|
2010-09-27 15:32:45 +00:00
|
|
|
for opt
|
2010-08-21 04:46:22 +00:00
|
|
|
do
|
2010-09-27 15:32:45 +00:00
|
|
|
case "$opt" in
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=-t
|
|
|
|
;;
|
2010-08-21 04:46:22 +00:00
|
|
|
--index)
|
|
|
|
INDEX_OPTION=--index
|
|
|
|
;;
|
2010-09-27 15:32:45 +00:00
|
|
|
-*)
|
|
|
|
FLAGS="${FLAGS}${FLAGS:+ }$opt"
|
2010-08-21 04:46:22 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2014-01-07 08:22:15 +00:00
|
|
|
eval set -- $REV
|
2010-08-21 04:46:22 +00:00
|
|
|
|
|
|
|
case $# in
|
|
|
|
0)
|
2011-05-21 18:44:13 +00:00
|
|
|
have_stash || die "$(gettext "No stash found.")"
|
2010-08-21 04:46:22 +00:00
|
|
|
set -- ${ref_stash}@{0}
|
|
|
|
;;
|
|
|
|
1)
|
|
|
|
:
|
|
|
|
;;
|
|
|
|
*)
|
2011-05-21 18:44:14 +00:00
|
|
|
die "$(eval_gettext "Too many revisions specified: \$REV")"
|
2010-08-21 04:46:22 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2014-09-16 03:24:10 +00:00
|
|
|
REV=$(git rev-parse --symbolic --verify --quiet "$1") || {
|
2011-05-21 18:44:16 +00:00
|
|
|
reference="$1"
|
2014-08-30 19:56:01 +00:00
|
|
|
die "$(eval_gettext "\$reference is not a valid reference")"
|
2011-05-21 18:44:16 +00:00
|
|
|
}
|
2010-08-21 04:46:22 +00:00
|
|
|
|
2014-09-16 03:24:10 +00:00
|
|
|
i_commit=$(git rev-parse --verify --quiet "$REV^2") &&
|
2014-01-07 08:22:15 +00:00
|
|
|
set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
|
2010-08-21 04:46:22 +00:00
|
|
|
s=$1 &&
|
|
|
|
w_commit=$1 &&
|
|
|
|
b_commit=$2 &&
|
|
|
|
w_tree=$3 &&
|
|
|
|
b_tree=$4 &&
|
|
|
|
i_tree=$5 &&
|
|
|
|
IS_STASH_LIKE=t &&
|
|
|
|
test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
|
|
|
|
IS_STASH_REF=t
|
2011-06-25 00:56:06 +00:00
|
|
|
|
2014-09-16 03:24:10 +00:00
|
|
|
u_commit=$(git rev-parse --verify --quiet "$REV^3") &&
|
2014-01-07 08:22:15 +00:00
|
|
|
u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
|
2010-08-21 04:46:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
is_stash_like()
|
|
|
|
{
|
|
|
|
parse_flags_and_rev "$@"
|
|
|
|
test -n "$IS_STASH_LIKE"
|
|
|
|
}
|
|
|
|
|
|
|
|
assert_stash_like() {
|
2011-05-21 18:44:15 +00:00
|
|
|
is_stash_like "$@" || {
|
|
|
|
args="$*"
|
|
|
|
die "$(eval_gettext "'\$args' is not a stash-like commit")"
|
|
|
|
}
|
2010-08-21 04:46:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
is_stash_ref() {
|
|
|
|
is_stash_like "$@" && test -n "$IS_STASH_REF"
|
|
|
|
}
|
|
|
|
|
|
|
|
assert_stash_ref() {
|
2011-05-21 18:44:15 +00:00
|
|
|
is_stash_ref "$@" || {
|
|
|
|
args="$*"
|
|
|
|
die "$(eval_gettext "'\$args' is not a stash reference")"
|
|
|
|
}
|
2010-08-21 04:46:22 +00:00
|
|
|
}
|
|
|
|
|
2007-06-30 05:37:09 +00:00
|
|
|
apply_stash () {
|
2009-06-18 01:07:37 +00:00
|
|
|
|
2010-08-21 04:08:58 +00:00
|
|
|
assert_stash_like "$@"
|
2007-06-30 05:37:09 +00:00
|
|
|
|
2011-05-21 18:44:13 +00:00
|
|
|
git update-index -q --refresh || die "$(gettext "unable to refresh index")"
|
2015-04-22 19:31:02 +00:00
|
|
|
git diff-index --cached --quiet --ignore-submodules HEAD -- ||
|
|
|
|
die "$(gettext "Cannot apply stash: Your index contains uncommitted changes.")"
|
2009-08-11 11:12:13 +00:00
|
|
|
|
|
|
|
# current index state
|
|
|
|
c_tree=$(git write-tree) ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Cannot apply a stash in the middle of a merge")"
|
2009-08-11 11:12:13 +00:00
|
|
|
|
2007-07-28 06:41:31 +00:00
|
|
|
unstashed_index_tree=
|
2010-08-21 04:08:58 +00:00
|
|
|
if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" &&
|
2008-06-27 14:37:15 +00:00
|
|
|
test "$c_tree" != "$i_tree"
|
2007-07-28 06:41:31 +00:00
|
|
|
then
|
2007-10-19 01:28:43 +00:00
|
|
|
git diff-tree --binary $s^2^..$s^2 | git apply --cached
|
2007-07-02 11:14:49 +00:00
|
|
|
test $? -ne 0 &&
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Conflicts in index. Try without --index.")"
|
2009-07-22 05:30:58 +00:00
|
|
|
unstashed_index_tree=$(git write-tree) ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Could not save index tree")"
|
2007-07-02 11:14:49 +00:00
|
|
|
git reset
|
2007-07-28 06:41:31 +00:00
|
|
|
fi
|
2007-07-02 11:14:49 +00:00
|
|
|
|
2011-06-25 00:56:06 +00:00
|
|
|
if test -n "$u_tree"
|
|
|
|
then
|
|
|
|
GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
|
|
|
|
GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
|
|
|
|
rm -f "$TMPindex" ||
|
|
|
|
die 'Could not restore untracked files from stash'
|
|
|
|
fi
|
|
|
|
|
2007-06-30 05:37:09 +00:00
|
|
|
eval "
|
|
|
|
GITHEAD_$w_tree='Stashed changes' &&
|
|
|
|
GITHEAD_$c_tree='Updated upstream' &&
|
|
|
|
GITHEAD_$b_tree='Version stash was based on' &&
|
|
|
|
export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
|
|
|
|
"
|
|
|
|
|
2009-06-18 01:07:37 +00:00
|
|
|
if test -n "$GIT_QUIET"
|
|
|
|
then
|
2010-10-13 18:36:36 +00:00
|
|
|
GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
|
2009-06-18 01:07:37 +00:00
|
|
|
fi
|
2009-07-22 05:30:58 +00:00
|
|
|
if git merge-recursive $b_tree -- $c_tree $w_tree
|
2007-06-30 05:37:09 +00:00
|
|
|
then
|
|
|
|
# No conflict
|
2007-07-28 06:41:31 +00:00
|
|
|
if test -n "$unstashed_index_tree"
|
|
|
|
then
|
|
|
|
git read-tree "$unstashed_index_tree"
|
2007-07-28 06:51:45 +00:00
|
|
|
else
|
|
|
|
a="$TMP-added" &&
|
2007-10-19 01:28:43 +00:00
|
|
|
git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" &&
|
2007-07-28 06:51:45 +00:00
|
|
|
git read-tree --reset $c_tree &&
|
|
|
|
git update-index --add --stdin <"$a" ||
|
2011-05-21 18:44:13 +00:00
|
|
|
die "$(gettext "Cannot unstage modified files")"
|
2007-07-28 06:51:45 +00:00
|
|
|
rm -f "$a"
|
2007-07-28 06:41:31 +00:00
|
|
|
fi
|
2009-06-18 01:07:37 +00:00
|
|
|
squelch=
|
|
|
|
if test -n "$GIT_QUIET"
|
|
|
|
then
|
|
|
|
squelch='>/dev/null 2>&1'
|
|
|
|
fi
|
2011-03-12 08:57:46 +00:00
|
|
|
(cd "$START_DIR" && eval "git status $squelch") || :
|
2007-06-30 05:37:09 +00:00
|
|
|
else
|
|
|
|
# Merge conflict; keep the exit status from merge-recursive
|
2007-07-02 11:14:49 +00:00
|
|
|
status=$?
|
2012-07-10 22:52:28 +00:00
|
|
|
git rerere
|
2010-08-21 04:08:58 +00:00
|
|
|
if test -n "$INDEX_OPTION"
|
2007-07-28 06:41:31 +00:00
|
|
|
then
|
2011-08-07 11:58:16 +00:00
|
|
|
gettextln "Index was not unstashed." >&2
|
2007-07-28 06:41:31 +00:00
|
|
|
fi
|
2007-07-02 11:14:49 +00:00
|
|
|
exit $status
|
2007-06-30 05:37:09 +00:00
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2010-08-21 04:09:00 +00:00
|
|
|
pop_stash() {
|
|
|
|
assert_stash_ref "$@"
|
|
|
|
|
2014-02-26 22:18:54 +00:00
|
|
|
if apply_stash "$@"
|
|
|
|
then
|
|
|
|
drop_stash "$@"
|
|
|
|
else
|
|
|
|
status=$?
|
|
|
|
say "The stash is kept in case you need it again."
|
|
|
|
exit $status
|
|
|
|
fi
|
2010-08-21 04:09:00 +00:00
|
|
|
}
|
|
|
|
|
2008-02-22 19:04:54 +00:00
|
|
|
drop_stash () {
|
2010-08-21 04:08:59 +00:00
|
|
|
assert_stash_ref "$@"
|
2008-02-22 19:04:54 +00:00
|
|
|
|
2010-08-21 04:08:59 +00:00
|
|
|
git reflog delete --updateref --rewrite "${REV}" &&
|
2011-05-21 18:44:18 +00:00
|
|
|
say "$(eval_gettext "Dropped \${REV} (\$s)")" ||
|
|
|
|
die "$(eval_gettext "\${REV}: Could not drop stash entry")"
|
2008-02-22 19:04:54 +00:00
|
|
|
|
|
|
|
# clear_stash if we just dropped the last stash entry
|
2014-09-16 03:24:10 +00:00
|
|
|
git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null ||
|
|
|
|
clear_stash
|
2008-02-22 19:04:54 +00:00
|
|
|
}
|
|
|
|
|
2008-07-03 06:16:05 +00:00
|
|
|
apply_to_branch () {
|
2011-05-21 18:44:13 +00:00
|
|
|
test -n "$1" || die "$(gettext "No branch name specified")"
|
2008-07-03 06:16:05 +00:00
|
|
|
branch=$1
|
2010-08-21 04:09:01 +00:00
|
|
|
shift 1
|
2008-07-03 06:16:05 +00:00
|
|
|
|
2010-08-21 04:09:01 +00:00
|
|
|
set -- --index "$@"
|
|
|
|
assert_stash_like "$@"
|
|
|
|
|
|
|
|
git checkout -b $branch $REV^ &&
|
2010-09-28 13:19:52 +00:00
|
|
|
apply_stash "$@" && {
|
|
|
|
test -z "$IS_STASH_REF" || drop_stash "$@"
|
|
|
|
}
|
2008-07-03 06:16:05 +00:00
|
|
|
}
|
|
|
|
|
2010-08-21 04:46:22 +00:00
|
|
|
PARSE_CACHE='--not-parsed'
|
2009-08-18 21:38:40 +00:00
|
|
|
# The default command is "save" if nothing but options are given
|
|
|
|
seen_non_option=
|
|
|
|
for opt
|
|
|
|
do
|
|
|
|
case "$opt" in
|
|
|
|
-*) ;;
|
|
|
|
*) seen_non_option=t; break ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
test -n "$seen_non_option" || set "save" "$@"
|
|
|
|
|
2007-06-30 05:37:09 +00:00
|
|
|
# Main command set
|
|
|
|
case "$1" in
|
2007-07-03 06:15:45 +00:00
|
|
|
list)
|
|
|
|
shift
|
2007-06-30 05:37:09 +00:00
|
|
|
list_stash "$@"
|
|
|
|
;;
|
|
|
|
show)
|
|
|
|
shift
|
|
|
|
show_stash "$@"
|
|
|
|
;;
|
2007-12-03 02:34:05 +00:00
|
|
|
save)
|
|
|
|
shift
|
2008-07-23 20:33:44 +00:00
|
|
|
save_stash "$@"
|
2007-12-03 02:34:05 +00:00
|
|
|
;;
|
2007-06-30 05:37:09 +00:00
|
|
|
apply)
|
|
|
|
shift
|
|
|
|
apply_stash "$@"
|
|
|
|
;;
|
|
|
|
clear)
|
2008-01-05 09:35:54 +00:00
|
|
|
shift
|
|
|
|
clear_stash "$@"
|
2007-06-30 05:37:09 +00:00
|
|
|
;;
|
2007-07-08 08:38:32 +00:00
|
|
|
create)
|
2013-06-15 13:13:24 +00:00
|
|
|
shift
|
2007-07-08 08:38:32 +00:00
|
|
|
create_stash "$*" && echo "$w_commit"
|
|
|
|
;;
|
2013-06-15 13:13:25 +00:00
|
|
|
store)
|
|
|
|
shift
|
|
|
|
store_stash "$@"
|
|
|
|
;;
|
2008-02-22 19:04:54 +00:00
|
|
|
drop)
|
|
|
|
shift
|
|
|
|
drop_stash "$@"
|
|
|
|
;;
|
2008-02-22 22:52:50 +00:00
|
|
|
pop)
|
|
|
|
shift
|
2010-08-21 04:09:00 +00:00
|
|
|
pop_stash "$@"
|
2008-02-22 22:52:50 +00:00
|
|
|
;;
|
2008-07-03 06:16:05 +00:00
|
|
|
branch)
|
|
|
|
shift
|
|
|
|
apply_to_branch "$@"
|
|
|
|
;;
|
2007-06-30 05:37:09 +00:00
|
|
|
*)
|
2009-08-18 21:38:40 +00:00
|
|
|
case $# in
|
|
|
|
0)
|
2007-12-22 17:31:25 +00:00
|
|
|
save_stash &&
|
2011-05-21 18:44:12 +00:00
|
|
|
say "$(gettext "(To restore them type \"git stash apply\")")"
|
2009-07-27 18:37:10 +00:00
|
|
|
;;
|
|
|
|
*)
|
2007-12-03 02:34:05 +00:00
|
|
|
usage
|
2009-07-27 18:37:10 +00:00
|
|
|
esac
|
2007-07-05 05:46:09 +00:00
|
|
|
;;
|
2007-06-30 05:37:09 +00:00
|
|
|
esac
|