update to 2.38.0-rc0
Adjust number of t5541 "push 2000 tags over http" test, which we skip on aarch64 and ppc64le arches. It was shifted from 36 to 37 by upstream b0c4adcdd7 (remote-curl: send Accept-Language header to server, 2022-07-11). Release notes: https://github.com/git/git/raw/v2.38.0-rc0/Documentation/RelNotes/2.38.0.txt
This commit is contained in:
Todd Zullinger
parent
0d294dd610
commit
ea59aa3637
75
0001-docs-fix-a-few-recently-broken-links.patch
Normal file
75
0001-docs-fix-a-few-recently-broken-links.patch
Normal file
@ -0,0 +1,75 @@
|
||||
From 349a26b8a0fe65e26b1d75af4e30d356de499a2f Mon Sep 17 00:00:00 2001
|
||||
From: Todd Zullinger <tmz@pobox.com>
|
||||
Date: Fri, 16 Sep 2022 00:50:28 -0400
|
||||
Subject: [PATCH] docs: fix a few recently broken links
|
||||
|
||||
Some links were broken in the recent move of various technical docs
|
||||
c0f6dd49f1 (Merge branch 'ab/tech-docs-to-help', 2022-08-14).
|
||||
|
||||
Fix them.
|
||||
|
||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
||||
---
|
||||
Documentation/gitprotocol-capabilities.txt | 4 ++--
|
||||
Documentation/gitprotocol-v2.txt | 4 ++--
|
||||
Documentation/technical/bundle-uri.txt | 3 +--
|
||||
Documentation/user-manual.txt | 2 +-
|
||||
4 files changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt
|
||||
index c6dcc7d565..0fb5ea0c1c 100644
|
||||
--- a/Documentation/gitprotocol-capabilities.txt
|
||||
+++ b/Documentation/gitprotocol-capabilities.txt
|
||||
@@ -388,8 +388,8 @@ the server as well.
|
||||
Session IDs should be unique to a given process. They must fit within a
|
||||
packet-line, and must not contain non-printable or whitespace characters. The
|
||||
current implementation uses trace2 session IDs (see
|
||||
-link:api-trace2.html[api-trace2] for details), but this may change and users of
|
||||
-the session ID should not rely on this fact.
|
||||
+link:technical/api-trace2.html[api-trace2] for details), but this may change
|
||||
+and users of the session ID should not rely on this fact.
|
||||
|
||||
GIT
|
||||
---
|
||||
diff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.txt
|
||||
index c9c0f9160b..59bf41cefb 100644
|
||||
--- a/Documentation/gitprotocol-v2.txt
|
||||
+++ b/Documentation/gitprotocol-v2.txt
|
||||
@@ -544,8 +544,8 @@ the server as well.
|
||||
Session IDs should be unique to a given process. They must fit within a
|
||||
packet-line, and must not contain non-printable or whitespace characters. The
|
||||
current implementation uses trace2 session IDs (see
|
||||
-link:api-trace2.html[api-trace2] for details), but this may change and users of
|
||||
-the session ID should not rely on this fact.
|
||||
+link:technical/api-trace2.html[api-trace2] for details), but this may change
|
||||
+and users of the session ID should not rely on this fact.
|
||||
|
||||
object-info
|
||||
~~~~~~~~~~~
|
||||
diff --git a/Documentation/technical/bundle-uri.txt b/Documentation/technical/bundle-uri.txt
|
||||
index c25c42378a..85c6a7fc7c 100644
|
||||
--- a/Documentation/technical/bundle-uri.txt
|
||||
+++ b/Documentation/technical/bundle-uri.txt
|
||||
@@ -3,8 +3,7 @@ Bundle URIs
|
||||
|
||||
Git bundles are files that store a pack-file along with some extra metadata,
|
||||
including a set of refs and a (possibly empty) set of necessary commits. See
|
||||
-linkgit:git-bundle[1] and link:bundle-format.txt[the bundle format] for more
|
||||
-information.
|
||||
+linkgit:git-bundle[1] and linkgit:gitformat-bundle[5] for more information.
|
||||
|
||||
Bundle URIs are locations where Git can download one or more bundles in
|
||||
order to bootstrap the object database in advance of fetching the remaining
|
||||
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
|
||||
index ca9decdd95..dc9c6a663a 100644
|
||||
--- a/Documentation/user-manual.txt
|
||||
+++ b/Documentation/user-manual.txt
|
||||
@@ -3133,7 +3133,7 @@ those "loose" objects.
|
||||
You can save space and make Git faster by moving these loose objects in
|
||||
to a "pack file", which stores a group of objects in an efficient
|
||||
compressed format; the details of how pack files are formatted can be
|
||||
-found in link:gitformat-pack[5].
|
||||
+found in linkgit:gitformat-pack[5].
|
||||
|
||||
To put the loose objects into a pack, just run git repack:
|
||||
|
||||
29
0002-api-docs-link-to-html-version-of-api-trace2.patch
Normal file
29
0002-api-docs-link-to-html-version-of-api-trace2.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 6e50f870372027b5c8c3e68df3c193384c5f6e59 Mon Sep 17 00:00:00 2001
|
||||
From: Todd Zullinger <tmz@pobox.com>
|
||||
Date: Fri, 16 Sep 2022 01:15:15 -0400
|
||||
Subject: [PATCH] api docs: link to html version of api-trace2
|
||||
|
||||
In f6d25d7878 (api docs: document that BUG() emits a trace2 error event,
|
||||
2021-04-13), a link to the plain text version of api-trace2 was added in
|
||||
`technical/api-error-handling.txt`.
|
||||
|
||||
All of our other `link:`s point to the html versions. Do the same here.
|
||||
|
||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
||||
---
|
||||
Documentation/technical/api-error-handling.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt
|
||||
index 70bf1d3e52..665c4960b4 100644
|
||||
--- a/Documentation/technical/api-error-handling.txt
|
||||
+++ b/Documentation/technical/api-error-handling.txt
|
||||
@@ -46,7 +46,7 @@ parse-options.c.
|
||||
returns -1 after reporting the situation to the caller.
|
||||
|
||||
These reports will be logged via the trace2 facility. See the "error"
|
||||
-event in link:api-trace2.txt[trace2 API].
|
||||
+event in link:api-trace2.html[trace2 API].
|
||||
|
||||
Customizable error handlers
|
||||
---------------------------
|
||||
17
git.spec
17
git.spec
@ -70,14 +70,14 @@
|
||||
%endif
|
||||
|
||||
# Define for release candidates
|
||||
#global rcrev .rc0
|
||||
%global rcrev .rc0
|
||||
|
||||
# Set path to the package-notes linker script
|
||||
%global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
|
||||
|
||||
Name: git
|
||||
Version: 2.37.3
|
||||
Release: 1%{?rcrev}%{?dist}
|
||||
Version: 2.38.0
|
||||
Release: 0.0%{?rcrev}%{?dist}
|
||||
Summary: Fast Version Control System
|
||||
License: GPLv2
|
||||
URL: https://git-scm.com/
|
||||
@ -119,6 +119,12 @@ Patch2: 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
|
||||
# https://github.com/tmzullinger/git/commit/aa5105dc11
|
||||
Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch
|
||||
|
||||
# fix a few broken links
|
||||
# https://lore.kernel.org/git/20220916062303.3736166-1-tmz@pobox.com/
|
||||
# https://lore.kernel.org/git/20220916062303.3736166-2-tmz@pobox.com/
|
||||
Patch4: 0001-docs-fix-a-few-recently-broken-links.patch
|
||||
Patch5: 0002-api-docs-link-to-html-version-of-api-trace2.patch
|
||||
|
||||
%if %{with docs}
|
||||
# pod2man is needed to build Git.3pm
|
||||
BuildRequires: %{_bindir}/pod2man
|
||||
@ -800,7 +806,7 @@ GIT_SKIP_TESTS=""
|
||||
# to limit the maximum stack size.
|
||||
# t5541.36 'push 2000 tags over http'
|
||||
# t5551.25 'clone the 2,000 tag repo to check OS command line overflow'
|
||||
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.36 t5551.25"
|
||||
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.37 t5551.25"
|
||||
%endif
|
||||
# endif aarch64 %%{arm} %%{power64}
|
||||
|
||||
@ -1005,6 +1011,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
|
||||
%{?with_docs:%{_pkgdocdir}/git-svn.html}
|
||||
|
||||
%changelog
|
||||
* Fri Sep 16 2022 Todd Zullinger <tmz@pobox.com> - 2.38.0-0.0.rc0
|
||||
- update to 2.38.0-rc0
|
||||
|
||||
* Tue Aug 30 2022 Todd Zullinger <tmz@pobox.com> - 2.37.3-1
|
||||
- update to 2.37.3
|
||||
- remove %%changelog entries prior to 2020
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (git-2.37.3.tar.xz) = 9120050b01d8ac8d9f9e85f19cb84dc90c28f3beadc3ea94da94845f2eb5e35aa83eee8447a7ecef5190b8eb5d01be621be2e82bb3020e51e05037cd1fa9b58f
|
||||
SHA512 (git-2.37.3.tar.sign) = ca2b0396c7d5f47822578f654588580b101ce97e0a4913071b6987cdbb470e3fad456b967cf6ec5928c85d56aa8a8eeff123e0e9aaa4ce1cbfc79c30a2af3b03
|
||||
SHA512 (git-2.38.0.rc0.tar.xz) = 98b5aa08da0a754d3d6119b4690e2add3f85295ba5243f8cbfef04738c27ab1d39c3388e27349a824841f4b54004e22e8731f5aa37afa5f62b2b2a197b8ec84a
|
||||
SHA512 (git-2.38.0.rc0.tar.sign) = 80d1c913f32a4c63178f3514cf04052580c9699c1161d7d5ed4329961218c4712705c5dcf16162ec53487a2bb0b204bbad6559c7ff99de8fa1b937b0e9ed3f7e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user