Re: [PATCH v2] stash: setup default diff output format if necessary

From: Thomas Gummerer <t.gummerer@gmail.com>
Date: Mar 28, 2019, 20:45 UTC
Message-ID: <20190328204546.GG32487@hank.intra.tgummerer.com>
In-Reply-To: <20190320230942.GA28455@dev-l>

On 03/20, Denton Liu wrote:

Show 14 quoted lines

> 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!

Show 23 quoted lines

> > +	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
> >