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

2019-03-28 Thread Thomas Gummerer
On 03/20, Denton Liu wrote: > On Wed, Mar 20, 2019 at 10:49:55PM +, 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

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

2019-03-21 Thread Jeff King
On Fri, Mar 22, 2019 at 12:25:17PM +0900, Junio C Hamano wrote: > > There is a "set_default" callback that was added by 6c374008b1 > > (diff_opt: track whether flags have been set explicitly, 2013-05-10), > > but it looks like it was never actually used. I think the theory is that > > cases like t

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

2019-03-21 Thread Junio C Hamano
Jeff King writes: >> I think this also deserves some explanation of what didn't change, >> especially after what I said in [*1*]. We're still not using the >> 'diff_opt_parse()' option parser, as it doesn't understand '-v' for >> example. 'setup_revisions()' understands that, but 'diff_opt_pars

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

2019-03-21 Thread Jeff King
On Wed, Mar 20, 2019 at 10:49:55PM +, Thomas Gummerer wrote: > I think this also deserves some explanation of what didn't change, > especially after what I said in [*1*]. We're still not using the > 'diff_opt_parse()' option parser, as it doesn't understand '-v' for > example. 'setup_revisio

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

2019-03-20 Thread Denton Liu
On Wed, Mar 20, 2019 at 10:49:55PM +, Thomas Gummerer wrote: > In the scripted 'git stash show' when no arguments are passed, we just > pass '--stat' to 'git diff'. When any argument is passed to 'stash > show', we no longer pass '--stat' to 'git diff', and pass whatever > flags are passed dir

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

2019-03-20 Thread Denton Liu
Hi Thomas, Thanks for the quick fix! On Wed, Mar 20, 2019 at 10:49:55PM +, Thomas Gummerer wrote: > In the scripted 'git stash show' when no arguments are passed, we just > pass '--stat' to 'git diff'. When any argument is passed to 'stash > show', we no longer pass '--stat' to 'git diff', a

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

2019-03-20 Thread Thomas Gummerer
In the scripted 'git stash show' when no arguments are passed, we just pass '--stat' to 'git diff'. When any argument is passed to 'stash show', we no longer pass '--stat' to 'git diff', and pass whatever flags are passed directly through to 'git diff'. By default 'git diff' shows the patch outpu