add -i: use the built-in version when feature.experimental is set
We have had parallel implementations of "add -i/-p" since 2.25 and have been using them from various codepaths since 2.26 days, but never made the built-in version the default. We have found and fixed a handful of corner case bugs in the built-in version, and it may be a good time to start switching over the user base from the scripted version to the built-in version. Let's enable the built-in version for those who opt into the feature.experimental guinea-pig program to give wider exposure. Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 8, 2020 at 14:53 UTC
2df2d81ddd068cf2e8a65743b258d0a263b84ae6
1 file changed
+9
-3
builtin/add.c
+9
-3
@@ -192,9 +192,15 @@ int run_add_interactive(const char *revision, const char *patch_mode,
192
int use_builtin_add_i =
193
git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
194
195
- if (use_builtin_add_i < 0)
196
- git_config_get_bool("add.interactive.usebuiltin",
197
- &use_builtin_add_i);
195
+ if (use_builtin_add_i < 0) {
196
+ int experimental;
197
+ if (!git_config_get_bool("add.interactive.usebuiltin",
198
+ &use_builtin_add_i))
199
+ ; /* ok */
200
+ else if (!git_config_get_bool("feature.experimental", &experimental) &&
201
+ experimental)
202
+ use_builtin_add_i = 1;
203
+ }
204
205
if (use_builtin_add_i == 1) {
206
enum add_p_mode mode;