Re: [PATCH v5 7/8] detached-stash: tests of git stash with stash-like arguments
- From
Jon Seymour <jon.seymour@gmail.com>
- Date
- Aug 18, 2010, 23:04 UTC
- Message-ID
- <AANLkTi=tuX9CPagi=j9gMt9Kr3P0G4Mpb+43w+NPbfvu@mail.gmail.com>
- In-Reply-To
- <1282139333-5150-4-git-send-email-jon.seymour@gmail.com>
I'll need to re-issue this patch. The later tests execute 'successfully', but don't properly implement the intent. In particular, the condition:
! git stash stash@{0}should really be:
! git stash drop stash@{0}.Will re-roll a version 6, perhaps with a variant of Junio's git rev-parse tweak...
jon.
On Wed, Aug 18, 2010 at 11:48 PM, Jon Seymour <jon.seymour@gmail.com> wrote:
Show 171 quoted lines
> Adds new tests which check that:
> * git stash branch handles a stash-like argument when there is a stash stack
> * git stash branch handles a stash-like argument when there is not a stash stack
> * git stash show handles a stash-like argument when there is a stash stack
> * git stash show handles a stash-like argument when there is not a stash stack
> * git stash drop fails early if the specified argument is not a stash reference
> * git stash pop fails early if the specified argument is not a stash reference
> * git stash * fails early if the reference supplied is bogus
> * git stash fails early with stash@{n} where n >= length of stash log
>
> | Amended per advice from Johannes Sixt to avoid burying stash create failures.
>
> Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> t/t3903-stash.sh | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 140 insertions(+), 0 deletions(-)
>
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index 62e208a..efc7e7f 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -378,4 +378,144 @@ test_expect_failure 'stash file to directory' '
> test foo = "$(cat file/file)"
> '
>
> +test_expect_success 'stash branch - no stashes on stack, stash-like argument' '
> + git stash clear &&
> + test_when_finished "git reset --hard HEAD" &&
> + git reset --hard &&
> + echo foo >> file &&
> + STASH_ID=$(git stash create) &&
> + git reset --hard &&
> + git stash branch stash-branch ${STASH_ID} &&
> + test_when_finished "git reset --hard HEAD && git checkout master && git branch -D stash-branch" &&
> + test $(git ls-files --modified | wc -l) -eq 1
> +'
> +
> +test_expect_success 'stash branch - stashes on stack, stash-like argument' '
> + git stash clear &&
> + test_when_finished "git reset --hard HEAD" &&
> + git reset --hard &&
> + echo foo >> file &&
> + git stash &&
> + test_when_finished "git stash drop" &&
> + echo bar >> file &&
> + STASH_ID=$(git stash create) &&
> + git reset --hard &&
> + git stash branch stash-branch ${STASH_ID} &&
> + test_when_finished "git reset --hard HEAD && git checkout master && git branch -D stash-branch" &&
> + test $(git ls-files --modified | wc -l) -eq 1
> +'
> +
> +test_expect_success 'stash show - stashes on stack, stash-like argument' '
> + git stash clear &&
> + test_when_finished "git reset --hard HEAD" &&
> + git reset --hard &&
> + echo foo >> file &&
> + git stash &&
> + test_when_finished "git stash drop" &&
> + echo bar >> file &&
> + STASH_ID=$(git stash create) &&
> + git reset --hard &&
> + git stash show ${STASH_ID}
> +'
> +test_expect_success 'stash show - no stashes on stack, stash-like argument' '
> + git stash clear &&
> + test_when_finished "git reset --hard HEAD" &&
> + git reset --hard &&
> + echo foo >> file &&
> + STASH_ID=$(git stash create) &&
> + git reset --hard &&
> + git stash show ${STASH_ID}
> +'
> +
> +test_expect_success 'stash drop - fail early if specified stash is not a stash reference' '
> + git stash clear &&
> + test_when_finished "git reset --hard HEAD && git stash clear" &&
> + git reset --hard &&
> + echo foo > file &&
> + git stash &&
> + echo bar > file &&
> + git stash &&
> + ! git stash drop $(git rev-parse stash@{0}) &&
> + git stash pop &&
> + test bar = "$(cat file)" &&
> + git reset --hard HEAD
> +'
> +
> +test_expect_success 'stash pop - fail early if specified stash is not a stash reference' '
> + git stash clear &&
> + test_when_finished "git reset --hard HEAD && git stash clear" &&
> + git reset --hard &&
> + echo foo > file &&
> + git stash &&
> + echo bar > file &&
> + git stash &&
> + ! git stash pop $(git rev-parse stash@{0}) &&
> + git stash pop &&
> + test bar = "$(cat file)" &&
> + git reset --hard HEAD
> +'
> +
> +test_expect_success 'stash drop - bad stash ref' '
> + git stash clear &&
> + echo bar5 > file &&
> + echo bar6 > file2 &&
> + git add file2 &&
> + git stash &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash drop does-not-exist &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash drop does-not-exist@{0} &&
> + git stash drop
> +'
> +
> +test_expect_success 'stash pop - bad stash ref' '
> + git stash clear &&
> + echo bar5 > file &&
> + echo bar6 > file2 &&
> + git add file2 &&
> + git stash &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash pop does-not-exist &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash pop does-not-exist@{0} &&
> + git stash drop
> +'
> +
> +test_expect_success 'stash apply - bad stash ref' '
> + git stash clear &&
> + echo bar5 > file &&
> + echo bar6 > file2 &&
> + git add file2 &&
> + git stash &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash apply does-not-exist &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash apply does-not-exist@{0} &&
> + git stash drop
> +'
> +
> +test_expect_success 'stash show - bad stash ref' '
> + git stash clear &&
> + echo bar5 > file &&
> + echo bar6 > file2 &&
> + git add file2 &&
> + git stash &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash show does-not-exist &&
> + ! git rev-parse --quiet --verify does-not-exist &&
> + ! git stash show does-not-exist@{0} &&
> + git stash drop
> +'
> +
> +test_expect_success 'stash drop - invalid stash reference' '
> + git stash clear &&
> + ! git stash stash@{0} &&
> + echo bar5 > file &&
> + echo bar6 > file2 &&
> + git add file2 &&
> + git stash &&
> + ! git drop stash@{1} &&
> + git stash drop
> +'
> +
> test_done
> --
> 1.7.2.1.95.g4fabf
>
>