diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-13 15:28:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-13 15:31:57 -0700 |
| commit | ed155187b429a2a6b6475efe1767053df37ccfe1 (patch) | |
| tree | 4dfc16b06283b9eb5404149a120f7f4baae1bf30 | |
| parent | 9cf95c0ca06376c2797664a7f2a1d1b276729070 (diff) | |
| parent | a731929aa8016750c09bccc67c68feaf1259ce90 (diff) | |
| download | git-ed155187b429a2a6b6475efe1767053df37ccfe1.tar.gz | |
Sync with Git 2.46.1
| -rw-r--r-- | Documentation/RelNotes/2.46.1.txt | 9 | ||||
| -rw-r--r-- | Documentation/RelNotes/2.47.0.txt | 16 |
2 files changed, 9 insertions, 16 deletions
diff --git a/Documentation/RelNotes/2.46.1.txt b/Documentation/RelNotes/2.46.1.txt index 07dc76d030..e55c2c4a46 100644 --- a/Documentation/RelNotes/2.46.1.txt +++ b/Documentation/RelNotes/2.46.1.txt @@ -63,4 +63,13 @@ Fixes since Git 2.46 * "git bundle unbundle" outside a repository triggered a BUG() unnecessarily, which has been corrected. + * The code forgot to discard unnecessary in-core commit buffer data + for commits that "git log --skip=<number>" traversed but omitted + from the output, which has been corrected. + + * "git verify-pack" and "git index-pack" started dying outside a + repository, which has been corrected. + + * A corner case bug in "git stash" was fixed. + Also contains minor documentation updates and code clean-ups. diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt index e6d2f97f45..ffc0c5c4a2 100644 --- a/Documentation/RelNotes/2.47.0.txt +++ b/Documentation/RelNotes/2.47.0.txt @@ -162,7 +162,6 @@ Fixes since v2.46 corrected. * More leakfixes. - (merge f30bfafcd4 ps/leakfixes-part-3 later to maint). * The credential helper to talk to OSX keychain sometimes sent garbage bytes after the username, which has been corrected. @@ -172,7 +171,6 @@ Fixes since v2.46 * The patch parser in 'git apply' has been a bit more lenient against unexpected mode bits, like 100664, recorded on extended header lines. - (merge e95d515141 jk/apply-patch-mode-check-fix later to maint). * "git config --value=foo --fixed-value section.key newvalue" barfed when the existing value in the configuration file used the @@ -181,7 +179,6 @@ Fixes since v2.46 * The patch parser in "git patch-id" has been tightened to avoid getting confused by lines that look like a patch header in the log message. - (merge a6e9429f72 jc/patch-id later to maint). * "git reflog expire" failed to honor annotated tags when computing reachable commits. @@ -197,7 +194,6 @@ Fixes since v2.46 * "git bundle unbundle" outside a repository triggered a BUG() unnecessarily, which has been corrected. - (merge 96a9a3e42e ps/bundle-outside-repo-fix later to maint). * Maintenance tasks other than "gc" now properly go background when "git maintenance" runs them. @@ -215,11 +211,9 @@ Fixes since v2.46 * The code forgot to discard unnecessary in-core commit buffer data for commits that "git log --skip=<number>" traversed but omitted from the output, which has been corrected. - (merge 6bd2ae67a5 jk/free-commit-buffer-of-skipped-commits later to maint). * "git verify-pack" and "git index-pack" started dying outside a repository, which has been corrected. - (merge b2dbf97f47 ps/index-pack-outside-repo-fix later to maint). * A data corruption bug when multi-pack-index is used and the same objects are stored in multiple packfiles has been corrected. @@ -245,15 +239,5 @@ Fixes since v2.46 (merge c02414a997 bl/trailers-and-incomplete-last-line-fix later to maint). * Other code cleanup, docfix, build fix, etc. - (merge bb0498b1bb jc/how-to-maintain-updates later to maint). - (merge 0d66f601a9 jc/tests-no-useless-tee later to maint). - (merge 170cdfc5a4 jc/grammo-fixes later to maint). - (merge 983555a1f2 jc/how-to-maintain-updates later to maint). - (merge e3209bd4df ps/stash-keep-untrack-empty-fix later to maint). - (merge 44db6f75cc jc/coding-style-c-operator-with-spaces later to maint). - (merge 596f4ff6ad cl/config-regexp-docfix later to maint). - (merge 4881328617 aa/cat-file-batch-output-doc later to maint). - (merge 1609470409 jc/config-doc-update later to maint). - (merge d4dc0efd7d rj/compat-terminal-unused-fix later to maint). (merge be10ac7037 jc/mailinfo-header-cleanup later to maint). (merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint). |