From efcab5b7a3d2ce2ae4bf808b335938098b18d960 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 14 May 2020 14:39:28 -0700 Subject: [PATCH] Git 2.27-rc0 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.27.0.txt | 27 +++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt index b398961c8a..e3121d0164 100644 --- a/Documentation/RelNotes/2.27.0.txt +++ b/Documentation/RelNotes/2.27.0.txt @@ -108,6 +108,13 @@ UI, Workflows & Features * "git restore --staged --worktree" now defaults to take the contents out of "HEAD", instead of erring out. + * "git p4" learned to recover from a (broken) state where a directory + and a file are recorded at the same path in the Perforce repository + the same way as their clients do. + + * "git multi-pack-index repack" has been taught to honor some + repack.* configuration variables. + Performance, Internal Implementation, Development Support etc. @@ -167,6 +174,10 @@ Performance, Internal Implementation, Development Support etc. * Instead of always building all branches at GitHub via Actions, users can specify which branches to build. + * Codepaths that show progress meter have been taught to also use the + start_progress() and the stop_progress() calls as a "region" to be + traced. + Fixes since v2.26 ----------------- @@ -444,6 +455,21 @@ Fixes since v2.26 e.g. auto-follow tags. (merge 08450ef791 cc/upload-pack-v2-fetch-fix later to maint). + * "git bisect replay" had trouble with input files when they used + CRLF line ending, which has been corrected. + (merge 6c722cbe5a cw/bisect-replay-with-dos later to maint). + + * "rebase -i" segfaulted when rearranging a sequence that has a + fix-up that applies another fix-up (which may or may not be a + fix-up of yet another step). + (merge 02471e7e20 js/rebase-autosquash-double-fixup-fix later to maint). + + * "git fsck" ensures that the paths recorded in tree objects are + sorted and without duplicates, but it failed to notice a case where + a blob is followed by entries that sort before a tree with the same + name. This has been corrected. + (merge 9068cfb20f rs/fsck-duplicate-names-in-trees later to maint). + * 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). @@ -472,3 +498,4 @@ Fixes since v2.26 (merge bdccbf7047 mt/doc-worktree-ref later to maint). (merge ce9baf234f dl/push-recurse-submodules-fix later to maint). (merge 4153274052 bc/doc-credential-helper-value later to maint). + (merge 5c7bb0146e jc/codingstyle-compare-with-null later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 21f929e7ee..03d2243c0d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.26.GIT +DEF_VER=v2.27.0-rc0 LF=' ' -- 2.39.2