diff --git a/git-2.41.0.tar.xz b/git-2.47.1.tar.xz
similarity index 48%
rename from git-2.41.0.tar.xz
rename to git-2.47.1.tar.xz
index 7e3df8c98ef531bd8cfbe5b7bfaa6735ba8bc5d0..20c12a0e78f4c6aea14f81ec942963571d787197 100644
Binary files a/git-2.41.0.tar.xz and b/git-2.47.1.tar.xz differ
diff --git a/git-test-apache-davlockdbtype-config.patch b/git-test-apache-davlockdbtype-config.patch
new file mode 100644
index 0000000000000000000000000000000000000000..882006a87c3be674d8b897a8e17e2248f28a7dfe
--- /dev/null
+++ b/git-test-apache-davlockdbtype-config.patch
@@ -0,0 +1,14 @@
+diff -ur b/t/lib-httpd/apache.conf a/t/lib-httpd/apache.conf
+--- b/t/lib-httpd/apache.conf	2024-01-09 11:06:46.660868023 +0100
++++ a/t/lib-httpd/apache.conf	2024-01-09 11:09:09.572713625 +0100
+@@ -272,7 +272,9 @@
+ <IfDefine DAV>
+ 	LoadModule dav_module modules/mod_dav.so
+ 	LoadModule dav_fs_module modules/mod_dav_fs.so
+-
++	<IfDirective DavLockDBType>
++   		DavLockDBType sdbm
++	</IfDirective>
+ 	DAVLockDB DAVLock
+ 	<Location /dumb/>
+ 		Dav on
diff --git a/git.spec b/git.spec
index 1ee6ed6f867574da75279d635b1821b69a6fa75f..50d949de848320c48ee6ab6287afc230f537a787 100644
--- a/git.spec
+++ b/git.spec
@@ -17,10 +17,10 @@
 %global _package_note_file  %{_builddir}/%{name}-%{version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
 
 Name:           git
-Version:        2.41.0
+Version:        2.47.1
 Release:        %{anolis_release}%{?dist}
 Summary:        Distributed version control system
-License:        GPLv2
+License:        BSD-3-Clause AND GPLv2 AND LGPL-2.1-or-later AND MIT
 URL:            https://git-scm.com/
 Source0:        https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
 Source1:        git.xinetd.in
@@ -35,6 +35,7 @@ Patch0:         git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
 Patch1:         0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
 Patch2:         0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
 Patch3:         0003-t-lib-git-svn-try-harder-to-find-a-port.patch
+Patch4:         git-test-apache-davlockdbtype-config.patch
 
 %if %{with docs}
 BuildRequires:  /usr/bin/pod2man
@@ -364,9 +365,6 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null)
 
 rm -rf contrib/fast-import/import-zips.py
 
-sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
-    contrib/hg-to-git/hg-to-git.py
-
 %install
 
 %make_install %{?with_docs:install-doc}
@@ -685,6 +683,13 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 
 
 %changelog
+* Thu Mar 13 2025 mgb01105731 <mgb01105731@alibaba-inc.com> - 2.47.1-1
+- Update to 2.47.1 from 2.41.0
+- update license data and convert to SPDX format
+- Add patches to fix failing on tests using git-httpd-push
+  [Patches cherry-pick from c10s. Original changelog:
+  - update to 2.47.1(2.47.1-1)]
+
 * Sat Jul 15 2023 Funda Wang <fundawang@yeah.net> - 2.41.0-1
 - New verison 2.41.0