From caacdb5dfd60540ecec30ec479f147f3c8167e11 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 10 Dec 2024 09:36:41 +0900 Subject: The fifteenth batch Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index b9d1b129cd..bf75cda275 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -21,6 +21,9 @@ UI, Workflows & Features * Drop support for older libcURL and Perl. + * End-user experience of "git mergetool" when the command errors out + has been improved. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -107,6 +110,14 @@ Performance, Internal Implementation, Development Support etc. * Built-in Git subcommands are supplied the repository object to work with; they learned to do the same when they invoke sub-subcommands. + * Drop support for ancient environments in various CI jobs. + + * Isolates the reftable subsystem from the rest of Git's codebase by + using fewer pieces of Git's infrastructure. + + * Optimize reading random references out of the reftable backend by + allowing reuse of iterator objects. + Fixes since v2.47 ----------------- @@ -204,6 +215,15 @@ Fixes since v2.47 * The sequencer failed to honor core.commentString in some places. + * Describe a case where an option value needs to be spelled as a + separate argument, i.e. "--opt val", not "--opt=val". + (merge 1bc1e94091 jc/doc-opt-tilde-expand later to maint). + + * Loosen overly strict ownership check introduced in the recent past, + to keep the promise "cloning a suspicious repository is a safe + first step to inspect it". + (merge 0ffb5a6bf1 bc/allow-upload-pack-from-other-people later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77af53f56f aa/t7300-modernize later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). -- cgit v1.3-5-g9baa From 2ccc89b0c16c51561da90d21cfbb4b58cc877bf6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 Dec 2024 07:33:05 -0800 Subject: The sixteenth batch Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index bf75cda275..802e9a96e5 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -24,6 +24,10 @@ UI, Workflows & Features * End-user experience of "git mergetool" when the command errors out has been improved. + * "git bundle --unbundle" and "git clone" running on a bundle file + both learned to trigger fsck over the new objects with configurable + fck check levels. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -118,6 +122,13 @@ Performance, Internal Implementation, Development Support etc. * Optimize reading random references out of the reftable backend by allowing reuse of iterator objects. + * Backport oss-fuzz tests for us to our codebase. + + * Introduce a new repository extension to prevent older Git versions + from mis-interpreting worktrees created with relative paths. + + * Yet another "pass the repository through the callchain" topic. + Fixes since v2.47 ----------------- @@ -224,8 +235,19 @@ Fixes since v2.47 first step to inspect it". (merge 0ffb5a6bf1 bc/allow-upload-pack-from-other-people later to maint). + * "git fast-import" learned to reject paths with ".." and "." as + their components to avoid creating invalid tree objects. + (merge 8cb4c6e62f en/fast-import-verify-path later to maint). + + * The --ancestry-path option is designed to be given a commit that is + on the path, which was not documented, which has been corrected. + (merge bc1a980759 kk/doc-ancestry-path later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77af53f56f aa/t7300-modernize later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). (merge 68e3c69efa kh/trailer-in-glossary later to maint). (merge 91f88f76e6 tb/boundary-traversal-fix later to maint). + (merge 168ebb7159 jc/doc-error-message-guidelines later to maint). + (merge 18693d7d65 kh/doc-bundle-typofix later to maint). + (merge e2f5d3b491 kh/doc-update-ref-grammofix later to maint). -- cgit v1.3-5-g9baa From 063bcebf0c917140ca0e705cbe0fdea127e90086 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 Dec 2024 08:54:04 -0800 Subject: Git 2.48-rc0 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 22 ++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index 802e9a96e5..dc11ce58be 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -129,6 +129,11 @@ Performance, Internal Implementation, Development Support etc. * Yet another "pass the repository through the callchain" topic. + * "git describe" learned to stop digging the history needlessly + deeper. + + * Build procedure update plus introduction of Meson based builds. + Fixes since v2.47 ----------------- @@ -243,6 +248,23 @@ Fixes since v2.47 on the path, which was not documented, which has been corrected. (merge bc1a980759 kk/doc-ancestry-path later to maint). + + * "git tag" has been taught to refuse to create refs/tags/HEAD + as such a tag will be confusing in the context of UI provided by + the Git Porcelain commands. + (merge bbd445d5ef jc/forbid-head-as-tagname later to maint). + + * The advice messages now tell the newer 'git config set' command to + set the advice.token configuration variable to squelch a message. + (merge 6c397d0104 bf/explicit-config-set-in-advice-messages later to maint). + + * The syntax ":/" to name the latest commit with the matching + text was broken with a recent change, which has been corrected. + (merge 0ff919e87a ps/commit-with-message-syntax-fix later to maint). + + * Fix performance regression of a recent "fatten promisor pack with + local objects" protection against an unwanted gc. + * Other code cleanup, docfix, build fix, etc. (merge 77af53f56f aa/t7300-modernize later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b4687784c1..de0e63bdfb 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,6 +1,6 @@ #!/bin/sh -DEF_VER=v2.47.GIT +DEF_VER=v2.48.0-rc0 LF=' ' -- cgit v1.3-5-g9baa From ff795a5c5ed2e2d07c688c217a615d89e3f5733b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 19 Dec 2024 10:57:38 -0800 Subject: Finishing touches before 2.48-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index dc11ce58be..cc752d5466 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -28,6 +28,13 @@ UI, Workflows & Features both learned to trigger fsck over the new objects with configurable fck check levels. + * When "git fetch $remote" notices that refs/remotes/$remote/HEAD is + missing and discovers what branch the other side points with its + HEAD, refs/remotes/$remote/HEAD is updated to point to it. + + * "git fetch" honors "remote..followRemoteHEAD" settings to + tweak the remote-tracking HEAD in "refs/remotes//HEAD". + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -265,6 +272,14 @@ Fixes since v2.47 * Fix performance regression of a recent "fatten promisor pack with local objects" protection against an unwanted gc. + * "git log -p --remerge-diff --reverse" was completely broken. + (merge f94bfa1516 js/log-remerge-keep-ancestry later to maint). + + * "git bundle create" with an annotated tag on the positive end of + the revision range had a workaround code for older limitation in + the revision walker, which has become unnecessary. + (merge dd1072dfa8 tc/bundle-with-tag-remove-workaround later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77af53f56f aa/t7300-modernize later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). @@ -273,3 +288,4 @@ Fixes since v2.47 (merge 168ebb7159 jc/doc-error-message-guidelines later to maint). (merge 18693d7d65 kh/doc-bundle-typofix later to maint). (merge e2f5d3b491 kh/doc-update-ref-grammofix later to maint). + (merge 8525e92886 mh/doc-windows-home-env later to maint). -- cgit v1.3-5-g9baa From 996f0c583b36aa5d6c6308285aea1421eb7efae7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 Dec 2024 08:45:57 -0800 Subject: Hopefully the final batch before 2.48-rc1 Let's wait for git-gui, gitk, and possibly po/ and delay the tagging of the -rc1. Many people are already offline for the end-of-year holidays and it is a slow week, and 'master' front has too many new things graduated from 'next' a bit too early for me to feel comfortable. Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 27 +++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index cc752d5466..33c11e742f 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -35,6 +35,10 @@ UI, Workflows & Features * "git fetch" honors "remote..followRemoteHEAD" settings to tweak the remote-tracking HEAD in "refs/remotes//HEAD". + * "git range-diff" learned to optionally show and compare merge + commits in the ranges being compared, with the --diff-merges + option. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -141,6 +145,22 @@ Performance, Internal Implementation, Development Support etc. * Build procedure update plus introduction of Meson based builds. + * Recent reftable updates mistook a NULL return from a request for + 0-byte allocation as OOM and died unnecessarily, which has been + corrected. + + * Reftable backend adds check for upper limit of log's update_index. + + * Start working to make the codebase buildable with -Wsign-compare. + + * Regression fix for 'show-index' when run outside of a repository. + + * The meson-build procedure is integrated into CI to catch and + prevent bitrotting. + + * "git refs migrate" learned to also migrate the reflog data across + backends. + Fixes since v2.47 ----------------- @@ -280,6 +300,13 @@ Fixes since v2.47 the revision walker, which has become unnecessary. (merge dd1072dfa8 tc/bundle-with-tag-remove-workaround later to maint). + * GitLab CI updates. + (merge c6b43f663e ps/ci-gitlab-update later to maint). + + * Code to reuse objects based on bitmap contents have been tightened + to avoid race condition even when multiple packs are involved. + (merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77af53f56f aa/t7300-modernize later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 497b4e48d2..194ec0f9ad 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,6 +1,6 @@ #!/bin/sh -DEF_VER=v2.48.0-rc0 +DEF_VER=v2.48.0-rc1 LF=' ' -- cgit v1.3-5-g9baa From bc2c65770dca70c1d4e151fad971bc7c7235a702 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 30 Dec 2024 06:58:28 -0800 Subject: Git 2.48-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index 33c11e742f..f9fc8c1086 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -161,6 +161,9 @@ Performance, Internal Implementation, Development Support etc. * "git refs migrate" learned to also migrate the reflog data across backends. + * The developer documentation has been updated to give the latest + info on gitk and git-gui maintainer. + Fixes since v2.47 ----------------- -- cgit v1.3-5-g9baa From d062ccf4c3af1e5153ed5064d4d05b05e0fdd4d5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 1 Jan 2025 09:20:53 -0800 Subject: A bit more post Git 2.48-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index f9fc8c1086..d62c62dc17 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -165,6 +165,10 @@ Performance, Internal Implementation, Development Support etc. info on gitk and git-gui maintainer. + * CI jobs that run threaded programs under LSan has been giving false + positives from time to time, which has been worked around. + + Fixes since v2.47 ----------------- @@ -310,6 +314,12 @@ Fixes since v2.47 to avoid race condition even when multiple packs are involved. (merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint). + * An earlier "csum-file checksum does not have to be computed with + sha1dc" topic had a few code paths that had initialized an + implementation of a hash function to be used by an unmatching hash + by mistake, which have been corrected. + (merge 599a63409b ps/weak-sha1-for-tail-sum-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77af53f56f aa/t7300-modernize later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). -- cgit v1.3-5-g9baa From 14650065b76b28d3cfa9453356ac5669b19e706e Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Tue, 7 Jan 2025 18:37:06 +0100 Subject: RelNotes/2.48.0: fix typos etc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correct verb tense, add missing words, avoid double blank lines, and rephrase things that don’t read well to me like “Turn this linkage to relative paths”. Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'Documentation/RelNotes/2.48.0.txt') diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index d62c62dc17..eff93be37a 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -47,15 +47,15 @@ Performance, Internal Implementation, Development Support etc. * The way AsciiDoc is used for SYNOPSIS part of the manual pages has been revamped. The sources, at least for the simple cases, got - vastly pleasant to work with. + vastly more pleasant to work with. * The reftable library is now prepared to expect that the memory allocation function given to it may fail to allocate and to deal with such an error. * An extra worktree attached to a repository points at each other to - allow finding the repository from the worktree and vice versa - possible. Turn this linkage to relative paths. + allow finding the repository from the worktree (and vice versa) + possible. Use relative paths for this linkage. * Enable Windows-based CI in GitLab. @@ -94,7 +94,7 @@ Performance, Internal Implementation, Development Support etc. * Update the project's CodingGuidelines to discourage naming functions with a "_1()" suffix. - * Updates the '.clang-format' to match project conventions. + * Update '.clang-format' to match project conventions. * Centralize documentation for repository extensions into a single place. @@ -116,7 +116,7 @@ Performance, Internal Implementation, Development Support etc. * The migration procedure between two ref backends has been optimized. * "git fsck" learned to issue warnings on "curiously formatted" ref - contents that have always been taken valid but something Git + contents that have always been treated as valid but that Git wouldn't have written itself (e.g., missing terminating end-of-line after the full object name). @@ -127,13 +127,13 @@ Performance, Internal Implementation, Development Support etc. * Drop support for ancient environments in various CI jobs. - * Isolates the reftable subsystem from the rest of Git's codebase by + * Isolate the reftable subsystem from the rest of Git's codebase by using fewer pieces of Git's infrastructure. * Optimize reading random references out of the reftable backend by allowing reuse of iterator objects. - * Backport oss-fuzz tests for us to our codebase. + * Backport oss-fuzz tests to our codebase. * Introduce a new repository extension to prevent older Git versions from mis-interpreting worktrees created with relative paths. @@ -173,13 +173,13 @@ Fixes since v2.47 ----------------- * Doc update to clarify how periodical maintenance are scheduled, - spread across time to avoid thundering hurds. + spread across time to avoid thundering herds. * Use after free and double freeing at the end in "git log -L... -p" had been identified and fixed. * On macOS, fsmonitor can fall into a race condition that results in - a client waiting forever to be notified for an event that have + a client waiting forever to be notified about an event that has already happened. This problem has been corrected. * "git maintenance start" crashed due to an uninitialized variable @@ -203,7 +203,7 @@ Fixes since v2.47 * The dumb-http code regressed when the result of re-indexing a pack yielded an *.idx file that differs in content from the *.idx file it downloaded from the remote. This has been corrected by no longer - relying on: the *.idx file we got from the remote. + relying on the *.idx file we got from the remote. * When called with '--left-right' and '--use-bitmap-index', 'rev-list' will produce output without any left/right markers, which has been @@ -227,7 +227,7 @@ Fixes since v2.47 * "git gc" discards any objects that are outside promisor packs that are referred to by an object in a promisor pack, and we do not refetch them from the promisor at runtime, resulting an unusable - repository. Work it around by including these objects in the + repository. Work around it by including these objects in the referring promisor pack at the receiving end of the fetch. * Avoid build/test breakage on a system without working malloc debug @@ -282,9 +282,8 @@ Fixes since v2.47 on the path, which was not documented, which has been corrected. (merge bc1a980759 kk/doc-ancestry-path later to maint). - * "git tag" has been taught to refuse to create refs/tags/HEAD - as such a tag will be confusing in the context of UI provided by + since such a tag will be confusing in the context of the UI provided by the Git Porcelain commands. (merge bbd445d5ef jc/forbid-head-as-tagname later to maint). -- cgit v1.3-5-g9baa