Commit 59d418fe authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

stash: fix accidental apply of non-existent stashes

Once upon a time, "git rev-parse [email protected]{9999999}" did not
generate an error. Therefore when we got an invalid stash
reference in "stash apply", we could end up not noticing
until quite late.  Commit b0f0ecd9 (detached-stash: work
around git rev-parse failure to detect bad log refs,
2010-08-21) handled this by checking for the "Log for stash
has only %d entries" warning on stderr when we validated the

A few days later, e6eedc31 (rev-parse: exit with non-zero
status if [email protected]{n} is not valid., 2010-08-24) fixed the
original issue. That made the extra stderr test superfluous,
but also introduced a new bug. Now the early call to:

  git rev-parse --symbolic "[email protected]"

fails, but we don't notice the exit code. Worse, its empty
output means we think the user didn't provide us a ref, and
we try to apply [email protected]{0}.

This patch checks the rev-parse exit code and fails early in
the revision parsing process. We can also get rid of the
stderr test; as a bonus, this means that "stash apply" can
now run under GIT_TRACE=1 properly.
Signed-off-by: default avatarJeff King <[email protected]>
Acked-by: Jon Seymour's avatarJon Seymour <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 7ed863a8
......@@ -264,7 +264,7 @@ parse_flags_and_rev()
REV=$(git rev-parse --no-flags --symbolic "[email protected]" 2>/dev/null)
REV=$(git rev-parse --no-flags --symbolic "[email protected]") || exit 1
for opt
......@@ -310,16 +310,6 @@ parse_flags_and_rev()
test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
if test "${REV}" != "${REV%{*\}}"
# maintainers: it would be better if git rev-parse indicated
# this condition with a non-zero status code but as of 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"
......@@ -37,6 +37,12 @@ test_expect_success 'parents of stash' '
test_cmp output expect
test_expect_success 'applying bogus stash does nothing' '
test_must_fail git stash apply [email protected]{1} &&
echo 1 >expect &&
test_cmp expect file
test_expect_success 'apply needs clean working directory' '
echo 4 > other-file &&
git add other-file &&
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment