mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-29 21:22:23 +02:00
Code

Emit helpful status for accidental "git stash" save

Browse Source 
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>
This commit is contained in:
Wincent Colaiuta 2007-12-22 18:31:25 +01:00 committed by Junio C Hamano
parent 2f7ee089df
commit 97bc00a490
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-stash.sh
View File

@ -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