UI, Workflows & Features
+ * Git can be told to normalize pathnames it read from readdir(3) and
+ all arguments it got from the command line into precomposed UTF-8
+ (assuming that they come as decomposed UTF-8), in order to work
+ around issues on Mac OS.
+
+ I think there still are other places that need conversion
+ (e.g. paths that are read from stdin for some commands), but this
+ should be a good first step in the right direction.
+
* Per-user $HOME/.gitconfig file can optionally be stored in
$HOME/.config/git/config instead, which is in line with XDG.
$HOME/.config/attributes and $HOME/.config/ignore respectively when
these files exist.
+ * "git apply" learned to wiggle the base version and perform three-way
+ merge when a patch does not exactly apply to the version you have.
+
* Scripted Porcelain writers now have access to the credential API via
the "git credential" plumbing command.
default location where the build procedure installs them locally;
the variable can even point at a http:// URL.
+ * "git rebase [-i] --root $tip" can now be used to rewrite all the
+ history leading to "$tip" down to the root commit.
+
* "git rebase -i" learned "-x <cmd>" to insert "exec <cmd>" after
each commit in the resulting history.
Foreign Interface
+ * "mediawiki" remote helper (in contrib/) learned to handle file
+ attachments.
+
+ * "git p4" now uses "Jobs:" and "p4 move" when appropriate.
+
+ * vcs-svn has been updated to clean-up compilation, lift 32-bit
+ limitations, etc.
+
Performance, Internal Implementation, etc. (please report possible regressions)
* We no longer use AsciiDoc7 syntax in our documentation and favor a
more modern style.
+ * "git am --rebasing" codepath was taught to grab authorship, log
+ message and the patch text directly out of existing commits. This
+ will help rebasing commits that have confusing "diff" output in
+ their log messages.
+
* "git index-pack" and "git pack-objects" use streaming API to read
from the object store to avoid having to hold a large blob object
in-core while they are doing their thing.
releases are contained in this release (see release notes to them for
details).
+ * The error message from "git push $there :bogo" (and its equivalent
+ "git push $there --delete bogo") mentioned that we tried and failed
+ to guess what ref is being deleted based on the LHS of the refspec,
+ which we don't.
+ (merge 5742c82 jk/push-delete-ref-error-message later to maint).
+
+ * A handful of files and directories we create had tighter than
+ necessary permission bits when the user wanted to have group
+ writability (e.g. by setting "umask 002").
+ (merge 6ff2b72 ar/clone-honor-umask-at-top later to maint).
+
+ * "commit --amend" used to refuse amending a commit with an empty log
+ message, with or without "--allow-empty-message".
+ (merge d9a9357 cw/amend-commit-without-message later to maint).
+
+ * "git commit --amend --only --" was meant to allow "Clever" people to
+ rewrite the commit message without making any change even when they
+ have already changes for the next commit added to their index, but
+ it never worked as advertised since it was introduced in 1.3.0 era.
+ (merge ea2d4ed jk/maint-commit-amend-only-no-paths later to maint).
+
+ * Even though the index can record pathnames longer than 1<<12 bytes,
+ in some places we were not comparing them in full, potentially
+ replacing index entries instead of adding.
+ (merge d5f5333 tg/maint-cache-name-compare later to maint).
+
+ * "git show"'s auto-walking behaviour was an unreliable and
+ unpredictable hack; it now behaves just like "git log" does when it
+ walks.
+ (merge c5941f1 tr/maint-show-walk later to maint).
+
+ * "git diff", "git status" and anything that internally uses the
+ comparison machinery was utterly broken when the difference
+ involved a file with "-" as its name. This was due to the way "git
+ diff --no-index" was incorrectly bolted on to the system, making
+ any comparison that involves a file "-" at the root level
+ incorrectly read from the standard input.
+ (merge 4682d85 jc/refactor-diff-stdin later to maint).
+
* We did not have test to make sure "git rebase" without extra options
filters out an empty commit in the original history.
(merge 2b5ba7b mz/empty-rebase-test later to maint).
use "$PERL_PATH", the version of Perl the user told Git to use, in
our tests to avoid unnecessary breakages in tests.
(merge ad78585 vr/use-our-perl-in-tests later to maint).
-
- * "git blame" did not try to make sure that the abbreviated commit
- object names in its output are unique.
- (merge b31272f jc/maint-blame-unique-abbrev later to maint).
-
- * On Cygwin, the platform pread(2) is not thread safe, just like our
- own compat/ emulation, and cannot be used in the index-pack
- program. Makefile variable NO_THREAD_SAFE_PREAD can be defined to
- avoid use of this function in a threaded program.
- (merge c0f8654 rj/platform-pread-may-be-thread-unsafe later to maint).
-
- * "git clone --single-branch" to clone a single branch did not limit
- the cloning to the specified branch.
- (merge 0ec4b16 nd/clone-single-fix later to maint).
-
- * "git diff --no-index" did not correctly handle relative paths and
- did not correctly give exit codes when run under "--quiet" option.
- (merge 304970d th/diff-no-index-fixes later to maint).
-
- * When "git log" gets "--simplify-merges/by-decoration" together with
- "--first-parent", the combination of these options makes the
- simplification logic to use in-core commit objects that haven't
- been examined for relevance, either producing incorrect result or
- taking too long to produce any output. Teach the simplification
- logic to ignore commits that the first-parent traversal logic
- ignored when both are in effect to work around the issue.
- (merge 6e513ba jc/rev-list-simplify-merges-first-parent later to maint).
-
- * "git add" allows adding a regular file to the path where a
- submodule used to exist, but "git update-index" does not allow an
- equivalent operation to Porcelain writers.
- (merge 242f55f hv/submodule-update-nuke-submodules later to maint).
-
- * "git diff --no-index" did not work with pagers correctly.
- (merge af63b54 jk/diff-no-index-pager later to maint).
-
- * "git diff COPYING HEAD:COPYING" gave a nonsense error message that
- claimed that the treeish HEAD did not have COPYING in it.
- (merge 023e37c mm/verify-filename-fix later to maint).
-
- * The documentation for "git cherry-pick A B..C" was misleading.
- (merge b98878e cn/cherry-pick-range-docs later to maint).
-
- * "git archive" incorrectly computed the header checksum; the symptom
- was observed only when using pathnames with hi-bit set.
- (merge a5a46eb jc/ustar-checksum-is-unsigned later to maint).
-
- * Running "git bundle verify" on a bundle that records a complete
- history said "it requires these 0 commits".
- (merge 8c3710f jc/bundle-complete-notice later to maint).
-
- * "git ls-files --exclude=t -i" did not consider anything under t/ as
- excluded, as it did not pay attention to exclusion of leading paths
- while walking the index. Other two users of excluded() are also
- updated.
- (merge 0d316f0 jc/ls-files-i-dir later to maint).
-
- * "git request-pull $url dev" when the tip of "dev" branch was tagged
- with "ext4-for-linus" used the contents from the tag in the output
- but still asked the "dev" branch to be pulled, not the tag.
- (merge 682853e jc/request-pull-match-tagname later to maint).