Re: [PATCH v2 3/3] difftool: allow running outside Git worktrees with --no-index
- From
Jeff King <peff@peff.net>
- Date
- Mar 15, 2019, 03:17 UTC
- Message-ID
- <20190315031718.GC28943@sigill.intra.peff.net>
- In-Reply-To
- <8cca9f800c2ce269a2ae644e4c15dc4115d3b0e2.1552562701.git.gitgitgadget@gmail.com>
On Thu, Mar 14, 2019 at 04:25:04AM -0700, Johannes Schindelin via GitGitGadget wrote:
Show 7 quoted lines
> @@ -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.
Show 9 quoted lines
> +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.
-Peff