Skip to content

Commit 8676615

Browse files
committed
fixup! scalar: do initialize gvfs.sharedCache
In this commit, we added the 'credential.interactive=never' option to unattended scalar options. This should be changed to 'false' to match the modern use of this config option. But also, we have a test that requires using askpass to get credentials, but the test is in unattended mode. Fix that test to include 'credential.interactive=true' to bypass this issue.
1 parent b162779 commit 8676615

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

scalar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ int cmd_main(int argc, const char **argv)
14031403
if (is_unattended()) {
14041404
setenv("GIT_ASKPASS", "", 0);
14051405
setenv("GIT_TERMINAL_PROMPT", "false", 0);
1406-
git_config_push_parameter("credential.interactive=never");
1406+
git_config_push_parameter("credential.interactive=false");
14071407
}
14081408

14091409
while (argc > 1 && *argv[1] == '-') {

t/t9210-scalar.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,11 @@ test_expect_success 'start GVFS-enabled server' '
301301
test_expect_success '`scalar clone` with GVFS-enabled server' '
302302
: the fake cache server requires fake authentication &&
303303
git config --global core.askPass true &&
304-
scalar clone --single-branch -- http://$HOST_PORT/ using-gvfs &&
304+
305+
# We must set credential.interactive=true to bypass a setting
306+
# in "scalar clone" that disables interactive credentials during
307+
# an unattended command.
308+
scalar -c credential.interactive=true clone --single-branch -- http://$HOST_PORT/ using-gvfs &&
305309
306310
: verify that the shared cache has been configured &&
307311
cache_key="url_$(printf "%s" http://$HOST_PORT/ |

0 commit comments

Comments
 (0)