From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Mar 2020 00:11:21 +0000 (-0700)
Subject: Merge branch 'tg/retire-scripted-stash'
X-Git-Tag: v2.27.0-rc0~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=369ae7567a4621aa81e5c4decc27715418564ac2;p=thirdparty%2Fgit.git

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
---

369ae7567a4621aa81e5c4decc27715418564ac2
diff --cc builtin/stash.c
index 78af6ce564,ba908a6834..6d586ef06d
--- a/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;