@@ -79,6 +79,27 @@ Foreign interfaces, subsystems and ports.
7979
8080UI, Workflows & Features
8181
82+ * In addition to the choice from "rebase, merge, or checkout-detach",
83+ "submodule update" can allow a custom command to be used in to
84+ update the working tree of submodules via the "submodule.*.update"
85+ configuration variable.
86+
87+ * "git submodule update" can optionally clone the submodule
88+ repositories shallowly.
89+
90+ * "git format-patch" learned "--from[=whom]" option, which sets the
91+ "From: " header to the specified person (or the person who runs the
92+ command, if "=whom" part is missing) and move the original author
93+ information to an in-body From: header as necessary.
94+
95+ * The configuration variable "merge.ff" was cleary a tri-state to
96+ choose one from "favor fast-forward when possible", "always create
97+ a merge even when the history could fast-forward" and "do not
98+ create any merge, only update when the history fast-forwards", but
99+ the command line parser did not implement the usual convention of
100+ "last one wins, and command line overrides the configuration"
101+ correctly.
102+
82103 * "gitweb" learned to optionally place extra links that point at the
83104 levels higher than the Gitweb pages themselves in the breadcrumbs,
84105 so that it can be used as part of a larger installation.
@@ -179,6 +200,9 @@ UI, Workflows & Features
179200
180201Performance, Internal Implementation, etc.
181202
203+ * Fetching between repositories with many refs employed O(n^2)
204+ algorithm to match up the common objects, which has been corrected.
205+
182206 * The original way to specify remote repository using .git/branches/
183207 used to have a nifty feature. The code to support the feature was
184208 still in a function but the caller was changed not to call it 5
@@ -244,6 +268,11 @@ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance
244268track are contained in this release (see release notes to them for
245269details).
246270
271+ * Pass port number as a separate argument when "send-email" initializes
272+ Net::SMTP, instead of as a part of the hostname, i.e. host:port.
273+ This allows GSSAPI codepath to match with the hostname given.
274+ (merge 1a741bf bc/send-email-use-port-as-separate-param later to maint).
275+
247276 * "git diff" refused to even show difference when core.safecrlf is
248277 set to true (i.e. error out) and there are offending lines in the
249278 working tree files.
@@ -279,30 +308,24 @@ details).
279308 * "git apply" parsed patches that add new files, generated by
280309 programs other than Git, incorrectly. This is an old breakage in
281310 v1.7.11 and will need to be merged down to the maintanance tracks.
282- (merge 212eb96 tr/maint-apply-non-git-patch-parsefix later to maint).
283311
284312 * Older cURL wanted piece of memory we call it with to be stable, but
285313 we updated the auth material after handing it to a call.
286- (merge a94cf2c bc/http-keep-memory-given-to-curl later to maint).
287314
288315 * "git pull" into nothing trashed "local changes" that were in the
289316 index, and this avoids it.
290- (merge b4dc085 jk/pull-into-dirty-unborn later to maint).
291317
292318 * Many "git submodule" operations do not work on a submodule at a
293319 path whose name is not in ASCII.
294- (merge bed9470 fg/submodule-non-ascii-path later to maint).
295320
296321 * "cherry-pick" had a small leak in an error codepath.
297- (merge 706728a fc/sequencer-plug-leak later to maint).
298322
299323 * Logic used by git-send-email to suppress cc mishandled names like
300324 "A U. Thor" <
[email protected] >, where the human readable part
301325 needs to be quoted (the user input may not have the double quotes
302326 around the name, and comparison was done between quoted and
303327 unquoted strings). It also mishandled names that need RFC2047
304328 quoting.
305- (merge 1495266 mt/send-email-cc-match-fix later to maint).
306329
307330 * Call to discard_cache/discard_index (used when we use different
308331 contents of the index in-core, in many operations like commit,
@@ -313,102 +336,79 @@ details).
313336 * "gitweb" forgot to clear a global variable $search_regexp upon each
314337 request, mistakenly carrying over the previous search to a new one
315338 when used as a persistent CGI.
316- (merge ca7a5dc cm/gitweb-project-list-persistent-cgi-fix later to maint).
317339
318340 * The wildmatch engine did not honor WM_CASEFOLD option correctly.
319- (merge b79c0c3 ar/wildmatch-foldcase later to maint).
320341
321342 * "git log -c --follow $path" segfaulted upon hitting the commit that
322343 renamed the $path being followed.
323- (merge 46ec510 cb/log-follow-with-combined later to maint).
324344
325345 * When a reflog notation is used for implicit "current branch", we
326346 did not say which branch and worse said "branch ''".
327- (merge 305ebea rr/die-on-missing-upstream later to maint).
328347
329348 * "difftool --dir-diff" did not copy back changes made by the
330349 end-user in the diff tool backend to the working tree in some
331350 cases.
332- (merge 32eaf1d ks/difftool-dir-diff-copy-fix later to maint).
333351
334352 * "git push $there HEAD:branch" did not resolve HEAD early enough, so
335353 it was easy to flip it around while push is still going on and push
336354 out a branch that the user did not originally intended when the
337355 command was started.
338- (merge 0f075b2 rr/push-head later to maint).
339356
340357 * The bash prompt code (in contrib/) displayed the name of the branch
341358 being rebased when "rebase -i/-m/-p" modes are in use, but not the
342359 plain vanilla "rebase".
343- (merge 1306321 fc/show-branch-in-rebase-am later to maint).
344360
345361 * Handling of negative exclude pattern for directories "!dir" was
346362 broken in the update to v1.8.3.
347- (merge c3c327d kb/status-ignored-optim-2 later to maint).
348363
349364 * zsh prompt script that borrowed from bash prompt script did not
350365 work due to slight differences in array variable notation between
351366 these two shells.
352- (merge d0583da tg/maint-zsh-svn-remote-prompt later to maint).
353367
354368 * An entry for "file://" scheme in the enumeration of URL types Git
355369 can take in the HTML documentation was made into a clickable link
356370 by mistake.
357- (merge 4c32e36 nd/urls-doc-no-file-hyperlink-fix later to maint).
358371
359372 * "git push --[no-]verify" was not documented.
360- (merge 90d32d1 tr/push-no-verify-doc later to maint).
361373
362374 * Stop installing the git-remote-testpy script that is only used for
363375 testing.
364- (merge 416fda6 fc/makefile later to maint).
365376
366377 * "git commit --allow-empty-message -m ''" should not start an
367378 editor.
368- (merge 2520677 rs/commit-m-no-edit later to maint).
369379
370380 * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
371381 incorrectly when your previous branch was "frotz" (it should be
372382 rewritten to "git merge frotz~22" instead).
373- (merge 84cf246 jc/strbuf-branchname-fix later to maint).
374383
375384 * "git diff -c -p" was not showing a deleted line from a hunk when
376385 another hunk immediately begins where the earlier one ends.
377- (merge aac3857 mk/combine-diff-context-horizon-fix later to maint).
378386
379387 * "git log --ancestry-path A...B" did not work as expected, as it did
380388 not pay attention to the fact that the merge base between A and B
381389 was the bottom of the range being specified.
382- (merge a765499 kb/ancestry-path-threedots later to maint).
383390
384391 * Mac OS X does not like to write(2) more than INT_MAX number of
385392 bytes; work it around by chopping write(2) into smaller pieces.
386- (merge 6c642a8 fc/macos-x-clipped-write later to maint).
387393
388394 * Newer MacOS X encourages the programs to compile and link with
389395 their CommonCrypto, not with OpenSSL.
390- (merge be4c828 da/darwin later to maint).
391396
392397 * "git clone foo/bar:baz" cannot be a request to clone from a remote
393398 over git-over-ssh specified in the scp style. This case is now
394399 detected and clones from a local repository at "foo/bar:baz".
395- (merge 6000334 nd/clone-local-with-colon later to maint).
396400
397401 * When $HOME is misconfigured to point at an unreadable directory, we
398402 used to complain and die. Loosen the check.
399- (merge 4698c8f jn/config-ignore-inaccessible later to maint).
400403
401404 * "git subtree" (in contrib/) had one codepath with loose error
402405 checks to lose data at the remote side.
403- (merge 3212d56 jk/subtree-do-not-push-if-split-fails later to maint).
404406
405407 * "git fetch" into a shallow repository from a repository that does
406408 not know about the shallow boundary commits (e.g. a different fork
407409 from the repository the current shallow repository was cloned from)
408410 did not work correctly.
409- (merge 71d5f93 mh/fetch-into-shallow later to maint).
410411
411412 * "git checkout foo" DWIMs the intended "upstream" and turns it into
412413 "git checkout -t -b foo remotes/origin/foo". This codepath has been
413414 updated to correctly take existing remote definitions into account.
414- (merge 229177a jh/checkout-auto-tracking later to maint).
0 commit comments