зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
2f7ee089df
Коммит
97bc00a490
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче