Skip to content

Commit

Permalink
add-i: finally retire add.interactive.useBuiltin
Browse files Browse the repository at this point in the history
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 <[email protected]>
               ---
 Documentation/config/add.txt |  6 ------
 builtin/add.c                |  6 +-----
 t/t3701-add-interactive.sh   | 15 ---------------
 3 files changed, 1 insertion(+), 26 deletions(-)
  • Loading branch information
gitster committed Jun 5, 2024
1 parent 7b0defb commit a74c068
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 26 deletions.
6 changes: 0 additions & 6 deletions Documentation/config/add.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 1 addition & 5 deletions builtin/add.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
15 changes: 0 additions & 15 deletions t/t3701-add-interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit a74c068

Please sign in to comment.