@@ -12,13 +12,19 @@ Backward compatibility notes.
1212 release (yet).
1313
1414 * The historical argument order "git merge <msg> HEAD <commit>..."
15- has been deprecated for quite some time, and will be removed in a
16- future release.
15+ has been deprecated for quite some time, and is now removed.
1716
1817 * The default location "~/.git-credential-cache/socket" for the
1918 socket used to communicate with the credential-cache daemon has
2019 been moved to "~/.cache/git/credential/socket".
2120
21+ * Git now avoids blindly falling back to ".git" when the setup
22+ sequence said we are _not_ in Git repository. A corner case that
23+ happens to work right now may be broken by a call to die("BUG").
24+ We've tried hard to locate such cases and fixed them, but there
25+ might still be cases that need to be addressed--bug reports are
26+ greatly appreciated.
27+
2228
2329Updates since v2.12
2430-------------------
@@ -145,6 +151,20 @@ UI, Workflows & Features
145151 doing other things, output from reset seeped out). These, and
146152 other chattyness has been fixed.
147153
154+ * "git merge <message> HEAD <commit>" syntax that has been deprecated
155+ since October 2007 has been removed.
156+
157+ * The refs completion for large number of refs has been sped up,
158+ partly by giving up disambiguating ambiguous refs and partly by
159+ eliminating most of the shell processing between 'git for-each-ref'
160+ and 'ls-remote' and Bash's completion facility.
161+
162+ * On many keyboards, typing "@{" involves holding down SHIFT key and
163+ one can easily end up with "@{Up..." when typing "@{upstream}". As
164+ the upstream/push keywords do not appear anywhere else in the syntax,
165+ we can safely accept them case insensitively without introducing
166+ ambiguity or confusion to solve this.
167+
148168
149169Performance, Internal Implementation, Development Support etc.
150170
@@ -228,6 +248,16 @@ Performance, Internal Implementation, Development Support etc.
228248 * An earlier version of sha1dc/sha1.c that was merged to 'master'
229249 compiled incorrectly on Windows, which has been fixed.
230250
251+ * "what URL do we want to update this submodule?" and "are we
252+ interested in this submodule?" are split into two distinct
253+ concepts, and then the way used to express the latter got extended,
254+ paving a way to make it easier to manage a project with many
255+ submodules and make it possible to later extend use of multiple
256+ worktrees for a project with submodules.
257+
258+ * Some debugging output from "git describe" were marked for l10n,
259+ but some weren't. Mark missing ones for l10n.
260+
231261
232262Also contains various documentation updates and code clean-ups.
233263
@@ -377,8 +407,40 @@ notes for details).
377407 * Fix for NO_PTHREADS option.
378408 (merge 2225e1ea20 bw/grep-recurse-submodules later to maint).
379409
410+ * Git now avoids blindly falling back to ".git" when the setup
411+ sequence said we are _not_ in Git repository. A corner case that
412+ happens to work right now may be broken by a call to die("BUG").
413+ (merge b1ef400eec jk/no-looking-at-dotgit-outside-repo-final later to maint).
414+
415+ * A few commands that recently learned the "--recurse-submodule"
416+ option misbehaved when started from a subdirectory of the
417+ superproject.
418+ (merge b2dfeb7c00 bw/recurse-submodules-relative-fix later to maint).
419+
420+ * FreeBSD implementation of getcwd(3) behaved differently when an
421+ intermediate directory is unreadable/unsearchable depending on the
422+ length of the buffer provided, which our strbuf_getcwd() was not
423+ aware of. strbuf_getcwd() has been taught to cope with it better.
424+ (merge a54e938e5b rs/freebsd-getcwd-workaround later to maint).
425+
426+ * A recent update to "rebase -i" stopped running hooks for the "git
427+ commit" command during "reword" action, which has been fixed.
428+
429+ * Removing an entry from a notes tree and then looking another note
430+ entry from the resulting tree using the internal notes API
431+ functions did not work as expected. No in-tree users of the API
432+ has such access pattern, but it still is worth fixing.
433+
434+ * "git receive-pack" could have been forced to die by attempting
435+ allocate an unreasonably large amount of memory with a crafted push
436+ certificate; this has been fixed.
437+ (merge f2214dede9 bc/push-cert-receive-fix later to maint).
438+
380439 * Other minor doc, test and build updates and code cleanups.
381440 (merge df2a6e38b7 jk/pager-in-use later to maint).
382441 (merge 75ec4a6cb0 ab/branch-list-doc later to maint).
383442 (merge 3e5b36c637 sg/skip-prefix-in-prettify-refname later to maint).
384443 (merge 2c5e2865cc jk/fast-import-cleanup later to maint).
444+ (merge 4473060bc2 ab/test-readme-updates later to maint).
445+ (merge 48a96972fd ab/doc-submitting later to maint).
446+ (merge f5c2bc2b96 jk/make-coccicheck-detect-errors later to maint).
0 commit comments