Skip to content

Commit 8f8d0ec

Browse files
committed
Fourth batch for 2.6
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 011710a commit 8f8d0ec

File tree

1 file changed

+34
-1
lines changed

1 file changed

+34
-1
lines changed

Documentation/RelNotes/2.6.0.txt

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ UI, Workflows & Features
5151
* "git pull --rebase" has been taught to pay attention to
5252
rebase.autostash configuration.
5353

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+
5459

5560
Performance, Internal Implementation, Development Support etc.
5661

@@ -101,6 +106,10 @@ Performance, Internal Implementation, Development Support etc.
101106

102107
* "git am" has been rewritten in "C".
103108

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+
104113

105114
Also contains various documentation updates and code clean-ups.
106115

@@ -117,7 +126,7 @@ notes for details).
117126
particular date format.
118127
(merge e7aac44 da/subtree-date-confusion later to maint).
119128

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
121130
symbolic reference points at an unborn branch that cannot be
122131
created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
123132
points at refs/heads/a) failed.
@@ -180,6 +189,29 @@ notes for details).
180189
single letter nickname.
181190
(merge bc598c3 mh/get-remote-group-fix later to maint).
182191

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+
183215
* Code cleanups and documentation updates.
184216
(merge 1c601af es/doc-clean-outdated-tools later to maint).
185217
(merge 3581304 kn/tag-doc-fix later to maint).
@@ -188,3 +220,4 @@ notes for details).
188220
(merge 14691e3 sb/parse-options-codeformat later to maint).
189221
(merge 4a6ada3 ad/bisect-cleanup later to maint).
190222
(merge da4c5ad ta/docfix-index-format-tech later to maint).
223+
(merge ae25fd3 sb/check-return-from-read-ref later to maint).

0 commit comments

Comments
 (0)