From fc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 Oct 2017 14:44:17 +0900 Subject: [PATCH] Git 2.14.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.14.3.txt | 24 ++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.14.3.txt b/Documentation/RelNotes/2.14.3.txt index 61f569aa9a..977c9e857c 100644 --- a/Documentation/RelNotes/2.14.3.txt +++ b/Documentation/RelNotes/2.14.3.txt @@ -72,4 +72,28 @@ Fixes since v2.14.2 them as the patch created internally by "git add -p" were colored (heh) and made unusable. This has been fixed. + * "git branch -M a b" while on a branch that is completely unrelated + to either branch a or branch b misbehaved when multiple worktree + was in use. This has been fixed. + + * "git fast-export" with -M/-C option issued "copy" instruction on a + path that is simultaneously modified, which was incorrect. + + * The checkpoint command "git fast-import" did not flush updates to + refs and marks unless at least one object was created since the + last checkpoint, which has been corrected, as these things can + happen without any new object getting created. + + * The scripts to drive TravisCI has been reorganized and then an + optimization to avoid spending cycles on a branch whose tip is + tagged has been implemented. + + * "git fetch :" allows an object name on the + side when the other side accepts such a request since Git v2.5, but + the documentation was left stale. + + * A regression in 2.11 that made the code to read the list of + alternate object stores overrun the end of the string has been + fixed. + Also contains various documentation updates and code clean-ups. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1ab52e381e..9c203fb249 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.14.2 +DEF_VER=v2.14.3 LF=' '