even when the other side hasn't enabled allowTipSHA1InWant.
* The recently introduced "[includeIf "gitdir:$dir"] path=..."
- mechansim has further been taught to take symlinks into account.
+ mechanism has further been taught to take symlinks into account.
The directory "$dir" specified in "gitdir:$dir" may be a symlink to
a real location, not something that $(getcwd) may return. In such
a case, a realpath of "$dir" is compared with the real path of the
and also allow linking with the newer PCRE v2 library.
* "filter-branch" learned a pseudo filter "--setup" that can be used
- to define a common function/variable that can be used by other
+ to define common functions/variables that can be used by other
filters.
* Using "git add d/i/r" when d/i/r is the top of the working tree of
would appear as a not-quite-initialized submodule to others. We
learned to give warnings when this happens.
+ * "git status" learned to optionally give how many stash entries the
+ user has in its output.
+
+ * "git status" has long shown essentially the same message as "git
+ commit"; the message it gives while preparing for the root commit,
+ i.e. "Initial commit", was hard to understand for some new users.
+ Now it says "No commits yet" to stress more on the current status
+ (rather than the commit the user is preparing for, which is more in
+ line with the focus of "git commit").
+
+ * "git send-email" learned to overcome some SMTP server limitation
+ that does not allow many pieces of e-mails to be sent over a single
+ session.
+
+ * An old message shown in the commit log template was removed, as it
+ has outlived its usefulness.
+
Performance, Internal Implementation, Development Support etc.
* The 'diff-highlight' program (in contrib/) has been restructured
for easier reuse by an external project 'diff-so-fancy'.
- (merge 0c977dbc81 jk/diff-highlight-module later to maint).
* A common pattern to free a piece of memory and assign NULL to the
pointer that used to point at it has been replaced with a new
FREE_AND_NULL() macro.
+ * Traditionally, the default die() routine had a code to prevent it
+ from getting called multiple times, which interacted badly when a
+ threaded program used it (one downside is that the real error may
+ be hidden and instead the only error message given to the user may
+ end up being "die recursion detected", which is not very useful).
+
+ * Introduce a "repository" object to eventually make it easier to
+ work in multiple repositories (the primary focus is to work with
+ the superproject and its submodules) in a single process.
+
+ * Optimize "what are the object names already taken in an alternate
+ object database?" query that is used to derive the length of prefix
+ an object name is uniquely abbreviated to.
+
Also contains various documentation updates and code clean-ups.
* "git mergetool" learned to work around a wrapper MacOS X adds
around underlying meld.
- (merge 0af85f84bd da/mergetools-meld-output-opt-on-macos later to maint).
* An example in documentation that does not work in multi worktree
configuration has been corrected.
- (merge 773a88914f ah/doc-gitattributes-empty-index later to maint).
* The pretty-format specifiers like '%h', '%t', etc. had an
optimization that no longer works correctly. In preparation/hope
of getting it correctly implemented, first discard the optimization
that is broken.
- (merge fe9e2aefd4 rs/pretty-add-again later to maint).
* The code to pick up and execute command alias definition from the
configuration used to switch to the top of the working tree and
then come back when the expanded alias was executed, which was
unnecessarilyl complex. Attempt to simplify the logic by using the
early-config mechanism that does not chdir around.
- (merge a9bcf6586d js/alias-early-config later to maint).
* Fix configuration codepath to pay proper attention to commondir
that is used in multi-worktree situation, and isolate config API
into its own header file.
(merge dc8441fdb4 bw/config-h later to maint).
+ * "git add -p" were updated in 2.12 timeframe to cope with custom
+ core.commentchar but the implementation was buggy and a
+ metacharacter like $ and * did not work.
+
+ * A recent regression in "git rebase -i" has been fixed and tests
+ that would have caught it and others have been added.
+
+ * An unaligned 32-bit access in pack-bitmap code ahs been corrected.
+
+ * Tighten error checks for invalid "git apply" input.
+
+ * The split index code did not honor core.sharedrepository setting
+ correctly.
+
+ * The Makefile rule in contrib/subtree for building documentation
+ learned to honour USE_ASCIIDOCTOR just like the main documentation
+ set does.
+
+ * Update the sha1dc again to fix portability glitches.
+
+ * Code clean-up to fix possible buffer over-reading.
+ (merge 8bc172e5f2 rs/apply-avoid-over-reading later to maint).
+
+ * A few tests that tried to verify the contents of push certificates
+ did not use 'git rev-parse' to formulate the line to look for in
+ the certificate correctly.
+
+ * Update the character width tables.
+ (merge 7560aacd7c bb/unicode-10.0 later to maint).
+
+ * After "git branch --move" of the currently checked out branch, the
+ code to walk the reflog of HEAD via "log -g" and friends
+ incorrectly stopped at the reflog entry that records the renaming
+ of the branch.
+ (merge e30d463d45 jk/reflog-walk-maint later to maint).
+
+ * The rewrite of "git branch --list" using for-each-ref's internals
+ that happened in v2.13 regressed its handling of color.branch.local;
+ this has been fixed.
+ (merge 5b5c9c3e19 kn/ref-filter-branch-list later to maint).
+
* Other minor doc, test and build updates and code cleanups.
- (merge 68241cb9dd sb/t4005-modernize later to maint).
+ (merge 3f9c637ec7 pw/unquote-path-in-git-pm later to maint).
+ (merge 669638fe7a ks/typofix-commit-c-comment later to maint).
+ (merge 5053313562 rs/urlmatch-cleanup later to maint).
+ (merge 42c78a216e rs/use-div-round-up later to maint).
+ (merge 5e8d2729ae rs/wt-status-cleanup later to maint).
+ (merge 01826066b0 ks/fix-rebase-doc-picture later to maint).