Fourth batch for 2.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 19, 2015 at 14:46 UTC
8f8d0ecfde871144ae839876039fe4e8fed75a9c
1 file changed
+34
-1
Documentation/RelNotes/2.6.0.txt
+34
-1
@@ -51,6 +51,11 @@ UI, Workflows & Features
51
* "git pull --rebase" has been taught to pay attention to
52
rebase.autostash configuration.
53
54
+ * The command-line completion script (in contrib/) has been updated.
55
+
56
+ * A negative !ref entry in multi-value transfer.hideRefs
57
+ configuration can be used to say "don't hide this one".
58
+
59
60
Performance, Internal Implementation, Development Support etc.
61
@@ -101,6 +106,10 @@ Performance, Internal Implementation, Development Support etc.
106
107
* "git am" has been rewritten in "C".
108
109
+ * git_path() and mkpath() are handy helper functions but it is easy
110
+ to misuse, as the callers need to be careful to keep the number of
111
+ active results below 4. Their uses have been reduced.
112
+
113
114
Also contains various documentation updates and code clean-ups.
115
@@ -117,7 +126,7 @@ notes for details).
126
particular date format.
127
(merge e7aac44 da/subtree-date-confusion later to maint).
128
120
- * An attempt to delete a ref by pushing into a repositorywhose HEAD
129
+ * An attempt to delete a ref by pushing into a repository whose HEAD
130
symbolic reference points at an unborn branch that cannot be
131
created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
132
points at refs/heads/a) failed.
@@ -180,6 +189,29 @@ notes for details).
189
single letter nickname.
190
(merge bc598c3 mh/get-remote-group-fix later to maint).
191
192
+ * "git clone $URL", when cloning from a site whose sole purpose is to
193
+ host a single repository (hence, no path after <scheme>://<site>/),
194
+ tried to use the site name as the new repository name, but did not
195
+ remove username or password when <site> part was of the form
196
+ <user>@<pass>:<host>. The code is taught to redact these.
197
+ (merge adef956 ps/guess-repo-name-at-root later to maint).
198
+
199
+ * Running tests with the "-x" option to make them verbose had some
200
+ unpleasant interactions with other features of the test suite.
201
+ (merge 9b5fe78 jk/test-with-x later to maint).
202
+
203
+ * t1509 test that requires a dedicated VM environment had some
204
+ bitrot, which has been corrected.
205
+ (merge faacc5a ps/t1509-chroot-test-fixup later to maint).
206
+
207
+ * "git pull" in recent releases of Git has a regression in the code
208
+ that allows custom path to the --upload-pack=<program>. This has
209
+ been corrected.
210
+
211
+ Note that this is irrelevant for 'master' with "git pull" rewritten
212
+ in C.
213
+ (merge 22d6857 mm/pull-upload-pack later to maint).
214
+
215
* Code cleanups and documentation updates.
216
(merge 1c601af es/doc-clean-outdated-tools later to maint).
217
(merge 3581304 kn/tag-doc-fix later to maint).
@@ -188,3 +220,4 @@ notes for details).
220
(merge 14691e3 sb/parse-options-codeformat later to maint).
221
(merge 4a6ada3 ad/bisect-cleanup later to maint).
222
(merge da4c5ad ta/docfix-index-format-tech later to maint).
223
+ (merge ae25fd3 sb/check-return-from-read-ref later to maint).