From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Slavica Đukić" <slawica92@hotmail.com>,
"Denton Liu" <liu.denton@gmail.com>
Subject: Re: [PATCH 2/2] add -i: default to the built-in implementation
Date: Thu, 2 Dec 2021 16:01:53 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2112021557530.63@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <a936a701-c13f-346e-69ee-85441ca20641@gmail.com>
Hi Phillip,
On Wed, 1 Dec 2021, Phillip Wood wrote:
> On 30/11/2021 14:14, Johannes Schindelin via GitGitGadget wrote:
>
> > diff --git a/builtin/add.c b/builtin/add.c
> > index ef6b619c45e..8ef230a345b 100644
> > --- a/builtin/add.c
> > +++ b/builtin/add.c
> > @@ -237,17 +237,12 @@ int run_add_interactive(const char *revision, const
> > char *patch_mode,
> > int use_builtin_add_i =
> > git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
> > - if (use_builtin_add_i < 0) {
> > - int experimental;
> > - if (!git_config_get_bool("add.interactive.usebuiltin",
> > - &use_builtin_add_i))
> > - ; /* ok */
> > - else if (!git_config_get_bool("feature.experimental",
> > &experimental) &&
> > - experimental)
> > - use_builtin_add_i = 1;
> > - }
> > + if (use_builtin_add_i < 0 &&
> > + git_config_get_bool("add.interactive.usebuiltin",
> > + &use_builtin_add_i))
> > + use_builtin_add_i = 1;
> > - if (use_builtin_add_i == 1) {
> > + if (use_builtin_add_i != 0) {
>
> This could be simplified to "if (use_builtin_add_i)" but don't re-roll just
> for that
I was actually considering this, given that Git's coding practice suggests
precisely the form you suggested.
However, in this instance I found that form misleading: it would read to
me as if `use_builtin_add_i` was a Boolean. But it is a tristate, it can
also be `-1` ("undecided"). And I wanted to express "if this is not set to
`false` specifically", therefore I ended up with my proposal.
Ciao,
Dscho
next prev parent reply other threads:[~2021-12-02 15:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 14:14 [PATCH 0/2] Use the built-in implementation of the interactive add command by default Johannes Schindelin via GitGitGadget
2021-11-30 14:14 ` [PATCH 1/2] t2016: require the PERL prereq only when necessary Johannes Schindelin via GitGitGadget
2021-12-01 22:25 ` Junio C Hamano
2021-12-02 14:57 ` Johannes Schindelin
2021-11-30 14:14 ` [PATCH 2/2] add -i: default to the built-in implementation Johannes Schindelin via GitGitGadget
2021-12-01 11:20 ` Phillip Wood
2021-12-02 15:01 ` Johannes Schindelin [this message]
2021-12-02 16:58 ` Junio C Hamano
2021-12-02 17:43 ` Ramsay Jones
2021-12-10 22:59 ` Johannes Schindelin
2021-12-01 13:37 ` Ævar Arnfjörð Bjarmason
2021-12-01 22:41 ` Junio C Hamano
2021-12-01 22:34 ` Junio C Hamano
2021-12-02 17:30 ` Johannes Schindelin
2021-12-09 4:12 ` [PATCH] fixup! " Junio C Hamano
2021-12-10 22:55 ` Johannes Schindelin
2021-11-30 20:56 ` [PATCH 0/2] Use the built-in implementation of the interactive add command by default Jeff King
2021-11-30 21:15 ` Junio C Hamano
2021-12-01 13:43 ` Ævar Arnfjörð Bjarmason
2021-12-01 21:24 ` Carlo Arenas
2021-12-02 17:33 ` Johannes Schindelin
2021-12-03 13:58 ` Philippe Blain
2021-12-06 15:59 ` 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=nycvar.QRO.7.76.6.2112021557530.63@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=liu.denton@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=slawica92@hotmail.com \
/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).