summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-27 00:11:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-27 00:11:21 (GMT)
commit369ae7567a4621aa81e5c4decc27715418564ac2 (patch)
treed4dd295e54d529f1979b3290533b415326f0dcbd /t
parent0f0625a630081d532d528d87ba236a6385bbbac1 (diff)
parent8a2cd3f5123ac822fd64ca8efc4f84e122a1edb3 (diff)
downloadgit-369ae7567a4621aa81e5c4decc27715418564ac2.zip
git-369ae7567a4621aa81e5c4decc27715418564ac2.tar.gz
git-369ae7567a4621aa81e5c4decc27715418564ac2.tar.bz2
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
Diffstat (limited to 't')
-rw-r--r--t/README4
-rwxr-xr-xt/t3903-stash.sh14
2 files changed, 14 insertions, 4 deletions
diff --git a/t/README b/t/README
index 9afd61e..369e3a9 100644
--- a/t/README
+++ b/t/README
@@ -393,10 +393,6 @@ the --no-sparse command-line argument.
GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
by overriding the minimum number of cache entries required per thread.
-GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the
-built-in version of git-stash. See 'stash.useBuiltin' in
-git-config(1).
-
GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
built-in version of git add -i. See 'add.interactive.useBuiltin' in
git-config(1).
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 3ad23e2..9f7ca98 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1290,4 +1290,18 @@ test_expect_success 'stash handles skip-worktree entries nicely' '
git rev-parse --verify refs/stash:A.t
'
+test_expect_success 'stash -c stash.useBuiltin=false warning ' '
+ expected="stash.useBuiltin support has been removed" &&
+
+ git -c stash.useBuiltin=false stash 2>err &&
+ test_i18ngrep "$expected" err &&
+ env GIT_TEST_STASH_USE_BUILTIN=false git stash 2>err &&
+ test_i18ngrep "$expected" err &&
+
+ git -c stash.useBuiltin=true stash 2>err &&
+ test_must_be_empty err &&
+ env GIT_TEST_STASH_USE_BUILTIN=true git stash 2>err &&
+ test_must_be_empty err
+'
+
test_done