diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-25 00:34:11 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-25 00:34:11 +0300 |
commit | a2ba37c57b7e1f72900b0c1183ef38e52c3f9d27 (patch) | |
tree | 475c1e0f38af7a14b82c773ddfef34ab10131716 /Documentation | |
parent | 50f03c6676ed5ea040dd53272882d3aac2ee1b48 (diff) |
Eleventh batch for 2.14
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes/2.14.0.txt | 61 |
1 files changed, 46 insertions, 15 deletions
diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.txt index 9c252cdc4ff..96041652f07 100644 --- a/Documentation/RelNotes/2.14.0.txt +++ b/Documentation/RelNotes/2.14.0.txt @@ -38,19 +38,16 @@ UI, Workflows & Features * "git archive --format=zip" learned to use zip64 extension when necessary to go beyond the 4GB limit. - (merge 867e40ff3a rs/large-zip later to maint). * "git reset" learned "--recurse-submodules" option. * "git diff --submodule=diff" now recurses into nested submodules. - (merge 5a5221427c jk/diff-submodule-diff-inline later to maint). * "git repack" learned to accept the --threads=<n> option and pass it to pack-objects. * "git send-email" learned to run sendemail-validate hook to inspect and reject a message before sending it out. - (merge 177409e589 jt/send-email-validate-hook later to maint). * There is no good reason why "git fetch $there $sha1" should fail when the $sha1 names an object at the tip of an advertised ref, @@ -81,7 +78,6 @@ UI, Workflows & Features required disambiguation more often. The command line parser learned to say "it's a pathspec" a bit more often when the syntax looks like so. - (merge 2cb47ab695 jk/pathspec-magic-disambiguation later to maint). * Update "perl-compatible regular expression" support to enable JIT and also allow linking with the newer PCRE v2 library. @@ -90,6 +86,11 @@ UI, Workflows & Features to define a common function/variable 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 + a separate repository would create a gitlink in the index, which + would appear as a not-quite-initialized submodule to others. We + learned to give warnings when this happens. + Performance, Internal Implementation, Development Support etc. @@ -99,7 +100,6 @@ Performance, Internal Implementation, Development Support etc. * Code to update the cache-tree has been tightened so that we won't accidentally write out any 0{40} entry in the tree object. - (merge a96d3cc3f6 jk/no-null-sha1-in-cache-tree later to maint). * Attempt to allow us notice "fishy" situation where we fail to remove the temporary directory used during the test. @@ -122,14 +122,11 @@ Performance, Internal Implementation, Development Support etc. * Simplify parse_pathspec() codepath and stop it from looking at the default in-core index. - (merge 08de9151a8 bw/pathspec-sans-the-index later to maint). * Add perf-test for wildmatch. - (merge 62ca75a6b9 ab/perf-wildmatch later to maint). * Code from "conversion using external process" codepath has been extracted to a separate sub-process.[ch] module. - (merge 4f2a2e9f0e bp/sub-process-convert-filter later to maint). * When "git checkout", "git merge", etc. manipulates the in-core index, various pieces of information in the index extensions are @@ -140,7 +137,6 @@ Performance, Internal Implementation, Development Support etc. cache is properly invalidated). * The internal implementation of "git grep" has seen some clean-up. - (merge 8df4c2953f ab/grep-preparatory-cleanup later to maint). * Update the C style recommendation for notes for translators, as recent versions of gettext tools can work with our style of @@ -174,11 +170,23 @@ Performance, Internal Implementation, Development Support etc. * Three instances of the same helper function have been consolidated to one. - (merge e0556a928f pc/dir-count-slashes later to maint). * "fast-import" uses a default pack chain depth that is consistent with other parts of the system. + * A new test to show the interaction between the pattern [^a-z] + (which matches '/') and a slash in a path has been added. The + pattern should not match the slash with "pathmatch", but should + with "wildmatch". + + * 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. + Also contains various documentation updates and code clean-ups. @@ -227,11 +235,6 @@ notes for details). * "git checkout --recurse-submodules" did not quite work with a submodule that itself has submodules. - * Plug some leaks and updates internal API used to implement the - split index feature to make it easier to avoid such a leak in the - future. - (merge de950c5773 nd/split-index-unshare later to maint). - * "pack-objects" can stream a slice of an existing packfile out when the pack bitmap can tell that the reachable objects are all needed in the output, without inspecting individual objects. This @@ -361,6 +364,32 @@ notes for details). and %Z with caller-supplied values to help working around this. (merge 6eced3ec5e rs/strbuf-addftime-zZ later to maint). + * "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). + * Other minor doc, test and build updates and code cleanups. (merge 8ba74bfd7c jc/diff-tree-stale-comment later to maint). (merge 68602c01fd sb/submodule-rm-absorb later to maint). @@ -368,3 +397,5 @@ notes for details). (merge ae52d57f0b km/test-mailinfo-b-failure later to maint). (merge 8b1d9136e1 sg/revision-parser-skip-prefix later to maint). (merge bb8efa1772 sd/t3200-branch-m-test later to maint). + (merge 8abc09c0e3 sg/doc-pretty-formats later to maint). + (merge 680b469e83 sn/reset-doc-typofix later to maint). |