Skip to content

Commit 12039e0

Browse files
committed
Git 2.18-rc0
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 13e8be9 commit 12039e0

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

Documentation/RelNotes/2.18.0.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,15 @@ UI, Workflows & Features
133133
These object names are now sorted according to their types for
134134
easier eyeballing.
135135

136+
* "git fetch $there $refspec" that talks over protocol v2 can take
137+
advantage of server-side ref filtering; the code has been extended
138+
so that this mechanism triggers also when fetching with configured
139+
refspec.
140+
141+
* Our HTTP client code used to advertise that we accept gzip encoding
142+
from the other side; instead, just let cURL library to advertise
143+
and negotiate the best one.
144+
136145

137146
Performance, Internal Implementation, Development Support etc.
138147

@@ -272,6 +281,23 @@ Performance, Internal Implementation, Development Support etc.
272281

273282
* Conversion from uchar[20] to struct object_id continues.
274283

284+
* By code restructuring of submodule merge in merge-recursive,
285+
informational messages from the codepath are now given using the
286+
same mechanism as other output, and honor the merge.verbosity
287+
configuration. The code also learned to give a few new messages
288+
when a submodule three-way merge resolves cleanly when one side
289+
records a descendant of the commit chosen by the other side.
290+
291+
* Avoid unchecked snprintf() to make future code auditing easier.
292+
(merge ac4896f007 jk/snprintf-truncation later to maint).
293+
294+
* Many tests hardcode the raw object names, which would change once
295+
we migrate away from SHA-1. While some of them must test against
296+
exact object names, most of them do not have to use hardcoded
297+
constants in the test. The latter kind of tests have been updated
298+
to test the moral equivalent of the original without hardcoding the
299+
actual object names.
300+
275301

276302
Also contains various documentation updates and code clean-ups.
277303

@@ -461,6 +487,15 @@ Fixes since v2.17
461487
This has been corrected.
462488
(merge e30d833671 sb/submodule-update-try-harder later to maint).
463489

490+
* Error behaviour of "git grep" when it cannot read the index was
491+
inconsistent with other commands that uses the index, which has
492+
been corrected to error out early.
493+
(merge b2aa84c789 sb/grep-die-on-unreadable-index later to maint).
494+
495+
* We used to call regfree() after regcomp() failed in some codepaths,
496+
which have been corrected.
497+
(merge 17154b1576 ma/regex-no-regfree-after-comp-fail later to maint).
498+
464499
* Other minor doc, test and build updates and code cleanups.
465500
(merge 248f66ed8e nd/trace-with-env later to maint).
466501
(merge 14ced5562c ys/bisect-object-id-missing-conversion-fix later to maint).
@@ -491,3 +526,4 @@ Fixes since v2.17
491526
(merge 92c4a7a129 nd/completion-aliasfiletype-typofix later to maint).
492527
(merge 58bd77b66a nd/pack-unreachable-objects-doc later to maint).
493528
(merge 4ed79d5203 sg/t6500-no-redirect-of-stdin later to maint).
529+
(merge 17b8a2d6cd jk/config-blob-sans-repo later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.17.GIT
4+
DEF_VER=v2.18.0-rc0
55

66
LF='
77
'

0 commit comments

Comments
 (0)