summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-12-22 17:31:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-22 19:15:22 (GMT)
commit97bc00a4909fb73eba8a05dc89fe7914d7123245 (patch)
tree85cf7189e3fbccff61c93970be542f05054b84f7 /git-stash.sh
parent2f7ee089dff6e9225dbfca2bdd23efe93e1c0740 (diff)
downloadgit-97bc00a4909fb73eba8a05dc89fe7914d7123245.zip
git-97bc00a4909fb73eba8a05dc89fe7914d7123245.tar.gz
git-97bc00a4909fb73eba8a05dc89fe7914d7123245.tar.bz2
Emit helpful status for accidental "git stash" save
If the user types "git stash" mistakenly thinking that this will list their stashes he/she may be surprised to see that it actually saved a new stash and reset their working tree and index. In the worst case they might not know how to recover the state. So help them by telling them exactly what was saved and also how to restore it immediately. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh
index f16fd9c..06cb177 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -99,7 +99,7 @@ save_stash () {
git update-ref -m "$stash_msg" $ref_stash $w_commit ||
die "Cannot save the current status"
- printf >&2 'Saved "%s"\n' "$stash_msg"
+ printf >&2 'Saved working directory and index state "%s"\n' "$stash_msg"
}
have_stash () {
@@ -228,7 +228,9 @@ create)
*)
if test $# -eq 0
then
- save_stash && git-reset --hard
+ save_stash &&
+ echo >&2 '(To restore them type "git stash apply")' &&
+ git-reset --hard
else
usage
fi