Skip to content

Commit e9b272e

Browse files
dschogitster
authored andcommitted
stash: stop warning about the obsolete stash.useBuiltin config setting
In 8a2cd3f (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent deeaf5e commit e9b272e

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

builtin/stash.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,6 @@ static int list_stash(int argc, const char **argv, const char *prefix)
788788
static int show_stat = 1;
789789
static int show_patch;
790790
static int show_include_untracked;
791-
static int use_legacy_stash;
792791

793792
static int git_stash_config(const char *var, const char *value, void *cb)
794793
{
@@ -804,10 +803,6 @@ static int git_stash_config(const char *var, const char *value, void *cb)
804803
show_include_untracked = git_config_bool(var, value);
805804
return 0;
806805
}
807-
if (!strcmp(var, "stash.usebuiltin")) {
808-
use_legacy_stash = !git_config_bool(var, value);
809-
return 0;
810-
}
811806
return git_diff_basic_config(var, value, cb);
812807
}
813808

@@ -1778,11 +1773,6 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
17781773

17791774
git_config(git_stash_config, NULL);
17801775

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-
17861776
argc = parse_options(argc, argv, prefix, options, git_stash_usage,
17871777
PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
17881778

t/t3903-stash.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,6 @@ test_expect_success 'stash works when user.name and user.email are not set' '
12721272
>2 &&
12731273
git add 2 &&
12741274
test_config user.useconfigonly true &&
1275-
test_config stash.usebuiltin true &&
12761275
(
12771276
sane_unset GIT_AUTHOR_NAME &&
12781277
sane_unset GIT_AUTHOR_EMAIL &&
@@ -1323,20 +1322,6 @@ test_expect_success 'stash handles skip-worktree entries nicely' '
13231322
git rev-parse --verify refs/stash:A.t
13241323
'
13251324

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-
13401325
test_expect_success 'git stash succeeds despite directory/file change' '
13411326
test_create_repo directory_file_switch_v1 &&
13421327
(

0 commit comments

Comments
 (0)