author | Ori Avtalion <ori@avtalion.name> | |
Tue, 11 Aug 2009 11:12:13 +0000 (14:12 +0300) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 15 Aug 2009 02:48:45 +0000 (19:48 -0700) | ||
commit | 5fd448f1142c61da31b28c74d7d340938ab0e01d | |
tree | 3da959b86fb5aa56aa9940332c99a1114c824ead | tree | snapshot |
parent | 6ffd781226f04629eff63a684b47ad7555143312 | commit | diff |
git stash: Give friendlier errors when there is nothing to apply
The change makes sure a stash (given or default) exists before
checking if the working tree is dirty.
If the default stash is requested, the old message was scary and
included a 'fatal' error from rev-parse:
fatal: Needed a single revision
: no valid stashed state found
It is replaced with a friendlier 'Nothing to apply' error, similar to
'git stash branch'.
If a specific stash is specified, the 'Needed a single revision' errors
from rev-parse are suppressed.
Signed-off-by: Ori Avtalion <ori@avtalion.name>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The change makes sure a stash (given or default) exists before
checking if the working tree is dirty.
If the default stash is requested, the old message was scary and
included a 'fatal' error from rev-parse:
fatal: Needed a single revision
: no valid stashed state found
It is replaced with a friendlier 'Nothing to apply' error, similar to
'git stash branch'.
If a specific stash is specified, the 'Needed a single revision' errors
from rev-parse are suppressed.
Signed-off-by: Ori Avtalion <ori@avtalion.name>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-stash.sh | diff | blob | history |