From: Jeff King <peff@peff.net>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 3/3] difftool: allow running outside Git worktrees with --no-index
Date: Thu, 14 Mar 2019 23:17:19 -0400 [thread overview]
Message-ID: <20190315031718.GC28943@sigill.intra.peff.net> (raw)
In-Reply-To: <8cca9f800c2ce269a2ae644e4c15dc4115d3b0e2.1552562701.git.gitgitgadget@gmail.com>
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
next prev parent reply other threads:[~2019-03-15 3:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 19:20 [PATCH 0/2] Allow difftool to be run outside of Git worktrees Johannes Schindelin via GitGitGadget
2019-03-13 19:20 ` [PATCH 1/2] difftool: remove obsolete (and misleading) comment Johannes Schindelin via GitGitGadget
2019-03-13 19:20 ` [PATCH 2/2] difftool: allow running outside Git worktrees with --no-index Johannes Schindelin via GitGitGadget
2019-03-13 20:46 ` Jeff King
2019-03-14 12:16 ` Johannes Schindelin
2019-03-15 3:08 ` Jeff King
2019-03-14 11:25 ` [PATCH v2 0/3] Allow difftool to be run outside of Git worktrees Johannes Schindelin via GitGitGadget
2019-03-14 11:25 ` [PATCH v2 1/3] difftool: remove obsolete (and misleading) comment Johannes Schindelin via GitGitGadget
2019-03-14 11:25 ` [PATCH v2 2/3] parse-options: make OPT_ARGUMENT() more useful Johannes Schindelin via GitGitGadget
2019-03-15 3:15 ` Jeff King
2019-03-15 13:24 ` Johannes Schindelin
2019-03-18 2:47 ` Junio C Hamano
2019-03-18 21:04 ` Jeff King
2019-03-19 0:25 ` Junio C Hamano
2019-03-14 11:25 ` [PATCH v2 3/3] difftool: allow running outside Git worktrees with --no-index Johannes Schindelin via GitGitGadget
2019-03-15 3:17 ` Jeff King [this message]
2019-03-15 13:20 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190315031718.GC28943@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).