diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-16 15:14:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-16 15:14:30 -0800 |
| commit | b9f791aee653932e87d558e5fd841d3394c70727 (patch) | |
| tree | f78186e1ddb790236acb59c01077921663272f18 /builtin/stash.c | |
| parent | 9a160990ef3a16fab8d54752d0d9b981d15b00c5 (diff) | |
| parent | e9b272e4c1cb9742452ad44d42cedd407b6b5de2 (diff) | |
| download | git-b9f791aee653932e87d558e5fd841d3394c70727.tar.gz | |
Merge branch 'js/no-more-legacy-stash'
Removal of unused code and doc.
* js/no-more-legacy-stash:
stash: stop warning about the obsolete `stash.useBuiltin` config setting
stash: remove documentation for `stash.useBuiltin`
add: remove support for `git-legacy-stash`
git-sh-setup: remove remnant bits referring to `git-legacy-stash`
Diffstat (limited to 'builtin/stash.c')
| -rw-r--r-- | builtin/stash.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 9638c56303..5897febfbe 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -788,7 +788,6 @@ static int list_stash(int argc, const char **argv, const char *prefix) static int show_stat = 1; static int show_patch; static int show_include_untracked; -static int use_legacy_stash; static int git_stash_config(const char *var, const char *value, void *cb) { @@ -804,10 +803,6 @@ static int git_stash_config(const char *var, const char *value, void *cb) show_include_untracked = git_config_bool(var, value); return 0; } - if (!strcmp(var, "stash.usebuiltin")) { - use_legacy_stash = !git_config_bool(var, value); - return 0; - } return git_diff_basic_config(var, value, cb); } @@ -1782,11 +1777,6 @@ int cmd_stash(int argc, const char **argv, const char *prefix) git_config(git_stash_config, NULL); - if (use_legacy_stash || - !git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1)) - warning(_("the stash.useBuiltin support has been removed!\n" - "See its entry in 'git help config' for details.")); - argc = parse_options(argc, argv, prefix, options, git_stash_usage, PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH); |