Re: [PATCH v2 3/3] difftool: allow running outside Git worktrees with --no-index
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 15, 2019, 13:20 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1903151413570.41@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20190315031718.GC28943@sigill.intra.peff.net>
Hi Peff,
On Thu, 14 Mar 2019, Jeff King wrote:
Show 24 quoted lines
> On Thu, Mar 14, 2019 at 04:25:04AM -0700, Johannes Schindelin via GitGitGadget wrote:
>
> > @@ -714,6 +714,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
> > "tool returns a non - zero exit code")),
> > OPT_STRING('x', "extcmd", &extcmd, N_("command"),
> > N_("specify a custom command for viewing diffs")),
> > + OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),
> > OPT_END()
> > };
>
> Much nicer.
>
> > +test_expect_success 'outside worktree' '
> > + echo 1 >1 &&
> > + echo 2 >2 &&
> > + test_expect_code 1 nongit git \
> > + -c diff.tool=echo -c difftool.echo.cmd="echo \$LOCAL \$REMOTE" \
> > + difftool --no-prompt --no-index ../1 ../2 >actual &&
> > + echo "../1 ../2" >expect &&
> > + test_cmp expect actual
> > +'
>
> And this fixed all of my nits from the previous version. The whole
> series looks good to me.Thanks! (စ ͜ စ) Dscho