From 87680d32efb6d14f162e54ad3bda4e3d6c908559 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 20 May 2020 08:33:55 -0700 Subject: [PATCH] Git 2.27-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.27.0.txt | 14 ++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt index e3121d0164..5fb8c0cf67 100644 --- a/Documentation/RelNotes/2.27.0.txt +++ b/Documentation/RelNotes/2.27.0.txt @@ -178,6 +178,11 @@ Performance, Internal Implementation, Development Support etc. start_progress() and the stop_progress() calls as a "region" to be traced. + * Instead of downloading Windows SDK for CI jobs for windows builds + from an external site (wingit.blob.core.windows.net), use the one + created in the windows-build job, to work around quota issues at + the external site. + Fixes since v2.26 ----------------- @@ -470,6 +475,15 @@ Fixes since v2.26 name. This has been corrected. (merge 9068cfb20f rs/fsck-duplicate-names-in-trees later to maint). + * Code clean-up by removing a compatibility implementation of a + function we no longer use. + (merge 84b0115f0d cb/no-more-gmtime later to maint). + + * When a binary file gets modified and renamed on both sides of history + to different locations, both files would be written to the working + tree but both would have the contents from "ours". This has been + corrected so that the path from each side gets their original content. + * Other code cleanup, docfix, build fix, etc. (merge 564956f358 jc/maintain-doc later to maint). (merge 7422b2a0a1 sg/commit-slab-clarify-peek later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 03d2243c0d..165ce7a4a4 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.27.0-rc0 +DEF_VER=v2.27.0-rc1 LF=' ' -- 2.11.4.GIT