From d1736385d567d30b7931bc1e8a26112ad05a3aec Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 4 Apr 2022 23:43:05 -0400 Subject: [PATCH] update to 2.36.0-rc1 Release notes: https://github.com/git/git/raw/v2.36.0-rc1/Documentation/RelNotes/2.36.0.txt --- ...-litdd-in-credential-cache-fsmonitor.patch | 102 ------------------ git.spec | 10 +- sources | 4 +- 3 files changed, 7 insertions(+), 109 deletions(-) delete mode 100644 0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch diff --git a/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch b/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch deleted file mode 100644 index 6982207..0000000 --- a/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch +++ /dev/null @@ -1,102 +0,0 @@ -From f3ea4bed2acb129db66c4c9a22dae71576d58066 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Wed, 6 Apr 2022 14:41:22 -0400 -Subject: [PATCH] doc: replace "--" with {litdd} in credential-cache/fsmonitor - -Asciidoc renders `--` as em-dash. This is not appropriate for command -names. It also breaks linkgit links to these commands. - -Fix git-credential-cache--daemon and git-fsmonitor--daemon. The latter -was added 3248486920 (fsmonitor: document builtin fsmonitor, 2022-03-25) -and included several links. A check for broken links in the HTML docs -turned this up. - -Manually inspecting the other Documentation/git-*--*.txt files turned up -the issue in git-credential-cache--daemon. - -While here, quote `git credential-cache--daemon` in the synopsis to -match the vast majority of our other documentation. - -Signed-off-by: Todd Zullinger -Signed-off-by: Junio C Hamano ---- - Documentation/config/core.txt | 2 +- - Documentation/git-credential-cache--daemon.txt | 6 +++--- - Documentation/git-fsmonitor--daemon.txt | 12 ++++++------ - Documentation/git-update-index.txt | 2 +- - 4 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt -index 889522956e45bb..e67392cc838499 100644 ---- a/Documentation/config/core.txt -+++ b/Documentation/config/core.txt -@@ -63,7 +63,7 @@ core.protectNTFS:: - - core.fsmonitor:: - If set to true, enable the built-in file system monitor -- daemon for this working directory (linkgit:git-fsmonitor--daemon[1]). -+ daemon for this working directory (linkgit:git-fsmonitor{litdd}daemon[1]). - + - Like hook-based file system monitors, the built-in file system monitor - can speed up Git commands that need to refresh the Git index -diff --git a/Documentation/git-credential-cache--daemon.txt b/Documentation/git-credential-cache--daemon.txt -index 7051c6bdf8f542..01e1c214dd82e1 100644 ---- a/Documentation/git-credential-cache--daemon.txt -+++ b/Documentation/git-credential-cache--daemon.txt -@@ -1,5 +1,5 @@ --git-credential-cache--daemon(1) --=============================== -+git-credential-cache{litdd}daemon(1) -+==================================== - - NAME - ---- -@@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory - SYNOPSIS - -------- - [verse] --git credential-cache--daemon [--debug] -+'git credential-cache{litdd}daemon' [--debug] - - DESCRIPTION - ----------- -diff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt -index 0fedf5a4565f79..cc142fb8612c72 100644 ---- a/Documentation/git-fsmonitor--daemon.txt -+++ b/Documentation/git-fsmonitor--daemon.txt -@@ -1,5 +1,5 @@ --git-fsmonitor--daemon(1) --======================== -+git-fsmonitor{litdd}daemon(1) -+============================= - - NAME - ---- -@@ -8,10 +8,10 @@ git-fsmonitor--daemon - A Built-in File System Monitor - SYNOPSIS - -------- - [verse] --'git fsmonitor--daemon' start --'git fsmonitor--daemon' run --'git fsmonitor--daemon' stop --'git fsmonitor--daemon' status -+'git fsmonitor{litdd}daemon' start -+'git fsmonitor{litdd}daemon' run -+'git fsmonitor{litdd}daemon' stop -+'git fsmonitor{litdd}daemon' status - - DESCRIPTION - ----------- -diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt -index 64315e2e8c2d3f..5ea2f2c60e45a3 100644 ---- a/Documentation/git-update-index.txt -+++ b/Documentation/git-update-index.txt -@@ -528,7 +528,7 @@ This feature is intended to speed up git operations for repos that have - large working directories. - - It enables git to work together with a file system monitor (see --linkgit:git-fsmonitor--daemon[1] -+linkgit:git-fsmonitor{litdd}daemon[1] - and the - "fsmonitor-watchman" section of linkgit:githooks[5]) that can - inform it as to what files have been modified. This enables git to avoid diff --git a/git.spec b/git.spec index 287ef90..08dc543 100644 --- a/git.spec +++ b/git.spec @@ -77,14 +77,14 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 # 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.36.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -116,9 +116,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://lore.kernel.org/git/20220406184122.4126898-1-tmz@pobox.com/ -Patch1: https://github.com/git/git/commit/f3ea4bed2.patch#/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1019,6 +1016,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Apr 08 2022 Todd Zullinger - 2.36.0-0.1.rc1 +- update to 2.36.0-rc1 + * Tue Apr 05 2022 Todd Zullinger - 2.36.0-0.0.rc0 - update to 2.36.0-rc0 - use httpd-core for tests on Fedora >= 37 diff --git a/sources b/sources index 567d1db..0d98a58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.36.0.rc0.tar.xz) = 7417784582f17e9579fbae984a175af814ff6bd9b28b48d0405b8c4342566a4e138df0f544ee7fbccf25419a50c3848fb9d0830feb9848a2f41cae2c969989c4 -SHA512 (git-2.36.0.rc0.tar.sign) = f1c8217687c993a32a3b8b38cde242440e6c3de4093dffd68bd9d483f103d20701856254e9bc92c2945c75405dd2c67e4c66076c05b469bbf4b21b7752888358 +SHA512 (git-2.36.0.rc1.tar.xz) = 48c17b4071128bc8d5e79545cbf835cd8bcca5d204fcd7e81a7207254ae3ff47a52edc2cbd132f27c575860cd53e354e6b5f277753b91d51ffd7e6313ee5e6f2 +SHA512 (git-2.36.0.rc1.tar.sign) = c7de5cd63425cf4ae4f6e38805461296de737b637f0d0008ac6e6d260c3623d5c576cb97d04673aee21cd8bb1294c5e618c9a5f8ad3ffd2a43a936ada05d8ebd