add-i: finally retire add.interactive.useBuiltin

The configuration variable stopped doing anything (other than
announcing itself as a variable that does not do anything useful,
when it is used) in Git 2.40.

At this point, it is not even worth giving the warning, which was
meant to be a way to help users notice they are carrying unused
cruft in their configuration files and give them a chance to
clean-up.

Let's remove the warning and documentation for it, and truly stop
paying attention to it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
               ---
 Documentation/config/add.txt |  6 ------
 builtin/add.c                |  6 +-----
 t/t3701-add-interactive.sh   | 15 ---------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/Documentation/config/add.txt b/Documentation/config/add.txt
index e0354ceaed9e870abce7b59468ed08439267b17a..4d753f006ec1efd466b18d74841c8d43039d8ad9 100644 (file)
--- a/Documentation/config/add.txt
+++ b/Documentation/config/add.txt
@@ -5,9 +5,3 @@ add.ignore-errors (deprecated)::
        option of linkgit:git-add[1].  `add.ignore-errors` is deprecated,
        as it does not follow the usual naming convention for configuration
        variables.
-
-add.interactive.useBuiltin::
-       Unused configuration variable. Used in Git versions v2.25.0 to
-       v2.36.0 to enable the built-in version of linkgit:git-add[1]'s
-       interactive mode, which then became the default in Git
-       versions v2.37.0 to v2.39.0.

diff --git a/builtin/add.c b/builtin/add.c
index 3dfcfc5fba3341076cbef3672fff2dd87f7a12c7..40b61ef90d98ca0b5905b570612f3fab25c723b9 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -150,11 +150,7 @@ static int refresh(int verbose, const struct pathspec *pathspec)
 int interactive_add(const char **argv, const char *prefix, int patch)
 {
        struct pathspec pathspec;
-       int unused, ret;
-
-       if (!git_config_get_bool("add.interactive.usebuiltin", &unused))
-               warning(_("the add.interactive.useBuiltin setting has been removed!\n"
-                         "See its entry in 'git help config' for details."));
+       int ret;
 
        parse_pathspec(&pathspec, 0,
                       PATHSPEC_PREFER_FULL |

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 6624a4f7c05b595527d2eedc6b3ebda861cc12ac..5d78868ac168886c45dbb8d6359ca3b535a2990c 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -43,21 +43,6 @@ force_color () {
        )
 }
 
-test_expect_success 'warn about add.interactive.useBuiltin' '
-       cat >expect <<-\EOF &&
-       warning: the add.interactive.useBuiltin setting has been removed!
-       See its entry in '\''git help config'\'' for details.
-       EOF
-       echo "No changes." >expect.out &&
-
-       for v in = =true =false
-       do
-               git -c "add.interactive.useBuiltin$v" add -p >out 2>actual &&
-               test_cmp expect.out out &&
-               test_cmp expect actual || return 1
-       done
-'
-
 test_expect_success 'unknown command' '
        test_when_finished "git reset --hard; rm -f command" &&
        echo W >command &&