Skip to content

Commit e96b271

Browse files
committed
Merge branch 'jc/add-i-use-builtin-experimental'
The "add -i/-p" machinery has been written in C but it is not used by default yet. It is made default to those who are participating in feature.experimental experiment. * jc/add-i-use-builtin-experimental: add -i: use the built-in version when feature.experimental is set
2 parents e41500a + 2df2d81 commit e96b271

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

builtin/add.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,15 @@ int run_add_interactive(const char *revision, const char *patch_mode,
192192
int use_builtin_add_i =
193193
git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
194194

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+
}
198204

199205
if (use_builtin_add_i == 1) {
200206
enum add_p_mode mode;

0 commit comments

Comments
 (0)