From a44130e323993d1268f6d0e84909baddba37232a Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Mon, 23 Dec 2024 14:07:46 +0800 Subject: [PATCH 1/2] [BUG]update to git-2.43.5-2 to #IBD2NN update to git-2.43.5-2 for bugfix Signed-off-by: Zhao Hang --- git-2.43.0-slow-shallow-clones.patch | 115 +++++++++++++++++++++++++++ git.spec | 38 ++++----- 2 files changed, 129 insertions(+), 24 deletions(-) create mode 100644 git-2.43.0-slow-shallow-clones.patch diff --git a/git-2.43.0-slow-shallow-clones.patch b/git-2.43.0-slow-shallow-clones.patch new file mode 100644 index 0000000..6d1779d --- /dev/null +++ b/git-2.43.0-slow-shallow-clones.patch @@ -0,0 +1,115 @@ +From 51441e6460b505c07b4a8a6deeaa7de4bf6e8e33 Mon Sep 17 00:00:00 2001 +From: Junio C Hamano +Date: Fri, 3 May 2024 08:34:27 -0700 +Subject: [PATCH] stop using HEAD for attributes in bare repository by default + +With 23865355 (attr: read attributes from HEAD when bare repo, +2023-10-13), we started to use the HEAD tree as the default +attribute source in a bare repository. One argument for such a +behaviour is that it would make things like "git archive" run in +bare and non-bare repositories for the same commit consistent. +This changes was merged to Git 2.43 but without an explicit mention +in its release notes. + +It turns out that this change destroys performance of shallowly +cloning from a bare repository. As the "server" installations are +expected to be mostly bare, and "git pack-objects", which is the +core of driving the other side of "git clone" and "git fetch" wants +to see if a path is set not to delta with blobs from other paths via +the attribute system, the change forces the server side to traverse +the tree of the HEAD commit needlessly to find if each and every +paths the objects it sends out has the attribute that controls the +deltification. Given that (1) most projects do not configure such +an attribute, and (2) it is dubious for the server side to honor +such an end-user supplied attribute anyway, this was a poor choice +of the default. + +To mitigate the current situation, let's revert the change that uses +the tree of HEAD in a bare repository by default as the attribute +source. This will help most people who have been happy with the +behaviour of Git 2.42 and before. + +Two things to note: + + * If you are stuck with versions of Git 2.43 or newer, that is + older than the release this fix appears in, you can explicitly + set the attr.tree configuration variable to point at an empty + tree object, i.e. + + $ git config attr.tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904 + + * If you like the behaviour we are reverting, you can explicitly + set the attr.tree configuration variable to HEAD, i.e. + + $ git config attr.tree HEAD + +The right fix for this is to optimize the code paths that allow +accesses to attributes in tree objects, but that is a much more +involved change and is left as a longer-term project, outside the +scope of this "first step" fix. + +Signed-off-by: Junio C Hamano +--- + attr.c | 7 ------- + t/t0003-attributes.sh | 10 ++++++++-- + t/t5001-archive-attr.sh | 3 ++- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/attr.c b/attr.c +index e62876dfd3e9be..02ab8436266289 100644 +--- a/attr.c ++++ b/attr.c +@@ -1213,13 +1213,6 @@ static void compute_default_attr_source(struct object_id *attr_source) + ignore_bad_attr_tree = 1; + } + +- if (!default_attr_source_tree_object_name && +- startup_info->have_repository && +- is_bare_repository()) { +- default_attr_source_tree_object_name = "HEAD"; +- ignore_bad_attr_tree = 1; +- } +- + if (!default_attr_source_tree_object_name || !is_null_oid(attr_source)) + return; + +diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh +index aee2298f01331a..5de46ddf67f7ff 100755 +--- a/t/t0003-attributes.sh ++++ b/t/t0003-attributes.sh +@@ -384,13 +384,19 @@ test_expect_success 'bad attr source defaults to reading .gitattributes file' ' + ) + ' + +-test_expect_success 'bare repo defaults to reading .gitattributes from HEAD' ' ++test_expect_success 'bare repo no longer defaults to reading .gitattributes from HEAD' ' + test_when_finished rm -rf test bare_with_gitattribute && + git init test && + test_commit -C test gitattributes .gitattributes "f/path test=val" && + git clone --bare test bare_with_gitattribute && +- echo "f/path: test: val" >expect && ++ ++ echo "f/path: test: unspecified" >expect && + git -C bare_with_gitattribute check-attr test -- f/path >actual && ++ test_cmp expect actual && ++ ++ echo "f/path: test: val" >expect && ++ git -C bare_with_gitattribute -c attr.tree=HEAD \ ++ check-attr test -- f/path >actual && + test_cmp expect actual + ' + +diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh +index eaf959d8f63f15..7310774af5efea 100755 +--- a/t/t5001-archive-attr.sh ++++ b/t/t5001-archive-attr.sh +@@ -133,7 +133,8 @@ test_expect_success 'git archive vs. bare' ' + ' + + test_expect_success 'git archive with worktree attributes, bare' ' +- (cd bare && git archive --worktree-attributes HEAD) >bare-worktree.tar && ++ (cd bare && ++ git -c attr.tree=HEAD archive --worktree-attributes HEAD) >bare-worktree.tar && + (mkdir bare-worktree && cd bare-worktree && "$TAR" xf -) - 2.43.5-1.0.1 -- Skip 6300.91 test on aarch64 - -* Wed Jun 05 2024 Ondřej Pohořelský - 2.43.5-1 -- Update to 2.43.5 -- Related: RHEL-36399, RHEL-36411 - -* Wed May 15 2024 Ondřej Pohořelský - 2.43.4-1 -- Update to 2.43.4 -- Resolves: RHEL-36399, RHEL-36411 +* Fri Nov 15 2024 Ondřej Pohořelský - 2.43.5-2 +- Sync version with the hotfix branch +- Related: RHEL-64984 + +* Thu Nov 14 2024 Ondřej Pohořelský - 2.43.0-2 +- Add fix for extremely slow shallow clones +- Repair t6300 on s390x +- Resolves: RHEL-64984 * Wed Dec 06 2023 Ondřej Pohořelský - 2.43.0-1 - Update to 2.43.0 -- Gitee From b003a2d2ac828d5012fcfc0781da790d5848cc37 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Wed, 24 May 2023 10:03:57 +0800 Subject: [PATCH 2/2] Skip some test on aarch64 --- git.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index fcdec6a..81e82b6 100644 --- a/git.spec +++ b/git.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # Pass --without docs to rpmbuild if you don't want the documentation %bcond_without docs @@ -93,7 +94,7 @@ Name: git Version: 2.43.5 -Release: 2%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{anolis_release}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -912,6 +913,18 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[5 %endif # endif rhel == 8 && arch == s390x +%if 0%{?rhel} == 8 && "%{_arch}" == "aarch64" +# Skip tests which fail on aarch64 on anolis-8 +# +# The following tests fail on aarch64 & an8. The cause should be investigated. +# However, it's a lower priority test. +# The failures seem to originate in t6300. +# +# t6300.91 'basic atom: tag objectsize:disk' +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t6300.91" +%endif +# endif rhel == 8 && arch == aarch64 + export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run @@ -1104,6 +1117,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Dec 24 2024 Chang Gao - 2.43.5-2.0.1 +- Skip 6300.91 test on aarch64 + * Fri Nov 15 2024 Ondřej Pohořelský - 2.43.5-2 - Sync version with the hotfix branch - Related: RHEL-64984 -- Gitee