Skip to content

Commit ed15518

Browse files
committed
Sync with Git 2.46.1
2 parents 9cf95c0 + a731929 commit ed15518

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

Documentation/RelNotes/2.46.1.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,13 @@ Fixes since Git 2.46
6363
* "git bundle unbundle" outside a repository triggered a BUG()
6464
unnecessarily, which has been corrected.
6565

66+
* The code forgot to discard unnecessary in-core commit buffer data
67+
for commits that "git log --skip=<number>" traversed but omitted
68+
from the output, which has been corrected.
69+
70+
* "git verify-pack" and "git index-pack" started dying outside a
71+
repository, which has been corrected.
72+
73+
* A corner case bug in "git stash" was fixed.
74+
6675
Also contains minor documentation updates and code clean-ups.

Documentation/RelNotes/2.47.0.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ Fixes since v2.46
162162
corrected.
163163

164164
* More leakfixes.
165-
(merge f30bfafcd4 ps/leakfixes-part-3 later to maint).
166165

167166
* The credential helper to talk to OSX keychain sometimes sent
168167
garbage bytes after the username, which has been corrected.
@@ -172,7 +171,6 @@ Fixes since v2.46
172171

173172
* The patch parser in 'git apply' has been a bit more lenient against
174173
unexpected mode bits, like 100664, recorded on extended header lines.
175-
(merge e95d515141 jk/apply-patch-mode-check-fix later to maint).
176174

177175
* "git config --value=foo --fixed-value section.key newvalue" barfed
178176
when the existing value in the configuration file used the
@@ -181,7 +179,6 @@ Fixes since v2.46
181179
* The patch parser in "git patch-id" has been tightened to avoid
182180
getting confused by lines that look like a patch header in the log
183181
message.
184-
(merge a6e9429f72 jc/patch-id later to maint).
185182

186183
* "git reflog expire" failed to honor annotated tags when computing
187184
reachable commits.
@@ -197,7 +194,6 @@ Fixes since v2.46
197194

198195
* "git bundle unbundle" outside a repository triggered a BUG()
199196
unnecessarily, which has been corrected.
200-
(merge 96a9a3e42e ps/bundle-outside-repo-fix later to maint).
201197

202198
* Maintenance tasks other than "gc" now properly go background when
203199
"git maintenance" runs them.
@@ -215,11 +211,9 @@ Fixes since v2.46
215211
* The code forgot to discard unnecessary in-core commit buffer data
216212
for commits that "git log --skip=<number>" traversed but omitted
217213
from the output, which has been corrected.
218-
(merge 6bd2ae67a5 jk/free-commit-buffer-of-skipped-commits later to maint).
219214

220215
* "git verify-pack" and "git index-pack" started dying outside a
221216
repository, which has been corrected.
222-
(merge b2dbf97f47 ps/index-pack-outside-repo-fix later to maint).
223217

224218
* A data corruption bug when multi-pack-index is used and the same
225219
objects are stored in multiple packfiles has been corrected.
@@ -245,15 +239,5 @@ Fixes since v2.46
245239
(merge c02414a997 bl/trailers-and-incomplete-last-line-fix later to maint).
246240

247241
* Other code cleanup, docfix, build fix, etc.
248-
(merge bb0498b1bb jc/how-to-maintain-updates later to maint).
249-
(merge 0d66f601a9 jc/tests-no-useless-tee later to maint).
250-
(merge 170cdfc5a4 jc/grammo-fixes later to maint).
251-
(merge 983555a1f2 jc/how-to-maintain-updates later to maint).
252-
(merge e3209bd4df ps/stash-keep-untrack-empty-fix later to maint).
253-
(merge 44db6f75cc jc/coding-style-c-operator-with-spaces later to maint).
254-
(merge 596f4ff6ad cl/config-regexp-docfix later to maint).
255-
(merge 4881328617 aa/cat-file-batch-output-doc later to maint).
256-
(merge 1609470409 jc/config-doc-update later to maint).
257-
(merge d4dc0efd7d rj/compat-terminal-unused-fix later to maint).
258242
(merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
259243
(merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint).

0 commit comments

Comments
 (0)