Address reviewer feedback on HTTP/1.1 URL settings

Co-authored-by: dscho <[email protected]>

Author: Copilot

scalar.c

@@ -232,27 +232,30 @@ static int set_recommended_config(int reconfigure)
 
 	/*
 	 * Set HTTP/1.1 for Azure DevOps URLs
+	 * We check for dev.azure.com and .visualstudio.com/ patterns
+	 * which are sufficient to identify ADO URLs
 	 */
 	if (!git_config_get_string("remote.origin.url", &value)) {
-		if (strstr(value, "dev.azure.com") || 
-		    strstr(value, "visualstudio.com")) {
+		if (starts_with(value, "https://dev.azure.com") || 
+		    strstr(value, ".visualstudio.com/")) {
 			struct strbuf key = STRBUF_INIT;
 			strbuf_addf(&key, "http.%s.version", value);
+			char *original_value = value;
 
 			if (reconfigure || git_config_get_string(key.buf, &value)) {
 				trace2_data_string("scalar", the_repository, key.buf, "created");
 				if (git_config_set_gently(key.buf, "HTTP/1.1") < 0) {
-					free(value);
+					free(original_value);
 					strbuf_release(&key);
 					return error(_("could not configure %s=%s"),
 						     key.buf, "HTTP/1.1");
 				}
-			} else {
-				trace2_data_string("scalar", the_repository, key.buf, "exists");
 			}
 			strbuf_release(&key);
+			FREE_AND_NULL(original_value);
+		} else {
+			free(value);
 		}
-		free(value);
 	}
 
 	/*

t/t9210-scalar.sh

@@ -248,39 +248,26 @@ test_expect_success 'scalar reconfigure --all with detached HEADs' '
 '
 
 test_expect_success 'verify http.<url>.version=HTTP/1.1 for ADO URLs' '
-	test_when_finished rm -rf ado-test &&
+	test_when_finished rm -rf test-http-url-config &&
 	
 	# Create a test repository
-	git init ado-test &&
+	git init test-http-url-config &&
 	
-	# Set ADO URL as remote
-	git -C ado-test remote add origin https://dev.azure.com/test/project/_git/repo &&
-	
-	# Run scalar reconfigure
-	scalar reconfigure ado-test &&
-	
-	# Verify URL-specific HTTP version setting
-	git -C ado-test config "http.https://dev.azure.com/test/project/_git/repo.version" >actual &&
-	echo "HTTP/1.1" >expect &&
-	test_cmp expect actual
-'
-
-test_expect_success 'verify http.<url>.version=HTTP/1.1 for visualstudio.com URLs' '
-	test_when_finished rm -rf vso-test &&
-	
-	# Create a test repository
-	git init vso-test &&
-	
-	# Set VSO URL as remote
-	git -C vso-test remote add origin https://contoso.visualstudio.com/project/_git/repo &&
-	
-	# Run scalar reconfigure
-	scalar reconfigure vso-test &&
-	
-	# Verify URL-specific HTTP version setting
-	git -C vso-test config "http.https://contoso.visualstudio.com/project/_git/repo.version" >actual &&
-	echo "HTTP/1.1" >expect &&
-	test_cmp expect actual
+	# Test both URL types in a loop
+	for url in "https://dev.azure.com/test/project/_git/repo" \
+		   "https://contoso.visualstudio.com/project/_git/repo"
+	do
+		# Set URL as remote
+		git -C test-http-url-config remote set-url origin "$url" &&
+		
+		# Run scalar reconfigure
+		scalar reconfigure test-http-url-config &&
+		
+		# Verify URL-specific HTTP version setting
+		git -C test-http-url-config config "http.$url.version" >actual &&
+		echo "HTTP/1.1" >expect &&
+		test_cmp expect actual
+	done
 '
 
 test_expect_success '`reconfigure -a` removes stale config entries' '
@@ -422,40 +409,11 @@ test_expect_success '`scalar clone` with GVFS-enabled server' '
 	git -C using-gvfs/src config gvfs.sharedCache >actual &&
 	test_cmp expect actual &&
 	
-test_expect_success 'verify http.<url>.version=HTTP/1.1 for ADO URLs' '
-	test_when_finished rm -rf ado-test &&
-	
-	# Create a test repository
-	git init ado-test &&
-	
-	# Set ADO URL as remote
-	git -C ado-test remote add origin https://dev.azure.com/test/project/_git/repo &&
-	
-	# Run scalar reconfigure
-	scalar reconfigure ado-test &&
-	
-	# Verify URL-specific HTTP version setting
-	git -C ado-test config "http.https://dev.azure.com/test/project/_git/repo.version" >actual &&
+	: verify that URL-specific HTTP version setting is configured for GVFS URLs in clone &&
+	git -C using-gvfs/src config "http.http://$HOST_PORT/.version" >actual &&
 	echo "HTTP/1.1" >expect &&
-	test_cmp expect actual
-'
-
-test_expect_success 'verify http.<url>.version=HTTP/1.1 for visualstudio.com URLs' '
-	test_when_finished rm -rf vso-test &&
-	
-	# Create a test repository
-	git init vso-test &&
-	
-	# Set VSO URL as remote
-	git -C vso-test remote add origin https://contoso.visualstudio.com/project/_git/repo &&
-	
-	# Run scalar reconfigure
-	scalar reconfigure vso-test &&
+	test_cmp expect actual &&
 	
-	# Verify URL-specific HTTP version setting
-	git -C vso-test config "http.https://contoso.visualstudio.com/project/_git/repo.version" >actual &&
-	echo "HTTP/1.1" >expect &&
-	test_cmp expect actual
 '
 
 	second=$(git rev-parse --verify second:second.t) &&
@@ -464,41 +422,6 @@ test_expect_success 'verify http.<url>.version=HTTP/1.1 for visualstudio.com URL
 		test_path_is_missing 1/2 &&
 		GIT_TRACE=$PWD/trace.txt git cat-file blob $second >actual &&
 		: verify that the gvfs-helper was invoked to fetch it &&
-		test_grep gvfs-helper trace.txt &&
-		echo "second" >expect &&
-		test_cmp expect actual
-	)
-'
-
-test_expect_success '`scalar clone --no-gvfs-protocol` skips gvfs/config' '
-	# the fake cache server requires fake authentication &&
-	git config --global core.askPass true &&
-
-	# We must set credential.interactive=true to bypass a setting
-	# in "scalar clone" that disables interactive credentials during
-	# an unattended command.
-	GIT_TRACE2_EVENT="$(pwd)/clone-trace-no-gvfs" scalar \
-		-c credential.interactive=true \
-		clone --no-gvfs-protocol \
-		--single-branch -- http://$HOST_PORT/ skipping-gvfs &&
-
-	! grep "GET/config(main)" <clone-trace-no-gvfs &&
-	! git -C skipping-gvfs/src config core.gvfs &&
-
-	test_config -C skipping-gvfs/src remote.origin.partialclonefilter blob:none
-'
-
-test_expect_success '`scalar register` parallel to worktree is unsupported' '
-	git init test-repo/src &&
-	mkdir -p test-repo/out &&
-
-	: parallel to worktree is unsupported &&
-	test_must_fail env GIT_CEILING_DIRECTORIES="$(pwd)" \
-		scalar register test-repo/out &&
-	test_must_fail git config --get --global --fixed-value \
-		maintenance.repo "$(pwd)/test-repo/src" &&
-	scalar list >scalar.repos &&
-	! grep -F "$(pwd)/test-repo/src" scalar.repos &&
 
 	: at enlistment root, i.e. parent of repository, is supported &&
 	GIT_CEILING_DIRECTORIES="$(pwd)" scalar register test-repo &&