diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-31 09:24:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-31 09:24:03 +0300 |
| commit | 1fc1879839242dbb1a378888b68493cbb04b07e0 (patch) | |
| tree | 81bb19ed4cdf9b8b5cae380c2e026b73802e226b /builtin/add.c | |
| parent | 5a10f4c3a16633556ab3b1b0e216e6ef07877932 (diff) | |
| parent | 0527ccb1b558e1337f5f3e02ea9747d86a1908a8 (diff) | |
Merge branch 'js/use-builtin-add-i'
"git add -i" was rewritten in C some time ago and has been in
testing; the reimplementation is now exposed to general public by
default.
* js/use-builtin-add-i:
add -i: default to the built-in implementation
t2016: require the PERL prereq only when necessary
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 3ffb86a433..343fe2c353 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -236,17 +236,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) |