Skip to content

Commit e7b9ddf

Browse files
Copilotdschoderrickstolee
committed
scalar: work around GVFS Protocol HTTP/2 failures
Work around failures when using the GVFS Protocol with Azure DevOps URLs (dev.azure.com and *.visualstudio.com) due to incomplete HTTP/2 support on the server side. Configure http.<url>.version=HTTP/1.1 for these remotes when setting up or reconfiguring a Scalar enlistment. This ensures that Scalar and GVFS continue to function correctly with Azure-hosted repositories, without affecting other remotes. This fixes #752 Co-authored-by: Johannes Schindelin <[email protected]> Co-authored-by: Derrick Stolee <[email protected]> Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 5360246 commit e7b9ddf

File tree

2 files changed

+57
-2
lines changed

2 files changed

+57
-2
lines changed

scalar.c

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,33 @@ static int set_recommended_config(int reconfigure)
213213
fsmonitor.key, fsmonitor.value);
214214
}
215215

216+
/*
217+
* Set HTTP/1.1 for Azure DevOps URLs
218+
* We check for dev.azure.com/ and .visualstudio.com/ patterns
219+
* which are sufficient to identify ADO URLs (including formats like
220+
* https://[email protected]/...)
221+
*/
222+
if (!git_config_get_string("remote.origin.url", &value)) {
223+
if (starts_with(value, "https://dev.azure.com/") ||
224+
strstr(value, "@dev.azure.com/") ||
225+
strstr(value, ".visualstudio.com/")) {
226+
struct strbuf key = STRBUF_INIT;
227+
strbuf_addf(&key, "http.%s.version", value);
228+
FREE_AND_NULL(value);
229+
230+
if (reconfigure || git_config_get_string(key.buf, &value)) {
231+
trace2_data_string("scalar", the_repository, key.buf, "created");
232+
if (git_config_set_gently(key.buf, "HTTP/1.1") < 0) {
233+
strbuf_release(&key);
234+
return error(_("could not configure %s=%s"),
235+
key.buf, "HTTP/1.1");
236+
}
237+
}
238+
strbuf_release(&key);
239+
}
240+
FREE_AND_NULL(value);
241+
}
242+
216243
/*
217244
* The `log.excludeDecoration` setting is special because it allows
218245
* for multiple values.
@@ -848,7 +875,7 @@ static int cmd_clone(int argc, const char **argv)
848875
/* Is --[no-]gvfs-protocol unspecified? Infer from url. */
849876
if (gvfs_protocol < 0) {
850877
if (cache_server_url ||
851-
strstr(url, "dev.azure.com") ||
878+
strstr(url, "dev.azure.com/") ||
852879
strstr(url, "visualstudio.com"))
853880
gvfs_protocol = 1;
854881
else
@@ -865,7 +892,7 @@ static int cmd_clone(int argc, const char **argv)
865892
cache_server_url = default_cache_server_url;
866893
if (set_config("core.useGVFSHelper=true") ||
867894
set_config("core.gvfs=150") ||
868-
set_config("http.version=HTTP/1.1")) {
895+
set_config("http.%s.version=HTTP/1.1", url)) {
869896
res = error(_("could not turn on GVFS helper"));
870897
goto cleanup;
871898
}

t/t9210-scalar.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,29 @@ test_expect_success 'scalar reconfigure --all with detached HEADs' '
247247
done
248248
'
249249

250+
test_expect_success 'verify http.<url>.version=HTTP/1.1 for ADO URLs' '
251+
test_when_finished rm -rf test-http-url-config &&
252+
253+
# Create a test repository
254+
git init test-http-url-config &&
255+
256+
# Test both URL types
257+
for url in "https://[email protected]/test/project/_git/repo" \
258+
"https://contoso.visualstudio.com/project/_git/repo"
259+
do
260+
# Set URL as remote
261+
git -C test-http-url-config config set remote.origin.url "$url" &&
262+
263+
# Run scalar reconfigure
264+
scalar reconfigure test-http-url-config &&
265+
266+
# Verify URL-specific HTTP version setting
267+
git -C test-http-url-config config "http.$url.version" >actual &&
268+
echo "HTTP/1.1" >expect &&
269+
test_cmp expect actual || return 1
270+
done
271+
'
272+
250273
test_expect_success '`reconfigure -a` removes stale config entries' '
251274
git init stale/src &&
252275
scalar register stale &&
@@ -386,6 +409,11 @@ test_expect_success '`scalar clone` with GVFS-enabled server' '
386409
git -C using-gvfs/src config gvfs.sharedCache >actual &&
387410
test_cmp expect actual &&
388411
412+
: verify that URL-specific HTTP version setting is configured for GVFS URLs in clone &&
413+
git -C using-gvfs/src config "http.http://$HOST_PORT/.version" >actual &&
414+
echo "HTTP/1.1" >expect &&
415+
test_cmp expect actual &&
416+
389417
second=$(git rev-parse --verify second:second.t) &&
390418
(
391419
cd using-gvfs/src &&

0 commit comments

Comments
 (0)