diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-19 00:58:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-19 00:58:02 (GMT) |
| commit | e96b271d185b59d93f7deab454a788c9d8dd0e50 (patch) | |
| tree | 523056cba412091ea5394792c71491e6e19a8da3 /builtin | |
| parent | e41500ac190be71c033aaf57adabeb182c23feed (diff) | |
| parent | 2df2d81ddd068cf2e8a65743b258d0a263b84ae6 (diff) | |
| download | git-e96b271d185b59d93f7deab454a788c9d8dd0e50.zip git-e96b271d185b59d93f7deab454a788c9d8dd0e50.tar.gz git-e96b271d185b59d93f7deab454a788c9d8dd0e50.tar.bz2 | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/builtin/add.c b/builtin/add.c index b36a99e..26b6ced 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; |