From 7f5dd143acb69b8ee87a1b36c4b0e3cd1e08cafe Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Tue, 8 Jul 2025 14:47:50 -0400 Subject: [PATCH 1/2] Documentation/RelNotes: use .adoc extension for new security releases When preparing the latest round of security fixes, we wrote release notes in v2.43.7, and then successively merged those up through to the various 'maint' branches. However, the 2.49 release series is the first to have commit 1f010d6bdf (doc: use .adoc extension for AsciiDoc files, 2025-01-20). This means that we should have renamed the new-but-historical release notes from *.txt to *.adoc during the merge into the 'maint-2.49' branch, but neglected to do so. Rename them accordingly to match the convention introduced by 1f010d6bdf. Since the release materials in question here were prepared before v2.50.0 was tagged, the 'maint' track for that release series is OK as is. Signed-off-by: Taylor Blau Signed-off-by: Junio C Hamano --- Documentation/RelNotes/{2.43.7.txt => 2.43.7.adoc} | 0 Documentation/RelNotes/{2.44.4.txt => 2.44.4.adoc} | 0 Documentation/RelNotes/{2.45.4.txt => 2.45.4.adoc} | 0 Documentation/RelNotes/{2.46.4.txt => 2.46.4.adoc} | 0 Documentation/RelNotes/{2.47.3.txt => 2.47.3.adoc} | 0 Documentation/RelNotes/{2.48.2.txt => 2.48.2.adoc} | 0 Documentation/RelNotes/{2.49.1.txt => 2.49.1.adoc} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename Documentation/RelNotes/{2.43.7.txt => 2.43.7.adoc} (100%) rename Documentation/RelNotes/{2.44.4.txt => 2.44.4.adoc} (100%) rename Documentation/RelNotes/{2.45.4.txt => 2.45.4.adoc} (100%) rename Documentation/RelNotes/{2.46.4.txt => 2.46.4.adoc} (100%) rename Documentation/RelNotes/{2.47.3.txt => 2.47.3.adoc} (100%) rename Documentation/RelNotes/{2.48.2.txt => 2.48.2.adoc} (100%) rename Documentation/RelNotes/{2.49.1.txt => 2.49.1.adoc} (100%) diff --git a/Documentation/RelNotes/2.43.7.txt b/Documentation/RelNotes/2.43.7.adoc similarity index 100% rename from Documentation/RelNotes/2.43.7.txt rename to Documentation/RelNotes/2.43.7.adoc diff --git a/Documentation/RelNotes/2.44.4.txt b/Documentation/RelNotes/2.44.4.adoc similarity index 100% rename from Documentation/RelNotes/2.44.4.txt rename to Documentation/RelNotes/2.44.4.adoc diff --git a/Documentation/RelNotes/2.45.4.txt b/Documentation/RelNotes/2.45.4.adoc similarity index 100% rename from Documentation/RelNotes/2.45.4.txt rename to Documentation/RelNotes/2.45.4.adoc diff --git a/Documentation/RelNotes/2.46.4.txt b/Documentation/RelNotes/2.46.4.adoc similarity index 100% rename from Documentation/RelNotes/2.46.4.txt rename to Documentation/RelNotes/2.46.4.adoc diff --git a/Documentation/RelNotes/2.47.3.txt b/Documentation/RelNotes/2.47.3.adoc similarity index 100% rename from Documentation/RelNotes/2.47.3.txt rename to Documentation/RelNotes/2.47.3.adoc diff --git a/Documentation/RelNotes/2.48.2.txt b/Documentation/RelNotes/2.48.2.adoc similarity index 100% rename from Documentation/RelNotes/2.48.2.txt rename to Documentation/RelNotes/2.48.2.adoc diff --git a/Documentation/RelNotes/2.49.1.txt b/Documentation/RelNotes/2.49.1.adoc similarity index 100% rename from Documentation/RelNotes/2.49.1.txt rename to Documentation/RelNotes/2.49.1.adoc From 428c9241c6918f52ac22fb8e83ce7c736a2f5e00 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 8 Jul 2025 17:05:27 -0400 Subject: [PATCH 2/2] t: avoid git config syntax from newer releases In a recent security release, 05e9cd64ee (config: quote values containing CR character, 2025-05-19) added calls to `git config get`, `git config set`, and `git config unset` which are not present on the maint-2.43 branch. These subcommands were added in the following commits, released in git-2.46.0: 4e51389000 (builtin/config: introduce "get" subcommand, 2024-05-06), 00bbdde141 (builtin/config: introduce "set" subcommand, 2024-05-06), 95ea69c67b (builtin/config: introduce "unset" subcommand, 2024-05-06) Revert to the previous `git config` syntax for older maintenance branches. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano --- 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 1010410b7e..baf9b48231 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2595,8 +2595,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 2026285566..d1546e3311 100755 --- a/t/t7450-bad-git-dotfiles.sh +++ b/t/t7450-bad-git-dotfiles.sh @@ -362,10 +362,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"