Skip to content

Commit a194ead

Browse files
committed
Update draft release notes to 1.8.5
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4c4d9d9 commit a194ead

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed

Documentation/RelNotes/1.8.5.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ Foreign interfaces, subsystems and ports.
6363

6464
UI, Workflows & Features
6565

66+
* "git pull --rebase" always chose to do the bog-standard flattening
67+
rebase. You can tell it to run "rebase --preserve-merges" by
68+
setting "pull.rebase" configuration to "preserve".
69+
70+
* "git push --no-thin" actually disables the "thin pack transfer"
71+
optimization.
72+
6673
* Magic pathspecs like ":(icase)makefile" that matches both
6774
Makefile and makefile can be used in more places.
6875

@@ -144,6 +151,31 @@ Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
144151
track are contained in this release (see release notes to them for
145152
details).
146153

154+
* "git ls-files -k" needs to crawl only the part of the working tree
155+
that may overlap the paths in the index to find killed files, but
156+
shared code with the logic to find all the untracked files, which
157+
made it unnecessarily inefficient.
158+
(merge 680be04 jc/ls-files-killed-optim later to maint).
159+
160+
* The commit object names in the insn sheet that was prepared at the
161+
beginning of "rebase -i" session can become ambiguous as the
162+
rebasing progresses and the repository gains more commits. Make
163+
sure the internal record is kept with full 40-hex object names.
164+
(merge 75c6976 es/rebase-i-no-abbrev later to maint).
165+
166+
* "git rebase --preserve-merges" internally used the merge machinery
167+
and as a side effect, left merge summary message in the log, but
168+
when rebasing, there should not be a need for merge summary.
169+
(merge a9f739c rt/rebase-p-no-merge-summary later to maint).
170+
171+
* A call to xread() was used without a loop around to cope with short
172+
read in the codepath to stream new contents to a pack.
173+
(merge e92527c js/xread-in-full later to maint).
174+
175+
* "git rebase -i" forgot that the comment character can be
176+
configurable while reading its insn sheet.
177+
(merge 7bca7af es/rebase-i-respect-core-commentchar later to maint).
178+
147179
* The mailmap support code read past the allocated buffer when the
148180
mailmap file ended with an incomplete line.
149181
(merge f972a16 jk/mailmap-incomplete-line later to maint).

0 commit comments

Comments
 (0)