summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2020-03-03 17:46:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-05 20:50:28 (GMT)
commit8a2cd3f5123ac822fd64ca8efc4f84e122a1edb3 (patch)
treed76ddb3ec284195b4e62814f5346ddfc732d116e /git.c
parentb0c7362d19a83d45798085f26d98e39c9268e7e5 (diff)
downloadgit-8a2cd3f5123ac822fd64ca8efc4f84e122a1edb3.zip
git-8a2cd3f5123ac822fd64ca8efc4f84e122a1edb3.tar.gz
git-8a2cd3f5123ac822fd64ca8efc4f84e122a1edb3.tar.bz2
stash: remove the stash.useBuiltin setting
Remove the stash.useBuiltin setting which was added as an escape hatch to disable the builtin version of stash first released with Git 2.22. Carrying the legacy version is a maintenance burden, and has in fact become out of date failing a test since the 2.23 release, without anyone noticing until now. So users would be getting a hint to fall back to a potentially buggy version of the tool. We used to shell out to git config to get the useBuiltin configuration to avoid changing any global state before spawning legacy-stash. However that is no longer necessary, so just use the 'git_config' function to get the setting instead. Similar to what we've done in d03ebd411c ("rebase: remove the rebase.useBuiltin setting", 2019-03-18), where we remove the corresponding setting for rebase, we leave the documentation in place, so people can refer back to it when searching for it online, and so we can refer to it in the commit message. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/git.c b/git.c
index 7be7ad3..b07198f 100644
--- a/git.c
+++ b/git.c
@@ -574,12 +574,7 @@ static struct cmd_struct commands[] = {
{ "show-ref", cmd_show_ref, RUN_SETUP },
{ "sparse-checkout", cmd_sparse_checkout, RUN_SETUP | NEED_WORK_TREE },
{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
- /*
- * NEEDSWORK: Until the builtin stash is thoroughly robust and no
- * longer needs redirection to the stash shell script this is kept as
- * is, then should be changed to RUN_SETUP | NEED_WORK_TREE
- */
- { "stash", cmd_stash },
+ { "stash", cmd_stash, RUN_SETUP | NEED_WORK_TREE },
{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
{ "stripspace", cmd_stripspace },
{ "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX | NO_PARSEOPT },