diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-11-30 17:14:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-02 01:34:43 +0300 |
| commit | 0527ccb1b558e1337f5f3e02ea9747d86a1908a8 (patch) | |
| tree | eff2d7ad598bf5672f3c67afeab5fa43dafa5444 /builtin/add.c | |
| parent | ed922dcab6ac3e2cc0a53f06e9044ba180ea0675 (diff) | |
add -i: default to the built-in implementation
In 9a5315edfdf (Merge branch 'js/patch-mode-in-others-in-c',
2020-02-05), Git acquired a built-in implementation of `git add`'s
interactive mode that could be turned on via the config option
`add.interactive.useBuiltin`.
The first official Git version to support this knob was v2.26.0.
In 2df2d81ddd0 (add -i: use the built-in version when
feature.experimental is set, 2020-09-08), this built-in implementation
was also enabled via `feature.experimental`. The first version with this
change was v2.29.0.
More than a year (and very few bug reports) later, it is time to declare
the built-in implementation mature and to turn it on by default.
We specifically leave the `add.interactive.useBuiltin` configuration in
place, to give users an "escape hatch" in the unexpected case should
they encounter a previously undetected bug in that implementation.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/builtin/add.c b/builtin/add.c index ef6b619c45..8ef230a345 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) { enum add_p_mode mode; if (!patch_mode) |