From: Junio C Hamano <gitster@pobox.com>
To: Joel Teichroeb <joel@teichroeb.net>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Jeff King" <peff@peff.net>,
"Christian Couder" <christian.couder@gmail.com>
Subject: Re: [PATCH v4 3/5] stash: add test for stashing in a detached state
Date: Tue, 13 Jun 2017 12:45:03 -0700 [thread overview]
Message-ID: <xmqqa85b65a8.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170608005535.13080-4-joel@teichroeb.net> (Joel Teichroeb's message of "Wed, 7 Jun 2017 17:55:33 -0700")
Joel Teichroeb <joel@teichroeb.net> writes:
> Signed-off-by: Joel Teichroeb <joel@teichroeb.net>
> ---
> t/t3903-stash.sh | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index 5399fb05ca..ce4c8fe3d6 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -822,6 +822,18 @@ test_expect_success 'create with multiple arguments for the message' '
> test_cmp expect actual
> '
>
> +test_expect_success 'create in a detached state' '
> + test_when_finished "git checkout master" &&
> + git checkout HEAD~1 &&
> + >foo &&
> + git add foo &&
> + STASH_ID=$(git stash create) &&
> + HEAD_ID=$(git rev-parse --short HEAD) &&
> + echo "WIP on (no branch): ${HEAD_ID} initial" >expect &&
> + git show --pretty=%s -s ${STASH_ID} >actual &&
> + test_cmp expect actual
> +'
Hmph. Is the title automatically given to the stash the
only/primary thing that is of interest to us in this test? I think
we care more about that we record the right thing in the resulting
stash and also after creating the stash the working tree and the
index becomes clean. Shouldn't we be testing that?
If "git stash create" fails to make the working tree and the index
clean, then "git checkout master" run by when-finished will carry
the local modifications with us, which probably is not what you
meant. You'd need "reset --hard" there, too, perhaps?
> test_expect_success 'stash -- <pathspec> stashes and restores the file' '
> >foo &&
> >bar &&
next prev parent reply other threads:[~2017-06-13 19:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 0:55 [PATCH v4 0/5] Implement git stash as a builtin command Joel Teichroeb
2017-06-08 0:55 ` [PATCH v4 1/5] stash: add test for stash create with no files Joel Teichroeb
2017-06-13 19:31 ` Junio C Hamano
2017-06-08 0:55 ` [PATCH v4 2/5] stash: Add a test for when apply fails during stash branch Joel Teichroeb
2017-06-13 19:40 ` Junio C Hamano
2017-06-13 19:54 ` Joel Teichroeb
2017-06-08 0:55 ` [PATCH v4 3/5] stash: add test for stashing in a detached state Joel Teichroeb
2017-06-13 19:45 ` Junio C Hamano [this message]
2017-06-13 19:48 ` Joel Teichroeb
2017-06-13 20:58 ` Junio C Hamano
2017-06-08 0:55 ` [PATCH v4 4/5] merge: close the index lock when not writing the new index Joel Teichroeb
2017-06-13 19:47 ` Junio C Hamano
2017-06-08 0:55 ` [PATCH v4 5/5] stash: implement builtin stash Joel Teichroeb
2017-06-11 21:27 ` Thomas Gummerer
2017-06-20 2:37 ` Joel Teichroeb
2017-06-25 21:09 ` Thomas Gummerer
2017-06-26 7:53 ` Matthieu Moy
2017-06-27 14:53 ` Thomas Gummerer
2017-06-16 16:15 ` Junio C Hamano
2017-06-16 22:47 ` Junio C Hamano
2017-06-19 13:16 ` Johannes Schindelin
2017-06-19 13:20 ` Jeff King
2017-06-20 2:12 ` Joel Teichroeb
2017-06-22 17:23 ` Junio C Hamano
2017-06-22 17:07 ` Junio C Hamano
2017-06-11 17:40 ` [PATCH v4 0/5] Implement git stash as a builtin command Joel Teichroeb
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa85b65a8.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=joel@teichroeb.net \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.