diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:42 (GMT) |
| commit | fcbf164fcbf4110c7e2f96356d6707d56ba44ba4 (patch) | |
| tree | 990a0d029b85047a72b54bcc7846acccd7b6bb9d /git-stash.sh | |
| parent | 29dba37f1f3d7d692b3994ccda4a5ea705c7f252 (diff) | |
| parent | 9355fc9c35a5c40bbd8e380ec9e36013a1b230ed (diff) | |
| download | git-fcbf164fcbf4110c7e2f96356d6707d56ba44ba4.zip git-fcbf164fcbf4110c7e2f96356d6707d56ba44ba4.tar.gz git-fcbf164fcbf4110c7e2f96356d6707d56ba44ba4.tar.bz2 | |
Merge branch 'jk/maint-stash-oob'
* jk/maint-stash-oob:
stash: fix false positive in the invalid ref test.
stash: fix accidental apply of non-existent stashes
Conflicts:
t/t3903-stash.sh
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/git-stash.sh b/git-stash.sh index fbd4bc1..07ac323 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -264,7 +264,7 @@ parse_flags_and_rev() b_tree= i_tree= - REV=$(git rev-parse --no-flags --symbolic "$@" 2>/dev/null) + REV=$(git rev-parse --no-flags --symbolic "$@") || exit 1 FLAGS= for opt @@ -310,16 +310,6 @@ parse_flags_and_rev() IS_STASH_LIKE=t && test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" && IS_STASH_REF=t - - if test "${REV}" != "${REV%{*\}}" - then - # maintainers: it would be better if git rev-parse indicated - # this condition with a non-zero status code but as of 1.7.2.1 it - # it did not. So, we use non-empty stderr output as a proxy for the - # condition of interest. - test -z "$(git rev-parse "$REV" 2>&1 >/dev/null)" || die "$REV does not exist in the stash log" - fi - } is_stash_like() |