Git 2.9 Release Notes
=====================
-Backward compatibility note
----------------------------
+Backward compatibility notes
+----------------------------
The end-user facing Porcelain level commands in the "git diff" and
-"git log" by default enables the rename detection; you can still use
-"diff.renames" configuration variable to disable this.
+"git log" family by default enable the rename detection; you can still
+use "diff.renames" configuration variable to disable this.
Merging two branches that have no common ancestor with "git merge" is
by default forbidden now to prevent creating such an unusual merge by
* Comes with git-multimail 1.3.1 (in contrib/).
- * The end-user facing Porcelain level commands like "diff" and "log"
- now enables the rename detection by default.
+ * The end-user facing commands like "git diff" and "git log"
+ now enable the rename detection by default.
* The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
as the signal to clear the values specified in various files.
* A new "interactive.diffFilter" configuration can be used to
- customize the diff shown in "git add -i" session.
+ customize the diff shown in "git add -i" sessions.
* "git p4" now allows P4 author names to be mapped to Git author
names.
to be used in a rare event that merges histories of two projects
that started their lives independently.
- * "git pull" has been taught to pass --allow-unrelated-histories
+ * "git pull" has been taught to pass the "--allow-unrelated-histories"
option to underlying "git merge".
* "git apply -v" learned to report paths in the patch that were
* When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
- originally intended. The command now expands tabs by default in
+ originally intended. The command now expands tabs by default to help
such a case, and allows the users to override it with a new option,
"--no-expand-tabs".
* "git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
- (merge 890fca8 jc/rerere-multi later to maint).
* "git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
* "git describe --contains" often made a hard-to-justify choice of
- tag to give name to a given commit, because it tried to come up
+ tag to name a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
- (merge 7550424 js/name-rev-use-oldest-ref later to maint).
- * "git clone" learned "--shallow-submodules" option.
+ * "git clone" learned the "--shallow-submodules" option.
* HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
* Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
- contents before and after it belong to a logically separate unit.
+ contents before and after it belong to logically separate units.
+
+ * A new configuration variable core.hooksPath allows customizing
+ where the hook directory is.
+
+ * An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
+ submodule honor -c credential.* from command line, 2016-02-29)
+ turned out to be a convoluted no-op; implement what it wanted to do
+ correctly, and stop filtering settings given via "git -c var=val".
+
+ * "git commit --dry-run" reported "No, no, you cannot commit." in one
+ case where "git commit" would have allowed you to commit, and this
+ improves it a little bit ("git commit --dry-run --short" still does
+ not give you the correct answer, for example). This is a stop-gap
+ measure in that "commit --short --dry-run" still gives an incorrect
+ result.
+
+ * The experimental "multiple worktree" feature gains more safety to
+ forbid operations on a branch that is checked out or being actively
+ worked on elsewhere, by noticing that e.g. it is being rebased.
+
+ * "git format-patch" learned a new "--base" option to record what
+ (public, well-known) commit the original series was built on in
+ its output.
+
+ * "git commit" learned to pay attention to the "commit.verbose"
+ configuration variable and act as if the "--verbose" option
+ was given from the command line.
+
+ * Updated documentation gives hints to GMail users with two-factor
+ auth enabled that they need app-specific-password when using
+ "git send-email".
+
+ * The manpage output of our documentation did not render well in
+ terminal; typeset literals in bold by default to make them stand
+ out more.
+
+ * The mark-up in the top-level README.md file has been updated to
+ typeset CLI command names differently from the body text.
Performance, Internal Implementation, Development Support etc.
* A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
- parallel.
+ parallel. Other updates to "git submodule" that move pieces of
+ logic to C continues.
* Rename bunch of tests on "git clone" for better organization.
do not attempt to look into refs/* when we know we do not have a
Git repository.
- * Code restructuring around the "refs" area to prepare for pluggable
+ * Code restructuring around the "refs" API to prepare for pluggable
refs backends.
- * Sources to many test helper binaries (and the generated helpers)
+ * Sources to many test helper binaries and the generated helpers
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
- Note that this can break your tests if you check out revisions
- across the merge boundary of this topic, e0b58519 (Merge branch
- 'nd/test-helpers', 2016-04-29), as bin-wrappers/test-* are not
- rebuilt to point the underlying executables. For now, "make
- distclean" is your friend.
-
* Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
- (merge bef234b st/verify-tag later to maint).
* "merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
* The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
- (merge 1fb3fb4 ld/p4-test-py3 later to maint).
* As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
- * Move from unsigned char[20] to struct object_id continues.
+ * Move from "unsigned char[20]" to "struct object_id" continues.
+
+ * The code for warning_errno/die_errno has been refactored and a new
+ error_errno() reporting helper is introduced.
+ (merge 1da045f nd/error-errno later to maint).
+
+ * Running tests with '-x' option to trace the individual command
+ executions is a useful way to debug test scripts, but some tests
+ that capture the standard error stream and check what the command
+ said can be broken with the trace output mixed in. When running
+ our tests under "bash", however, we can redirect the trace output
+ to another file descriptor to keep the standard error of programs
+ being tested intact.
+
+ * t0040 had too many unnecessary repetitions in its test data. Teach
+ test-parse-options program so that a caller can tell what it
+ expects in its output, so that these repetitions can be cleaned up.
+
+ * Add perf test for "rebase -i".
+
+ * Common mistakes when writing gitlink: in our documentation are
+ found by "make check-docs".
+
+ * t9xxx series has been updated primarily for readability, while
+ fixing small bugs in it. A few scripted Porcelain commands have
+ also been updated to fix possible bugs around their use of
+ "test -z" and "test -n".
+
+ * CI test was taught to run git-svn tests.
+
+ * "git cat-file --batch-all" has been sped up, by taking advantage
+ of the fact that it does not have to read a list of objects, in two
+ ways.
+
+ * test updates to make it more readable and maintainable.
+ (merge e6273f4 es/t1500-modernize later to maint).
+
+ * "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
+ config.mak didn't.
+ (merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
+
+ * The way how "submodule--helper list" signals unmatch error to its
+ callers has been updated.
+
+ * A bash-ism "local" has been removed from "git submodule" scripted
+ Porcelain.
Also contains various documentation updates and code clean-ups.
* Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
- * Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
- we use in imap-send, which has been adjusted for the change.
- (merge 1245c74 ky/imap-send-openssl-1.1.0 later to maint).
+ * Upcoming OpenSSL 1.1.0 will break compilation by updating a few API
+ elements we use in imap-send, which has been adjusted for the change.
* The socks5:// proxy support added back in 2.6.4 days was not aware
- that socks5h:// proxies behave differently.
+ that socks5h:// proxies behave differently from socks5:// proxies.
* "git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
* When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
- update the index, which lead to an inconsistent state for later
- operations.
+ update the index, which left an inconsistent state that would
+ break later operations.
* "git submodule" reports the paths of submodules the command
- recurses into, but this was incorrect when the command was not run
- from the root level of the superproject.
- (merge 2ab5660 sb/submodule-path-misc-bugs later to maint).
+ recurses into, but these paths were incorrectly reported when
+ the command was not run from the root level of the superproject.
* The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
- (merge d3c06c1 da/user-useconfigonly later to maint).
* "git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
- (merge a127331 sb/mv-submodule-fix later to maint).
* "git replace -e" did not honour "core.editor" configuration.
- (merge 36b1437 js/replace-edit-use-editor-configuration later to maint).
* "git push" from a corrupt repository that attempts to push a large
number of refs deadlocked; the thread to relay rejection notices
for these ref updates blocked on writing them to the main thread,
after the main thread at the receiving end notices that the push
failed and decides not to read these notices and return a failure.
- (merge f924b52a jk/push-client-deadlock-fix later to maint).
* mmap emulation on Windows has been optimized and work better without
consuming paging store when not needed.
- (merge d5425d1 js/win32-mmap later to maint).
* A question by "git send-email" to ask the identity of the sender
has been updated.
- (merge 0d6b21e jd/send-email-to-whom later to maint).
* UI consistency improvements for "git mergetool".
- (merge cce076e nf/mergetool-prompt later to maint).
* "git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
- (merge 79f4344 bw/rebase-merge-entire-branch later to maint).
* Fix a broken "p4 lfs" test.
- (merge 9e220fe ls/p4-lfs-test-fix-2.7.0 later to maint).
* Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
- (merge 82f2567 ls/p4-lfs later to maint).
* "git fetch" test t5510 was flaky while running a (forced) automagic
garbage collection.
- (merge bb05510 js/close-packs-before-gc later to maint).
* Documentation updates to help contributors setting up Travis CI
test for their patches.
- (merge 0e5d028 ls/travis-submitting-patches later to maint).
* Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
- (merge 029f372 sk/gitweb-highlight-encoding later to maint).
* "git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
- (merge 6694856 jc/commit-tree-ignore-commit-gpgsign later to maint).
+ * "http.cookieFile" configuration variable clearly wants a pathname,
+ but we forgot to treat it as such by e.g. applying tilde expansion.
+
+ * Consolidate description of tilde-expansion that is done to
+ configuration variables that take pathname to a single place.
+
+ * Correct faulty recommendation to use "git submodule deinit ." when
+ de-initialising all submodules, which would result in a strange
+ error message in a pathological corner case.
+
+ * Many 'linkgit:<git documentation page>' references were broken,
+ which are all fixed with this.
+
+ * "git rerere" can get confused by conflict markers deliberately left
+ by the inner merge step, because they are indistinguishable from
+ the real conflict markers left by the outermost merge which are
+ what the end user and "rerere" need to look at. This was fixed by
+ making the conflict markers left by the inner merges a bit longer.
+ (merge 0f9fd5c jc/ll-merge-internal later to maint).
+
+ * CI test was taught to build documentation pages.
+
+ * "git fsck" learned to catch NUL byte in a commit object as
+ potential error and warn.
+
+ * Portability enhancement for "rebase -i" to help platforms whose
+ shell does not like "for i in <empty>" (which is not POSIX-kosher).
+
+ * On Windows, .git and optionally any files whose name starts with a
+ dot are now marked as hidden, with a core.hideDotFiles knob to
+ customize this behaviour.
+
+ * Documentation for "git merge --verify-signatures" has been updated
+ to clarify that the signature of only the commit at the tip is
+ verified. Also the phrasing used for signature and key validity is
+ adjusted to align with that used by OpenPGP.
+
+ * A couple of bugs around core.autocrlf have been fixed.
+
+ * Many commands normalize command line arguments from NFD to NFC
+ variant of UTF-8 on OSX, but commands in the "diff" family did
+ not, causing "git diff $path" to complain that no such path is
+ known to Git. They have been taught to do the normalization.
+
+ * "git difftool" learned to handle unmerged paths correctly in
+ dir-diff mode.
+
+ * The "are we talking with TTY, doing an interactive session?"
+ detection has been updated to work better for "Git for Windows".
+
+ * We forgot to add "git log --decorate=auto" to documentation when we
+ added the feature back in v2.1.0 timeframe.
+ (merge 462cbb4 rj/log-decorate-auto later to maint).
+
+ * "git fast-import --export-marks" would overwrite the existing marks
+ file even when it makes a dump from its custom die routine.
+ Prevent it from doing so when we have an import-marks file but
+ haven't finished reading it.
+ (merge f4beed6 fc/fast-import-broken-marks-file later to maint).
+
+ * "git rebase -i", after it fails to auto-resolve the conflict, had
+ an unnecessary call to "git rerere" from its very early days, which
+ was spotted recently; the call has been removed.
+ (merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
* Other minor clean-ups and documentation updates
- (merge 8b5a3e9 kn/for-each-tag-branch later to maint).
- (merge 99dab16 sb/misc-cleanups later to maint).
- (merge 7a6a44c cc/apply later to maint).
- (merge 6594883 nd/remove-unused later to maint).
- (merge 0ff7410 sg/test-lib-simplify-expr-away later to maint).
- (merge 060e776 jk/fix-attribute-macro-in-2.5 later to maint).
- (merge d16df0c rt/string-list-lookup-cleanup later to maint).
- (merge 376eb60 sb/config-exit-status-list later to maint).
- (merge 9cea46c ew/doc-split-pack-disables-bitmap later to maint).
- (merge fa72245 ew/normal-to-e later to maint).
- (merge 2e39a24 rn/glossary-typofix later to maint).
- (merge cadfbef sb/clean-test-fix later to maint).
+ (merge cd82b7a pa/cherry-pick-doc-typo later to maint).
+ (merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
+ (merge aa20cbc rs/apply-name-terminate later to maint).