From: Junio C Hamano Date: Thu, 15 Feb 2018 23:26:42 +0000 (-0800) Subject: Sync with master X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/499d7c4f91e5700f33c95ad15c0324d852af466c?hp=7648891022e3894e0cb642f242d129e29ec096b6 Sync with master * master: Git 2.16.2 Third batch for 2.17 --- diff --git a/Documentation/RelNotes/2.16.2.txt b/Documentation/RelNotes/2.16.2.txt new file mode 100644 index 0000000000..a216466d3d --- /dev/null +++ b/Documentation/RelNotes/2.16.2.txt @@ -0,0 +1,30 @@ +Git v2.16.2 Release Notes +========================= + +Fixes since v2.16.1 +------------------- + + * An old regression in "git describe --all $annotated_tag^0" has been + fixed. + + * "git svn dcommit" did not take into account the fact that a + svn+ssh:// URL with a username@ (typically used for pushing) refers + to the same SVN repository without the username@ and failed when + svn.pushmergeinfo option is set. + + * "git merge -Xours/-Xtheirs" learned to use our/their version when + resolving a conflicting updates to a symbolic link. + + * "git clone $there $here" is allowed even when here directory exists + as long as it is an empty directory, but the command incorrectly + removed it upon a failure of the operation. + + * "git stash -- " incorrectly blew away untracked files in + the directory that matched the pathspec, which has been corrected. + + * "git add -p" was taught to ignore local changes to submodules as + they do not interfere with the partial addition of regular changes + anyway. + + +Also contains various documentation updates and code clean-ups. diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.txt index e1e509b5b0..1fe7b61a67 100644 --- a/Documentation/RelNotes/2.17.0.txt +++ b/Documentation/RelNotes/2.17.0.txt @@ -59,6 +59,16 @@ Performance, Internal Implementation, Development Support etc. gives performance boost for a few tens of percents in some sample scenarios. + * Push the submodule version of collision-detecting SHA-1 hash + implementation a bit harder on builders. + + * Avoid mmapping small files while using packed refs (especially ones + with zero size, which would cause later munmap() to fail). + (merge ba41a8b600 kg/packed-ref-cache-fix later to maint). + + * Conversion from uchar[20] to struct object_id continues. + + * More tests for wildmatch functions. Also contains various documentation updates and code clean-ups. @@ -143,6 +153,19 @@ Fixes since v2.16 * Workaround for segfault with more recent versions of SVN. (merge 7f6f75e97a ew/svn-branch-segfault-fix later to maint). + * Plug recently introduced leaks in fsck. + (merge ba3a08ca0e jt/fsck-code-cleanup later to maint). + + * "git pull --rebase" did not pass verbosity setting down when + recursing into a submodule. + (merge a56771a668 sb/pull-rebase-submodule later to maint). + + * The way "git reset --hard" reports the commit the updated HEAD + points at is made consistent with the way how the commit title is + generated by the other parts of the system. This matters when the + title is spread across physically multiple lines. + (merge 1cf823fb68 tg/reset-hard-show-head-with-pretty later to maint). + * Other minor doc, test and build updates and code cleanups. (merge e2a5a028c7 bw/oidmap-autoinit later to maint). (merge f0a6068a9f ys/bisect-object-id-missing-conversion-fix later to maint). @@ -159,3 +182,6 @@ Fixes since v2.16 (merge 4e801463c7 jc/mailinfo-cleanup-fix later to maint). (merge ef5b3a6c5e nd/shared-index-fix later to maint). (merge 9f5258cbb8 tz/doc-show-defaults-to-head later to maint). + (merge b780e4407d jc/worktree-add-short-help later to maint). + (merge ae239fc8e5 rs/cocci-strbuf-addf-to-addstr later to maint). + (merge 2e22a85e5c nd/ignore-glob-doc-update later to maint).