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 2/5] stash: Add a test for when apply fails during stash branch
Date: Tue, 13 Jun 2017 12:40:59 -0700 [thread overview]
Message-ID: <xmqqefun65h0.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170608005535.13080-3-joel@teichroeb.net> (Joel Teichroeb's message of "Wed, 7 Jun 2017 17:55:32 -0700")
Joel Teichroeb <joel@teichroeb.net> writes:
> If the return value of merge recurisve is not checked, the stash could end
> up being dropped even though it was not applied properly
s/recurisve/recursive/
> Signed-off-by: Joel Teichroeb <joel@teichroeb.net>
> ---
> t/t3903-stash.sh | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index cc923e6335..5399fb05ca 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -656,6 +656,20 @@ test_expect_success 'stash branch should not drop the stash if the branch exists
> git rev-parse stash@{0} --
> '
>
> +test_expect_success 'stash branch should not drop the stash if the apply fails' '
> + git stash clear &&
> + git reset HEAD~1 --hard &&
> + echo foo >file &&
> + git add file &&
> + git commit -m initial &&
It's not quite intuitive to call a non-root commit "initial" ;-)
> + echo bar >file &&
> + git stash &&
> + echo baz >file &&
OK, so 'file' has 'foo' in HEAD, 'bar' in the stash@{0}.
> + test_when_finished "git checkout master" &&
> + test_must_fail git stash branch new_branch stash@{0} &&
Hmph. Do we blindly checkout new_branch out of stash@{0}^1 and
unstash, but because 'file' in the working tree is dirty, we fail to
apply the stash and stop?
This sounds like a bug to me. Shouldn't we be staying on 'master',
and fail without even creating 'new_branch', when this happens?
In any case we should be testing what branch we are on after this
step. What branch should we be on after "git stash branch" fails?
> + git rev-parse stash@{0} --
> +'
> +
> test_expect_success 'stash apply shows status same as git status (relative to current directory)' '
> git stash clear &&
> echo 1 >subdir/subfile1 &&
next prev parent reply other threads:[~2017-06-13 19:41 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 [this message]
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
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
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=xmqqefun65h0.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.
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).