On Wed, Apr 6, 2011 at 7:20 AM, Jeff King <peff@xxxxxxxx> wrote:
> Signed-off-by: Jeff King <peff@xxxxxxxx>
Acked-by: Jon Seymour <jon.seymour@xxxxxxxxx>
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
>
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html