Skip to content

Commit e1104a5

Browse files
committed
Ninth batch for 2.13
Signed-off-by: Junio C Hamano <[email protected]>
1 parent e471fa3 commit e1104a5

File tree

1 file changed

+24
-30
lines changed

1 file changed

+24
-30
lines changed

Documentation/RelNotes/2.13.0.txt

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,9 @@ UI, Workflows & Features
8585
* When "git submodule init" decides that the submodule in the working
8686
tree is its upstream, it now gives a warning as it is not a very
8787
common setup.
88-
(merge d1b3b81aab sb/submodule-init-url-selection later to maint).
8988

90-
* "git stash save" takes a pathspec so that the local changes can be
89+
* "git stash push" takes a pathspec so that the local changes can be
9190
stashed away only partially.
92-
(merge 9e140909f6 tg/stash-push later to maint).
9391

9492
* Documentation for "git ls-files" did not refer to core.quotePath.
9593

@@ -138,6 +136,15 @@ UI, Workflows & Features
138136
"git describe --broken" to give "$name-broken" (where $name is the
139137
description of HEAD) in such a case.
140138

139+
* "git checkout" is taught the "--recurse-submodules" option.
140+
141+
* Recent enhancement to "git stash push" command to support pathspec
142+
to allow only a subset of working tree changes to be stashed away
143+
was found to be too chatty and exposed the internal implementation
144+
detail (e.g. when it uses reset to match the index to HEAD before
145+
doing other things, output from reset seeped out). These, and
146+
other chattyness has been fixed.
147+
141148

142149
Performance, Internal Implementation, Development Support etc.
143150

@@ -162,7 +169,6 @@ Performance, Internal Implementation, Development Support etc.
162169
errno from failed system calls.
163170

164171
* The "parse_config_key()" API function has been cleaned up.
165-
(merge ad8c7cdadd jk/parse-config-key-cleanup later to maint).
166172

167173
* A test that creates a confusing branch whose name is HEAD has been
168174
corrected not to do so.
@@ -172,7 +178,6 @@ Performance, Internal Implementation, Development Support etc.
172178

173179
* An helper function to make it easier to append the result from
174180
real_path() to a strbuf has been added.
175-
(merge 33ad9ddd0b rs/strbuf-add-real-path later to maint).
176181

177182
* Reduce authentication round-trip over HTTP when the server supports
178183
just a single authentication method. This also improves the
@@ -187,7 +192,6 @@ Performance, Internal Implementation, Development Support etc.
187192
* The t/perf performance test suite was not prepared to test not so
188193
old versions of Git, but now it covers versions of Git that are not
189194
so ancient.
190-
(merge 28e1fb5466 jt/perf-updates later to maint).
191195

192196
* Add 32-bit Linux variant to the set of platforms to be tested with
193197
Travis CI.
@@ -200,7 +204,6 @@ Performance, Internal Implementation, Development Support etc.
200204
* Picking two versions of Git and running tests to make sure the
201205
older one and the newer one interoperate happily has now become
202206
possible.
203-
(merge bd4d9d993c jk/interop-test later to maint).
204207

205208
* "uchar [40]" to "struct object_id" conversion continues.
206209

@@ -211,14 +214,20 @@ Performance, Internal Implementation, Development Support etc.
211214

212215
* The "debug" helper used in the test framework learned to run
213216
a command under "gdb" interactively.
214-
(merge 59210dd56c sg/test-with-stdin later to maint).
215217

216218
* The "detect attempt to create collisions" variant of SHA-1
217219
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft)
218220
has been integrated and made the default.
219221

220222
* The test framework learned to detect unterminated here documents.
221223

224+
* The name-hash used for detecting paths that are different only in
225+
cases (which matter on case insensitive filesystems) has been
226+
optimized to take advantage of multi-threading when it makes sense.
227+
228+
* An earlier version of sha1dc/sha1.c that was merged to 'master'
229+
compiled incorrectly on Windows, which has been fixed.
230+
222231

223232
Also contains various documentation updates and code clean-ups.
224233

@@ -232,7 +241,6 @@ notes for details).
232241

233242
* "git repack --depth=<n>" for a long time busted the specified depth
234243
when reusing delta from existing packs. This has been corrected.
235-
(merge 42b766d765 jk/delta-chain-limit later to maint).
236244

237245
* The code to parse the command line "git grep <patterns>... <rev>
238246
[[--] <pathspec>...]" has been cleaned up, and a handful of bugs
@@ -270,7 +278,6 @@ notes for details).
270278

271279
* user.email that consists of only cruft chars should consistently
272280
error out, but didn't.
273-
(merge 94425552f3 jk/ident-empty later to maint).
274281

275282
* "git upload-pack", which is a counter-part of "git fetch", did not
276283
report a request for a ref that was not advertised as invalid.
@@ -312,27 +319,22 @@ notes for details).
312319

313320
* A few tests were run conditionally under (rare) conditions where
314321
they cannot be run (like running cvs tests under 'root' account).
315-
(merge c6507484a2 ab/cond-skip-tests later to maint).
316322

317323
* "git branch @" created refs/heads/@ as a branch, and in general the
318324
code that handled @{-1} and @{upstream} was a bit too loose in
319325
disambiguating.
320-
(merge fd4692ff70 jk/interpret-branch-name later to maint).
321326

322327
* "git fetch" that requests a commit by object name, when the other
323328
side does not allow such an request, failed without much
324329
explanation.
325-
(merge d56583ded6 mm/fetch-show-error-message-on-unadvertised-object later to maint).
326330

327331
* "git filter-branch --prune-empty" drops a single-parent commit that
328332
becomes a no-op, but did not drop a root commit whose tree is empty.
329-
(merge 32da7467eb dp/filter-branch-prune-empty later to maint).
330333

331334
* Recent versions of Git treats http alternates (used in dumb http
332335
transport) just like HTTP redirects and requires the client to
333336
enable following it, due to security concerns. But we forgot to
334337
give a warning when we decide not to honor the alternates.
335-
(merge 5cae73d5d2 ew/http-alternates-as-redirects-warning later to maint).
336338

337339
* "git push" had a handful of codepaths that could lead to a deadlock
338340
when unexpected error happened, which has been fixed.
@@ -364,27 +366,19 @@ notes for details).
364366
misconfiguration.
365367

366368
* Fix for NO_PTHREADS build.
367-
(merge 7b91929ba0 jk/execv-dashed-external later to maint).
368369

369370
* Fix for potential segv introduced in v2.11.0 and later (also
370371
v2.10.2) to "git log --pickaxe-regex -S".
371-
(merge f53c5de29c js/regexec-buf later to maint).
372372

373373
* A few unterminated here documents in tests were fixed, which in
374374
turn revealed incorrect expectations the tests make. These tests
375375
have been updated.
376-
(merge b42ca35e5c st/verify-tag later to maint).
376+
377+
* Fix for NO_PTHREADS option.
378+
(merge 2225e1ea20 bw/grep-recurse-submodules later to maint).
377379

378380
* Other minor doc, test and build updates and code cleanups.
379-
(merge dfa3ad3238 rs/blame-code-cleanup later to maint).
380-
(merge ffddfc6328 jk/rev-parse-cleanup later to maint).
381-
(merge f20754802a jk/pack-name-cleanups later to maint).
382-
(merge d4aae459cd sb/wt-status-cleanup later to maint).
383-
(merge e94eac49e6 rs/http-push-cleanup later to maint).
384-
(merge ba6746c08f rs/path-name-safety-cleanup later to maint).
385-
(merge d41626ff9e rs/shortlog-cleanup later to maint).
386-
(merge dce96c41f9 rs/update-hook-optim later to maint).
387-
(merge 37e61153e2 jk/quote-env-path-list-component later to maint).
388-
(merge a4dded0189 sb/submodule-update-initial-runs-custom-script later to maint).
389-
(merge 70471ed9bb sb/t3600-rephrase later to maint).
390-
(merge e7e183d6ee km/config-grammofix later to maint).
381+
(merge df2a6e38b7 jk/pager-in-use later to maint).
382+
(merge 75ec4a6cb0 ab/branch-list-doc later to maint).
383+
(merge 3e5b36c637 sg/skip-prefix-in-prettify-refname later to maint).
384+
(merge 2c5e2865cc jk/fast-import-cleanup later to maint).

0 commit comments

Comments
 (0)