Eighth batch for 2.9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 29, 2016 at 13:03 UTC
bbc61680168542cf6fd3ae637bde395c73b76f0f
1 file changed
+44
Documentation/RelNotes/2.9.0.txt
+44
@@ -56,6 +56,9 @@ UI, Workflows & Features
56
to be used in a rare event that merges histories of two projects
57
that started their lives independently.
58
59
+ * "git pull" has been taught to pass --allow-unrelated-histories
60
+ option to underlying "git merge".
61
+
62
* "git apply -v" learned to report paths in the patch that were
63
skipped via --include/--exclude mechanism or being outside the
64
current working directory.
@@ -132,6 +135,20 @@ Performance, Internal Implementation, Development Support etc.
135
* Code restructuring around the "refs" area to prepare for pluggable
136
refs backends.
137
138
+ * Sources to many test helper binaries (and the generated helpers)
139
+ have been moved to t/helper/ subdirectory to reduce clutter at the
140
+ top level of the tree.
141
+
142
+ Note that this can break your tests if you check out revisions
143
+ across the merge boundary of this topic, e0b58519 (Merge branch
144
+ 'nd/test-helpers', 2016-04-29), as bin-wrappers/test-* are not
145
+ rebuilt to point the underlying executables. For now, "make
146
+ distclean" is your friend.
147
+
148
+ * Unify internal logic between "git tag -v" and "git verify-tag"
149
+ commands by making one directly call into the other.
150
+ (merge bef234b st/verify-tag later to maint).
151
+
152
153
Also contains various documentation updates and code clean-ups.
154
@@ -276,6 +293,33 @@ notes for details).
293
from the root level of the superproject.
294
(merge 2ab5660 sb/submodule-path-misc-bugs later to maint).
295
296
+ * The "user.useConfigOnly" configuration variable makes it an error
297
+ if users do not explicitly set user.name and user.email. However,
298
+ its check was not done early enough and allowed another error to
299
+ trigger, reporting that the default value we guessed from the
300
+ system setting was unusable. This was a suboptimal end-user
301
+ experience as we want the users to set user.name/user.email without
302
+ relying on the auto-detection at all.
303
+ (merge d3c06c1 da/user-useconfigonly later to maint).
304
+
305
+ * "git mv old new" did not adjust the path for a submodule that lives
306
+ as a subdirectory inside old/ directory correctly.
307
+ (merge a127331 sb/mv-submodule-fix later to maint).
308
+
309
+ * "git replace -e" did not honour "core.editor" configuration.
310
+ (merge 36b1437 js/replace-edit-use-editor-configuration later to maint).
311
+
312
+ * "git push" from a corrupt repository that attempts to push a large
313
+ number of refs deadlocked; the thread to relay rejection notices
314
+ for these ref updates blocked on writing them to the main thread,
315
+ after the main thread at the receiving end notices that the push
316
+ failed and decides not to read these notices and return a failure.
317
+ (merge c4b2751 jk/push-client-deadlock-fix later to maint).
318
+
319
+ * mmap emulation on Windows has been optimized and work better without
320
+ consuming paging store when not needed.
321
+ (merge d5425d1 js/win32-mmap later to maint).
322
+
323
* Other minor clean-ups and documentation updates
324
(merge aed7480 mm/lockfile-error-message later to maint).
325
(merge bfee614 jc/index-pack later to maint).