Fix git ptest with new git config syntax (microsoft#14342)

Author: archana25-ms

SPECS/git/Ptest-fix-git-config-syntax.patch

@@ -0,0 +1,46 @@
+From 5415cf267c1b5a4ef9591e11106085bc24b7131b Mon Sep 17 00:00:00 2001
+From: archana25-ms <[email protected]>
+Date: Thu, 17 Jul 2025 17:21:37 +0000
+Subject: [PATCH] Fix  git config syntax
+Upstream Patch reference: https://lkml.org/lkml/2025/7/8/1608
+
+---
+ t/t1300-config.sh           | 4 ++--
+ t/t7450-bad-git-dotfiles.sh | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/t/t1300-config.sh b/t/t1300-config.sh
+index 00f34c5..3ed4a0b 100755
+--- a/t/t1300-config.sh
++++ b/t/t1300-config.sh
+@@ -2743,8 +2743,8 @@ test_expect_success 'writing value with trailing CR not stripped on read' '
+ 
+ 	printf "bar\r\n" >expect &&
+ 	git init cr-test &&
+-	git -C cr-test config set core.foo $(printf "bar\r") &&
+-	git -C cr-test config get core.foo >actual &&
++	git -C cr-test config core.foo $(printf "bar\r") &&
++	git -C cr-test config --get core.foo >actual &&
+ 
+ 	test_cmp expect actual
+ '
+diff --git a/t/t7450-bad-git-dotfiles.sh b/t/t7450-bad-git-dotfiles.sh
+index ff63c05..38b9db8 100755
+--- a/t/t7450-bad-git-dotfiles.sh
++++ b/t/t7450-bad-git-dotfiles.sh
+@@ -388,10 +388,10 @@ test_expect_success SYMLINKS,!WINDOWS,!MINGW 'submodule must not checkout into d
+ 	git -C repo mv sub $(printf "sub\r") &&
+ 
+ 	# Ensure config values containing CR are wrapped in quotes.
+-	git config unset -f repo/.gitmodules submodule.sub.path &&
++	git config --unset -f repo/.gitmodules submodule.sub.path &&
+ 	printf "\tpath = \"sub\r\"\n" >>repo/.gitmodules &&
+ 
+-	git config unset -f repo/.git/modules/sub/config core.worktree &&
++	git config --unset -f repo/.git/modules/sub/config core.worktree &&
+ 	{
+ 		printf "[core]\n" &&
+ 		printf "\tworktree = \"../../../sub\r\"\n"
+-- 
+2.45.3
+

SPECS/git/git.spec

@@ -7,13 +7,15 @@
 Summary:        Fast distributed version control system
 Name:           git
 Version:        2.45.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Group:          System Environment/Programming
 URL:            https://git-scm.com/
 Source0:        https://github.com/git/git/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# Below patch not needed for Git 2.46.0, already includes this fix.
+Patch0:         Ptest-fix-git-config-syntax.patch
 BuildRequires:  curl-devel
 BuildRequires:  python3-devel
 Requires:       curl
@@ -106,7 +108,7 @@ BuildArch:      noarch
 %endif
 
 %prep
-%autosetup
+%autosetup -p1
 %{py3_shebang_fix} git-p4.py
 
 %build
@@ -173,6 +175,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 18 2025 Archana Shettigar <[email protected]> - 2.45.4-2
+- Fix ptest with new git config syntax in CVE-2025-48384
+
 * Fri Jul 11 2025 Archana Shettigar <[email protected]> - 2.45.4-1
 - Upgrade to 2.45.4 - CVE-2025-48384, CVE-2025-48385, CVE-2025-27613 & CVE-2025-27614