* "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).
+ (merge d9d501b068 jc/rerere-multi later to maint).
* "git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
+ * 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 "commit.verbose"
+ configuration variable and act as if "--verbose" option was
+ given from the command line.
+
+ * Give hints to GMail users with two-factor auth enabled that
+ they need app-specific-password when using send-email.
+
Performance, Internal Implementation, Development Support etc.
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).
* 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.
+ * Update of "git submodule" to move pieces of logic to C 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.
+ (merge d88785e jk/test-send-sh-x-trace-elsewhere later to maint).
+
+ * 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 Porcelains 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.
+
Also contains various documentation updates and code clean-ups.
* 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).
* The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.
* "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).
* 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
(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
"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.
+ (merge e5a39ad bn/http-cookiefile-config later to maint).
+
+ * Consolidate description of tilde-expansion that is done to
+ configuration variables that take pathname to a single place.
+ (merge dca83ab jc/config-pathname-type later to maint).
+
+ * 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.
+ (merge f6a5279 sb/submodule-deinit-all later to maint).
+
+ * Many 'linkgit:<git documentation page>' references were broken,
+ which are all fixed with this.
+ (merge 1cca17d jc/linkgit-fix later to maint).
+
+ * "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.
+ (merge b98712b ls/travis-build-doc later to maint).
+
+ * "git fsck" learned to catch NUL byte in a commit object as
+ potential error and warn.
+ (merge 6d2d780 jc/fsck-nul-in-commit later to maint).
+
+ * Portability enhancement for "rebase -i" to help platforms whose
+ shell does not like "for i in <empty>" (which is not POSIX-kosher).
+ (merge 8e98b35 jk/rebase-interative-eval-fix later to maint).
+
+ * 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.
+ (merge ebf31e7 js/windows-dotgit later to maint).
+
+ * 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.
+ (merge 05a5869 kf/gpg-sig-verification-doc later to maint).
+
+ * A couple of bugs around core.autocrlf have been fixed.
+ (merge caa47ad tb/core-eol-fix later to maint).
+
+ * 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.
+ (merge 90a78b8 ar/diff-args-osx-precompose later to maint).
+
+ * "git difftool" learned to handle unmerged paths correctly in
+ dir-diff mode.
+ (merge 366f9ce da/difftool later to maint).
+
+ * The "are we talking with TTY, doing an interactive session?"
+ detection has been updated to work better for "Git for Windows".
+ (merge f7f90e0 kb/msys2-tty later to maint).
+
+ * 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).
* 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 832c0e5 lp/typofixes later to maint).
+ (merge f5ee54a sb/z-is-gnutar-ism later to maint).
+ (merge 2e3926b va/i18n-misc-updates later to maint).
+ (merge f212dcc bn/config-doc-tt-varnames later to maint).
+ (merge f54bea4 nd/remote-plural-ours-plus-theirs later to maint).
+ (merge 2bb0518 ak/t4151-ls-files-could-be-empty later to maint).
+ (merge 4df4313 jc/test-seq later to maint).
+ (merge a75a308 tb/t5601-sed-fix later to maint).
+ (merge 6c1fbe1 va/i18n-remote-comment-to-align later to maint).
+ (merge dee2303 va/mailinfo-doc-typofix later to maint).