Merge branch 'tg/retire-scripted-stash'

"git stash" has kept an escape hatch to use the scripted version
for a few releases, which got stale.  It has been removed.

* tg/retire-scripted-stash:
  stash: remove the stash.useBuiltin setting
  stash: get git_stash_config at the top level

diff --cc Makefile
Simple merge

diff --cc builtin/stash.c
index 78af6ce56431a5b1a8eac311d8a33d2c702ee8ba,ba908a683473ec3f5bec7244b66163926967ce84..6d586ef06dfd6e243053c3c7cda86b81fd5a3ddb
--- 1/builtin/stash.c
--- 2/builtin/stash.c
+++ b/builtin/stash.c
@@@ -1559,31 -1529,9 +1563,8 @@@ static int save_stash(int argc, const c
        return ret;
  }
  
- static int use_builtin_stash(void)
- {
-       struct child_process cp = CHILD_PROCESS_INIT;
-       struct strbuf out = STRBUF_INIT;
-       int ret, env = git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1);
- 
-       if (env != -1)
-               return env;
- 
-       argv_array_pushl(&cp.args,
-                        "config", "--bool", "stash.usebuiltin", NULL);
-       cp.git_cmd = 1;
-       if (capture_command(&cp, &out, 6)) {
-               strbuf_release(&out);
-               return 1;
-       }
- 
-       strbuf_trim(&out);
-       ret = !strcmp("true", out.buf);
-       strbuf_release(&out);
-       return ret;
- }
- 
  int cmd_stash(int argc, const char **argv, const char *prefix)
  {
 -      int i = -1;
        pid_t pid = getpid();
        const char *index_file;
        struct argv_array args = ARGV_ARRAY_INIT;

diff --cc t/t3903-stash.sh
Simple merge