git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood <phillip.wood123@gmail.com>,
	"Raymond E. Pasco" <ray@ameretat.dev>,
	phillip.wood@dunelm.org.uk, Thomas Sullivan <tom@msbit.com.au>,
	git@vger.kernel.org
Subject: Re: git add intent-to-add then git add patch no longer allows edit
Date: Tue, 8 Sep 2020 21:52:13 +0200 (CEST)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.2009082151520.54@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqsgbsz22t.fsf@gitster.c.googlers.com>

Hi Junio,

On Tue, 8 Sep 2020, Junio C Hamano wrote:

> Phillip Wood <phillip.wood123@gmail.com> writes:
>
> >>  If we do not flip the
> >> "use the built-in variant" for those with feature.experimental we
> >> really should do so to widen the canarying population immediately.
> >
> > That's a good idea
>
> Like this?  If the more specific one is specifically set, we do not
> look at experimental bit, but otherwise we use the built-in version.

Looks fine to me,
Dscho

>
>  builtin/add.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/add.c b/builtin/add.c
> index b36a99eb7c..26b6ced09e 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -192,9 +192,15 @@ 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)
> -		git_config_get_bool("add.interactive.usebuiltin",
> -				    &use_builtin_add_i);
> +	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 == 1) {
>  		enum add_p_mode mode;
>

  reply	other threads:[~2020-09-08 19:52 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-21  4:27 git add intent-to-add then git add patch no longer allows edit Thomas Sullivan
2020-08-21  5:25 ` Raymond E. Pasco
2020-08-21 16:27   ` Junio C Hamano
2020-08-23 16:03     ` Phillip Wood
2020-08-24 16:23       ` Raymond E. Pasco
2020-08-24 17:28         ` Phillip Wood
2020-08-24 21:03           ` Raymond E. Pasco
2020-09-04 10:05             ` Phillip Wood
2020-09-04  6:56               ` Johannes Schindelin
2020-09-06 17:10                 ` Junio C Hamano
2020-09-07 18:00                   ` Phillip Wood
2020-09-08 16:05                     ` Junio C Hamano
2020-09-08 19:52                       ` Johannes Schindelin [this message]
2020-09-08 22:00                         ` Junio C Hamano
2020-09-09  9:40                           ` Phillip Wood
2020-09-05 18:36               ` Raymond E. Pasco

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.2009082151520.54@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood123@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=ray@ameretat.dev \
    --cc=tom@msbit.com.au \
    /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).