From: Jeff King <peff@peff.net>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
David Aguilar <davvid@gmail.com>,
Dennis Kaarsemaker <dennis@kaarsemaker.net>
Subject: Re: [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin
Date: Thu, 24 Nov 2016 16:08:41 -0500 [thread overview]
Message-ID: <20161124210841.c4yi2nv57tjfejgj@sigill.intra.peff.net> (raw)
In-Reply-To: <3a10fd72cf336743891d6bc9a003cfeb5c3f0063.1480019834.git.johannes.schindelin@gmx.de>
On Thu, Nov 24, 2016 at 09:55:07PM +0100, Johannes Schindelin wrote:
> +/*
> + * NEEDSWORK: this function can go once the legacy-difftool Perl script is
> + * retired.
> + *
> + * We intentionally avoid reading the config directly here, to avoid messing up
> + * the GIT_* environment variables when we need to fall back to exec()ing the
> + * Perl script.
> + */
> +static int use_builtin_difftool(void) {
> + struct child_process cp = CHILD_PROCESS_INIT;
> + struct strbuf out = STRBUF_INIT;
> + int ret;
> +
> + argv_array_pushl(&cp.args,
> + "config", "--bool", "difftool.usebuiltin", NULL);
> + cp.git_cmd = 1;
> + if (capture_command(&cp, &out, 6))
> + return 0;
> + strbuf_trim(&out);
> + ret = !strcmp("true", out.buf);
> + strbuf_release(&out);
> + return ret;
> +}
FWIW, it should mostly Just Work to use the internal config functions
these days, with the caveat that they will not read repo-level config if
you haven't done repo setup yet.
I think it would probably be OK to ship with that caveat (people would
probably use --global config, or "git -c" for a quick override), but if
you really wanted to address it, you can do something like what
pager.c:read_early_config() does.
Of course, your method here is fine, too; I just know you are sensitive
to forking extra processes.
Also, a minor nit: capture_command() might return data in "out" with a
non-zero exit if the command both generates stdout and exits non-zero
itself. I'm not sure that's possible with git-config, though, so it
might not be worth worrying about.
-Peff
next prev parent reply other threads:[~2016-11-24 21:08 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 17:01 [PATCH 0/2] Show Git Mailing List: a builtin difftool Johannes Schindelin
2016-11-22 17:01 ` [PATCH 1/2] difftool: add the builtin Johannes Schindelin
2016-11-23 8:08 ` David Aguilar
2016-11-23 11:34 ` Johannes Schindelin
2016-11-22 17:01 ` [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version Johannes Schindelin
2016-11-23 14:51 ` Dennis Kaarsemaker
2016-11-23 17:29 ` Johannes Schindelin
2016-11-23 17:40 ` Junio C Hamano
2016-11-23 18:18 ` Junio C Hamano
2016-11-23 19:55 ` Johannes Schindelin
2016-11-23 20:04 ` Junio C Hamano
2016-11-23 22:01 ` Johannes Schindelin
2016-11-23 22:03 ` [PATCH v2 0/1] Show Git Mailing List: a builtin difftool Johannes Schindelin
2016-11-23 22:03 ` [PATCH v2 1/1] difftool: add the builtin Johannes Schindelin
2016-11-23 22:25 ` Junio C Hamano
2016-11-23 22:30 ` Junio C Hamano
2016-11-24 10:38 ` Johannes Schindelin
2016-11-24 20:55 ` [PATCH v3 0/2] Show Git Mailing List: a builtin difftool Johannes Schindelin
2016-11-24 20:55 ` [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin Johannes Schindelin
2016-11-24 21:08 ` Jeff King [this message]
2016-11-24 21:56 ` Johannes Schindelin
2016-11-25 3:18 ` Jeff King
2016-11-25 11:05 ` Johannes Schindelin
2016-11-25 17:19 ` Jeff King
2016-11-25 17:41 ` Johannes Schindelin
2016-11-25 17:47 ` Jeff King
2016-11-26 12:22 ` Johannes Schindelin
2016-11-26 16:19 ` Jeff King
2016-11-26 13:01 ` Johannes Schindelin
2016-11-27 16:50 ` Jeff King
2016-11-28 17:06 ` Junio C Hamano
2016-11-28 17:34 ` Johannes Schindelin
2016-11-28 19:27 ` Junio C Hamano
2016-11-29 20:36 ` Johannes Schindelin
2016-11-29 20:49 ` Jeff King
2016-11-30 12:30 ` Johannes Schindelin
2016-11-30 12:35 ` Jeff King
2016-11-29 20:55 ` Junio C Hamano
2016-11-30 12:30 ` Johannes Schindelin
2016-12-01 23:33 ` Junio C Hamano
2016-12-05 10:36 ` Johannes Schindelin
2016-12-05 18:37 ` Junio C Hamano
2016-12-06 13:16 ` Johannes Schindelin
2016-12-06 13:36 ` Jeff King
2016-12-06 14:48 ` Johannes Schindelin
2016-12-06 15:09 ` Jeff King
2016-12-06 18:22 ` Stefan Beller
2016-12-06 18:35 ` Jeff King
2017-01-18 22:38 ` Brandon Williams
2016-11-30 16:02 ` Jakub Narębski
2016-11-30 18:39 ` Junio C Hamano
2016-11-24 20:55 ` [PATCH v3 2/2] difftool: implement the functionality in the builtin Johannes Schindelin
2016-11-25 21:24 ` Jakub Narębski
2016-11-27 11:10 ` Johannes Schindelin
2016-11-27 11:20 ` Jakub Narębski
2017-01-02 16:16 ` [PATCH v4 0/4] Show Git Mailing List: a builtin difftool Johannes Schindelin
2017-01-02 16:22 ` [PATCH v4 1/4] Avoid Coverity warning about unfree()d git_exec_path() Johannes Schindelin
2017-01-03 20:11 ` Stefan Beller
2017-01-03 21:33 ` Johannes Schindelin
2017-01-04 18:09 ` Stefan Beller
2017-01-04 1:13 ` Jeff King
2017-01-09 1:25 ` Junio C Hamano
2017-01-09 6:00 ` Jeff King
2017-01-09 7:49 ` Johannes Schindelin
2017-01-09 19:21 ` Stefan Beller
2017-01-02 16:22 ` [PATCH v4 2/4] difftool: add a skeleton for the upcoming builtin Johannes Schindelin
2017-01-02 16:22 ` [PATCH v4 3/4] difftool: implement the functionality in the builtin Johannes Schindelin
2017-01-02 16:24 ` [PATCH v4 4/4] t7800: run both builtin and scripted difftool, for now Johannes Schindelin
2017-01-09 1:38 ` Junio C Hamano
2017-01-09 7:56 ` Johannes Schindelin
2017-01-09 9:46 ` Junio C Hamano
2017-01-17 15:54 ` [PATCH v5 0/3] Turn the difftool into a builtin Johannes Schindelin
2017-01-17 15:54 ` [PATCH v5 1/3] difftool: add a skeleton for the upcoming builtin Johannes Schindelin
2017-01-17 15:55 ` [PATCH v5 2/3] difftool: implement the functionality in the builtin Johannes Schindelin
2017-01-17 15:55 ` [PATCH v5 3/3] Retire the scripted difftool Johannes Schindelin
2017-01-17 21:46 ` Junio C Hamano
2017-01-18 12:33 ` Johannes Schindelin
2017-01-18 19:15 ` Junio C Hamano
2017-01-19 16:30 ` Johannes Schindelin
2017-01-19 17:56 ` Junio C Hamano
2017-01-19 20:32 ` Johannes Schindelin
2017-01-17 21:31 ` [PATCH v5 0/3] Turn the difftool into a builtin Junio C Hamano
2017-01-19 20:30 ` [PATCH v6 " Johannes Schindelin
2017-01-19 20:30 ` [PATCH v6 1/3] difftool: add a skeleton for the upcoming builtin Johannes Schindelin
2017-01-19 20:30 ` [PATCH v6 2/3] difftool: implement the functionality in the builtin Johannes Schindelin
2017-01-19 20:30 ` [PATCH v6 3/3] Retire the scripted difftool 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161124210841.c4yi2nv57tjfejgj@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=davvid@gmail.com \
--cc=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).