stash: stop warning about the obsolete `stash.useBuiltin` config setting
In 8a2cd3f5123 (stash: remove the stash.useBuiltin setting, 2020-03-03), we removed support for `stash.useBuiltin`, but left a warning in its place. After almost two years, and several major versions, it is time to remove even that warning. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 27, 2022 at 22:03 UTC
e9b272e4c1cb9742452ad44d42cedd407b6b5de2
2 files changed
-25
builtin/stash.c
-10
@@ -788,7 +788,6 @@ static int list_stash(int argc, const char **argv, const char *prefix)
788
static int show_stat = 1;
789
static int show_patch;
790
static int show_include_untracked;
791
-static int use_legacy_stash;
791
792
static int git_stash_config(const char *var, const char *value, void *cb)
793
{
@@ -804,10 +803,6 @@ static int git_stash_config(const char *var, const char *value, void *cb)
803
show_include_untracked = git_config_bool(var, value);
804
return 0;
805
}
807
- if (!strcmp(var, "stash.usebuiltin")) {
808
- use_legacy_stash = !git_config_bool(var, value);
809
- return 0;
810
- }
806
return git_diff_basic_config(var, value, cb);
807
}
808
@@ -1778,11 +1773,6 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
1773
1774
git_config(git_stash_config, NULL);
1775
1781
- if (use_legacy_stash ||
1782
- !git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1))
1783
- warning(_("the stash.useBuiltin support has been removed!\n"
1784
- "See its entry in 'git help config' for details."));
1785
-
1776
argc = parse_options(argc, argv, prefix, options, git_stash_usage,
1777
PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
1778
t/t3903-stash.sh
-15
@@ -1272,7 +1272,6 @@ test_expect_success 'stash works when user.name and user.email are not set' '
1272
>2 &&
1273
git add 2 &&
1274
test_config user.useconfigonly true &&
1275
- test_config stash.usebuiltin true &&
1275
(
1276
sane_unset GIT_AUTHOR_NAME &&
1277
sane_unset GIT_AUTHOR_EMAIL &&
@@ -1323,20 +1322,6 @@ test_expect_success 'stash handles skip-worktree entries nicely' '
1322
git rev-parse --verify refs/stash:A.t
1323
'
1324
1326
-test_expect_success 'stash -c stash.useBuiltin=false warning ' '
1327
- expected="stash.useBuiltin support has been removed" &&
1328
-
1329
- git -c stash.useBuiltin=false stash 2>err &&
1330
- test_i18ngrep "$expected" err &&
1331
- env GIT_TEST_STASH_USE_BUILTIN=false git stash 2>err &&
1332
- test_i18ngrep "$expected" err &&
1333
-
1334
- git -c stash.useBuiltin=true stash 2>err &&
1335
- test_must_be_empty err &&
1336
- env GIT_TEST_STASH_USE_BUILTIN=true git stash 2>err &&
1337
- test_must_be_empty err
1338
-'
1339
-
1325
test_expect_success 'git stash succeeds despite directory/file change' '
1326
test_create_repo directory_file_switch_v1 &&
1327
(