From: Thomas Gummerer <t.gummerer@gmail•com>
To: Denton Liu <liu.denton@gmail•com>
Cc: Git Mailing List <git@vger•kernel.org>,
Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail•com>,
Joel Teichroeb <joel@teichroeb•net>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Junio C Hamano <gitster@pobox•com>,
Matthew Kraai <mkraai@its•jnj.com>, Jeff King <peff@peff•net>
Subject: Re: [PATCH v2] stash: setup default diff output format if necessary
Date: Thu, 28 Mar 2019 20:45:46 +0000 [thread overview]
Message-ID: <20190328204546.GG32487@hank.intra.tgummerer.com> (raw)
In-Reply-To: <20190320230942.GA28455@dev-l>
On 03/20, Denton Liu wrote:
> On Wed, Mar 20, 2019 at 10:49:55PM +0000, Thomas Gummerer wrote:
> > diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> > index 97cc71fbaf..83926ab55b 100755
> > --- a/t/t3903-stash.sh
> > +++ b/t/t3903-stash.sh
> > @@ -612,6 +612,24 @@ test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '
> > test_cmp expected actual
> > '
> >
> > +test_expect_success 'stash show -v shows diff' '
>
> s/-v/--patience/
>
> Missed this in my last email, my bad!
I see Junio already picked this and the fix for the commit message up
already. Thanks both!
> > + git reset --hard &&
> > + echo foo >>file &&
> > + STASH_ID=$(git stash create) &&
> > + git reset --hard &&
> > + cat >expected <<-EOF &&
> > + diff --git a/file b/file
> > + index 7601807..71b52c4 100644
> > + --- a/file
> > + +++ b/file
> > + @@ -1 +1,2 @@
> > + baz
> > + +foo
> > + EOF
> > + git stash show --patience ${STASH_ID} >actual &&
> > + test_cmp expected actual
> > +'
> > +
> > test_expect_success 'drop: fail early if specified stash is not a stash ref' '
> > git stash clear &&
> > test_when_finished "git reset --hard HEAD && git stash clear" &&
> > --
> > 2.21.0.226.g764ec437b0.dirty
> >
next prev parent reply other threads:[~2019-03-28 20:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 19:05 [REGRESSION ps/stash-in-c] git stash show -v Denton Liu
2019-03-19 23:18 ` Thomas Gummerer
2019-03-20 1:00 ` Junio C Hamano
2019-03-20 21:45 ` Thomas Gummerer
2019-03-20 1:04 ` Junio C Hamano
2019-03-20 5:04 ` Jeff King
2019-03-20 9:30 ` Duy Nguyen
2019-03-20 21:59 ` Thomas Gummerer
2019-03-20 22:49 ` [PATCH v2] stash: setup default diff output format if necessary Thomas Gummerer
2019-03-20 23:04 ` Denton Liu
2019-03-20 23:09 ` Denton Liu
2019-03-28 20:45 ` Thomas Gummerer [this message]
2019-03-21 9:51 ` Jeff King
2019-03-22 3:25 ` Junio C Hamano
2019-03-22 3:48 ` Jeff King
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=20190328204546.GG32487@hank.intra.tgummerer.com \
--to=t.gummerer@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=joel@teichroeb$(echo .)net \
--cc=liu.denton@gmail$(echo .)com \
--cc=mkraai@its$(echo .)jnj.com \
--cc=peff@peff$(echo .)net \
--cc=ungureanupaulsebastian@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox