From: Jon Seymour <jon.seymour@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] stash: fix accidental apply of non-existent stashes
Date: Wed, 6 Apr 2011 09:23:12 +1000 [thread overview]
Message-ID: <BANLkTik4sJwvBsnS855YEV=1akpGqYaspA@mail.gmail.com> (raw)
In-Reply-To: <20110405212025.GA3579@sigill.intra.peff.net>
On Wed, Apr 6, 2011 at 7:20 AM, Jeff King <peff@peff.net> wrote:
> Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Jon Seymour <jon.seymour@gmail.com>
I've also submitted a patch that fixes the test that should have caught this.
jon.
> ---
> git-stash.sh | 12 +-----------
> t/t3903-stash.sh | 6 ++++++
> 2 files changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index a305fb1..a5b1dc3 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()
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index f62aaf5..11077f0 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -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 stash@{1} &&
> + echo 1 >expect &&
> + test_cmp expect file
> +'
> +
> test_expect_success 'apply needs clean working directory' '
> echo 4 > other-file &&
> git add other-file &&
> --
> 1.7.4.3.13.g0b769.dirty
>
>
prev parent reply other threads:[~2011-04-05 23:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-05 21:20 [PATCH 1/2] stash: fix accidental apply of non-existent stashes Jeff King
2011-04-05 21:23 ` [RFC/PATCH 2/2] stash: drop dirty worktree check on apply Jeff King
2011-04-05 21:59 ` Junio C Hamano
2011-04-05 22:18 ` Jeff King
2011-04-05 22:50 ` Jeff King
2011-04-05 23:02 ` Jeff King
2011-04-05 23:17 ` Junio C Hamano
2011-04-06 23:01 ` Junio C Hamano
2011-04-05 23:23 ` Jon Seymour [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTik4sJwvBsnS855YEV=1akpGqYaspA@mail.gmail.com' \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).