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.
-Peff
