Git 2.9-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed May 31, 2016 at 14:07 UTC 60bd4b1c513bb652cdffad44382046ca872140eb
2 files changed +49 -40
Documentation/RelNotes/2.9.0.txt
+48 -39
@@ -1,12 +1,12 @@
1 Git 2.9 Release Notes
2 =====================
3
4 -Backward compatibility note
5 ----------------------------
4 +Backward compatibility notes
5 +----------------------------
6
7 The end-user facing Porcelain level commands in the "git diff" and
8 -"git log" by default enables the rename detection; you can still use
9 -"diff.renames" configuration variable to disable this.
8 +"git log" family by default enable the rename detection; you can still
9 +use "diff.renames" configuration variable to disable this.
10
11 Merging two branches that have no common ancestor with "git merge" is
12 by default forbidden now to prevent creating such an unusual merge by
@@ -30,8 +30,8 @@ UI, Workflows & Features
30
31 * Comes with git-multimail 1.3.1 (in contrib/).
32
33 - * The end-user facing Porcelain level commands like "diff" and "log"
34 - now enables the rename detection by default.
33 + * The end-user facing commands like "git diff" and "git log"
34 + now enable the rename detection by default.
35
36 * The credential.helper configuration variable is cumulative and
37 there is no good way to override it from the command line. As
@@ -39,7 +39,7 @@ UI, Workflows & Features
39 as the signal to clear the values specified in various files.
40
41 * A new "interactive.diffFilter" configuration can be used to
42 - customize the diff shown in "git add -i" session.
42 + customize the diff shown in "git add -i" sessions.
43
44 * "git p4" now allows P4 author names to be mapped to Git author
45 names.
@@ -64,7 +64,7 @@ UI, Workflows & Features
64 to be used in a rare event that merges histories of two projects
65 that started their lives independently.
66
67 - * "git pull" has been taught to pass --allow-unrelated-histories
67 + * "git pull" has been taught to pass the "--allow-unrelated-histories"
68 option to underlying "git merge".
69
70 * "git apply -v" learned to report paths in the patch that were
@@ -87,7 +87,7 @@ UI, Workflows & Features
87
88 * When "git log" shows the log message indented by 4-spaces, the
89 remainder of a line after a HT does not align in the way the author
90 - originally intended. The command now expands tabs by default in
90 + originally intended. The command now expands tabs by default to help
91 such a case, and allows the users to override it with a new option,
92 "--no-expand-tabs".
93
@@ -97,13 +97,12 @@ UI, Workflows & Features
97 * "git rerere" can encounter two or more files with the same conflict
98 signature that have to be resolved in different ways, but there was
99 no way to record these separate resolutions.
100 - (merge d9d501b068 jc/rerere-multi later to maint).
100
101 * "git p4" learned to record P4 jobs in Git commit that imports from
102 the history in Perforce.
103
104 * "git describe --contains" often made a hard-to-justify choice of
106 - tag to give name to a given commit, because it tried to come up
105 + tag to name a given commit, because it tried to come up
106 with a name with smallest number of hops from a tag, causing an old
107 commit whose close descendant that is recently tagged were not
108 described with respect to an old tag but with a newer tag. It did
@@ -115,14 +114,14 @@ UI, Workflows & Features
114 commit."
115 (merge 7550424 js/name-rev-use-oldest-ref later to maint).
116
118 - * "git clone" learned "--shallow-submodules" option.
117 + * "git clone" learned the "--shallow-submodules" option.
118
119 * HTTP transport clients learned to throw extra HTTP headers at the
120 server, specified via http.extraHeader configuration variable.
121
122 * Patch output from "git diff" and friends has been tweaked to be
123 more readable by using a blank line as a strong hint that the
125 - contents before and after it belong to a logically separate unit.
124 + contents before and after it belong to logically separate units.
125
126 * A new configuration variable core.hooksPath allows customizing
127 where the hook directory is.
@@ -147,12 +146,13 @@ UI, Workflows & Features
146 (public, well-known) commit the original series was built on in
147 its output.
148
150 - * "git commit" learned to pay attention to "commit.verbose"
151 - configuration variable and act as if "--verbose" option was
152 - given from the command line.
149 + * "git commit" learned to pay attention to the "commit.verbose"
150 + configuration variable and act as if the "--verbose" option
151 + was given from the command line.
152
154 - * Give hints to GMail users with two-factor auth enabled that
155 - they need app-specific-password when using send-email.
153 + * Updated documentation gives hints to GMail users with two-factor
154 + auth enabled that they need app-specific-password when using
155 + "git send-email".
156
157
158 Performance, Internal Implementation, Development Support etc.
@@ -174,7 +174,8 @@ Performance, Internal Implementation, Development Support etc.
174
175 * A major part of "git submodule update" has been ported to C to take
176 advantage of the recently added framework to run download tasks in
177 - parallel.
177 + parallel. Other updates to "git submodule" that move pieces of
178 + logic to C continues.
179
180 * Rename bunch of tests on "git clone" for better organization.
181
@@ -188,16 +189,15 @@ Performance, Internal Implementation, Development Support etc.
189 do not attempt to look into refs/* when we know we do not have a
190 Git repository.
191
191 - * Code restructuring around the "refs" area to prepare for pluggable
192 + * Code restructuring around the "refs" API to prepare for pluggable
193 refs backends.
194
194 - * Sources to many test helper binaries (and the generated helpers)
195 + * Sources to many test helper binaries and the generated helpers
196 have been moved to t/helper/ subdirectory to reduce clutter at the
197 top level of the tree.
198
199 * Unify internal logic between "git tag -v" and "git verify-tag"
200 commands by making one directly call into the other.
200 - (merge bef234b st/verify-tag later to maint).
201
202 * "merge-recursive" strategy incorrectly checked if a path that is
203 involved in its internal merge exists in the working tree.
@@ -209,9 +209,7 @@ Performance, Internal Implementation, Development Support etc.
209 * As nobody maintains our in-tree git.spec.in and distros use their
210 own spec file, we stopped pretending that we support "make rpm".
211
212 - * Move from unsigned char[20] to struct object_id continues.
213 -
214 - * Update of "git submodule" to move pieces of logic to C continues.
212 + * Move from "unsigned char[20]" to "struct object_id" continues.
213
214 * The code for warning_errno/die_errno has been refactored and a new
215 error_errno() reporting helper is introduced.
@@ -230,18 +228,25 @@ Performance, Internal Implementation, Development Support etc.
228 test-parse-options program so that a caller can tell what it
229 expects in its output, so that these repetitions can be cleaned up.
230
233 - * Add perf test for "rebase -i"
231 + * Add perf test for "rebase -i".
232
233 * Common mistakes when writing gitlink: in our documentation are
234 found by "make check-docs".
235
236 * t9xxx series has been updated primarily for readability, while
239 - fixing small bugs in it. A few scripted Porcelains have also been
240 - updated to fix possible bugs around their use of "test -z" and
241 - "test -n".
237 + fixing small bugs in it. A few scripted Porcelain commands have
238 + also been updated to fix possible bugs around their use of
239 + "test -z" and "test -n".
240
241 * CI test was taught to run git-svn tests.
242
243 + * "git cat-file --batch-all" has been sped up, by taking advantage
244 + of the fact that it does not have to read a list of objects, in two
245 + ways.
246 +
247 + * test updates to make it more readable and maintainable.
248 + (merge e6273f4 es/t1500-modernize later to maint).
249 +
250
251 Also contains various documentation updates and code clean-ups.
252
@@ -329,11 +334,11 @@ notes for details).
334 * Support for CRAM-MD5 authentication method in "git imap-send" did
335 not work well.
336
332 - * Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
333 - we use in imap-send, which has been adjusted for the change.
337 + * Upcoming OpenSSL 1.1.0 will break compilation by updating a few API
338 + elements we use in imap-send, which has been adjusted for the change.
339
340 * The socks5:// proxy support added back in 2.6.4 days was not aware
336 - that socks5h:// proxies behave differently.
341 + that socks5h:// proxies behave differently from socks5:// proxies.
342
343 * "git config" had a codepath that tried to pass a NULL to
344 printf("%s"), which nobody seems to have noticed.
@@ -354,12 +359,12 @@ notes for details).
359 * When "git merge" notices that the merge can be resolved purely at
360 the tree level (without having to merge blobs) and the resulting
361 tree happens to already exist in the object store, it forgot to
357 - update the index, which lead to an inconsistent state for later
358 - operations.
362 + update the index, which left an inconsistent state that would
363 + break later operations.
364
365 * "git submodule" reports the paths of submodules the command
361 - recurses into, but this was incorrect when the command was not run
362 - from the root level of the superproject.
366 + recurses into, but these paths were incorrectly reported when
367 + the command was not run from the root level of the superproject.
368
369 * The "user.useConfigOnly" configuration variable makes it an error
370 if users do not explicitly set user.name and user.email. However,
@@ -391,7 +396,6 @@ notes for details).
396 * "git rebase -m" could be asked to rebase an entire branch starting
397 from the root, but failed by assuming that there always is a parent
398 commit to the first commit on the branch.
394 - (merge 79f4344 bw/rebase-merge-entire-branch later to maint).
399
400 * Fix a broken "p4 lfs" test.
401
@@ -417,7 +421,6 @@ notes for details).
421 the configuration variable. This will stop requiring the users to
422 sign commit objects used internally as an implementation detail of
423 "git stash".
420 - (merge 6694856 jc/commit-tree-ignore-commit-gpgsign later to maint).
424
425 * "http.cookieFile" configuration variable clearly wants a pathname,
426 but we forgot to treat it as such by e.g. applying tilde expansion.
@@ -452,7 +455,7 @@ notes for details).
455
456 * Portability enhancement for "rebase -i" to help platforms whose
457 shell does not like "for i in <empty>" (which is not POSIX-kosher).
455 - (merge 8e98b35 jk/rebase-interative-eval-fix later to maint).
458 + (merge 8e98b35 jk/rebase-interactive-eval-fix later to maint).
459
460 * On Windows, .git and optionally any files whose name starts with a
461 dot are now marked as hidden, with a core.hideDotFiles knob to
@@ -486,6 +489,12 @@ notes for details).
489 added the feature back in v2.1.0 timeframe.
490 (merge 462cbb4 rj/log-decorate-auto later to maint).
491
492 + * "git fast-import --export-marks" would overwrite the existing marks
493 + file even when it makes a dump from its custom die routine.
494 + Prevent it from doing so when we have an import-marks file but
495 + haven't finished reading it.
496 + (merge f4beed6 fc/fast-import-broken-marks-file later to maint).
497 +
498 * Other minor clean-ups and documentation updates
499 (merge 832c0e5 lp/typofixes later to maint).
500 (merge f5ee54a sb/z-is-gnutar-ism later to maint).
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v2.9.0-rc0
4 +DEF_VER=v2.9.0-rc1
5
6 LF='
7 '