From 65588b0b2eb73f7724aa1c9ff7e2dbde34b6bca6 Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Tue, 17 Mar 2020 16:36:05 +0100 Subject: [PATCH 1/2] unicode: update the width tables to Unicode 13.0 Now that Unicode 13.0 has been announced[0], update the character width tables to the new version. [0] https://home.unicode.org/announcing-the-unicode-standard-version-13-0/ Signed-off-by: Beat Bolli Signed-off-by: Junio C Hamano --- unicode-width.h | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/unicode-width.h b/unicode-width.h index c9d027625d..b50e686bae 100644 --- a/unicode-width.h +++ b/unicode-width.h @@ -59,7 +59,7 @@ static const struct interval zero_width[] = { { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B44 }, { 0x0B4D, 0x0B4D }, -{ 0x0B56, 0x0B56 }, +{ 0x0B55, 0x0B56 }, { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, @@ -82,6 +82,7 @@ static const struct interval zero_width[] = { { 0x0D41, 0x0D44 }, { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, +{ 0x0D81, 0x0D81 }, { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, @@ -139,7 +140,7 @@ static const struct interval zero_width[] = { { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C }, { 0x1A7F, 0x1A7F }, -{ 0x1AB0, 0x1ABE }, +{ 0x1AB0, 0x1AC0 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, @@ -182,6 +183,7 @@ static const struct interval zero_width[] = { { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, { 0xA825, 0xA826 }, +{ 0xA82C, 0xA82C }, { 0xA8C4, 0xA8C5 }, { 0xA8E0, 0xA8F1 }, { 0xA8FF, 0xA8FF }, @@ -223,6 +225,7 @@ static const struct interval zero_width[] = { { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 }, { 0x10D24, 0x10D27 }, +{ 0x10EAB, 0x10EAC }, { 0x10F46, 0x10F50 }, { 0x11001, 0x11001 }, { 0x11038, 0x11046 }, @@ -238,6 +241,7 @@ static const struct interval zero_width[] = { { 0x11180, 0x11181 }, { 0x111B6, 0x111BE }, { 0x111C9, 0x111CC }, +{ 0x111CF, 0x111CF }, { 0x1122F, 0x11231 }, { 0x11234, 0x11234 }, { 0x11236, 0x11237 }, @@ -273,6 +277,9 @@ static const struct interval zero_width[] = { { 0x11727, 0x1172B }, { 0x1182F, 0x11837 }, { 0x11839, 0x1183A }, +{ 0x1193B, 0x1193C }, +{ 0x1193E, 0x1193E }, +{ 0x11943, 0x11943 }, { 0x119D4, 0x119D7 }, { 0x119DA, 0x119DB }, { 0x119E0, 0x119E0 }, @@ -305,6 +312,7 @@ static const struct interval zero_width[] = { { 0x16B30, 0x16B36 }, { 0x16F4F, 0x16F4F }, { 0x16F8F, 0x16F92 }, +{ 0x16FE4, 0x16FE4 }, { 0x1BC9D, 0x1BC9E }, { 0x1BCA0, 0x1BCA3 }, { 0x1D167, 0x1D169 }, @@ -376,8 +384,7 @@ static const struct interval double_width[] = { { 0x3099, 0x30FF }, { 0x3105, 0x312F }, { 0x3131, 0x318E }, -{ 0x3190, 0x31BA }, -{ 0x31C0, 0x31E3 }, +{ 0x3190, 0x31E3 }, { 0x31F0, 0x321E }, { 0x3220, 0x3247 }, { 0x3250, 0x4DBF }, @@ -392,9 +399,11 @@ static const struct interval double_width[] = { { 0xFE68, 0xFE6B }, { 0xFF01, 0xFF60 }, { 0xFFE0, 0xFFE6 }, -{ 0x16FE0, 0x16FE3 }, +{ 0x16FE0, 0x16FE4 }, +{ 0x16FF0, 0x16FF1 }, { 0x17000, 0x187F7 }, -{ 0x18800, 0x18AF2 }, +{ 0x18800, 0x18CD5 }, +{ 0x18D00, 0x18D08 }, { 0x1B000, 0x1B11E }, { 0x1B150, 0x1B152 }, { 0x1B164, 0x1B167 }, @@ -429,20 +438,22 @@ static const struct interval double_width[] = { { 0x1F680, 0x1F6C5 }, { 0x1F6CC, 0x1F6CC }, { 0x1F6D0, 0x1F6D2 }, -{ 0x1F6D5, 0x1F6D5 }, +{ 0x1F6D5, 0x1F6D7 }, { 0x1F6EB, 0x1F6EC }, -{ 0x1F6F4, 0x1F6FA }, +{ 0x1F6F4, 0x1F6FC }, { 0x1F7E0, 0x1F7EB }, -{ 0x1F90D, 0x1F971 }, -{ 0x1F973, 0x1F976 }, -{ 0x1F97A, 0x1F9A2 }, -{ 0x1F9A5, 0x1F9AA }, -{ 0x1F9AE, 0x1F9CA }, +{ 0x1F90C, 0x1F93A }, +{ 0x1F93C, 0x1F945 }, +{ 0x1F947, 0x1F978 }, +{ 0x1F97A, 0x1F9CB }, { 0x1F9CD, 0x1F9FF }, -{ 0x1FA70, 0x1FA73 }, +{ 0x1FA70, 0x1FA74 }, { 0x1FA78, 0x1FA7A }, -{ 0x1FA80, 0x1FA82 }, -{ 0x1FA90, 0x1FA95 }, +{ 0x1FA80, 0x1FA86 }, +{ 0x1FA90, 0x1FAA8 }, +{ 0x1FAB0, 0x1FAB6 }, +{ 0x1FAC0, 0x1FAC2 }, +{ 0x1FAD0, 0x1FAD6 }, { 0x20000, 0x2FFFD }, { 0x30000, 0x3FFFD } }; From 0822e66b5d49d0de1aa767b38785e42de05eaf40 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 17 Mar 2020 14:54:02 -0700 Subject: [PATCH 2/2] Git 2.25.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.25.2.txt | 60 +++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.25.2.txt diff --git a/Documentation/RelNotes/2.25.2.txt b/Documentation/RelNotes/2.25.2.txt new file mode 100644 index 0000000000..303c53a17f --- /dev/null +++ b/Documentation/RelNotes/2.25.2.txt @@ -0,0 +1,60 @@ +Git 2.25.2 Release Notes +======================== + +Fixes since v2.25.1 +------------------- + + * Minor bugfixes to "git add -i" that has recently been rewritten in C. + + * An earlier update to show the location of working tree in the error + message did not consider the possibility that a git command may be + run in a bare repository, which has been corrected. + + * The "--recurse-submodules" option of various subcommands did not + work well when run in an alternate worktree, which has been + corrected. + + * Running "git rm" on a submodule failed unnecessarily when + .gitmodules is only cache-dirty, which has been corrected. + + * "git rebase -i" identifies existing commits in its todo file with + their abbreviated object name, which could become ambigous as it + goes to create new commits, and has a mechanism to avoid ambiguity + in the main part of its execution. A few other cases however were + not covered by the protection against ambiguity, which has been + corrected. + + * The index-pack code now diagnoses a bad input packstream that + records the same object twice when it is used as delta base; the + code used to declare a software bug when encountering such an + input, but it is an input error. + + * The code to automatically shrink the fan-out in the notes tree had + an off-by-one bug, which has been killed. + + * "git check-ignore" did not work when the given path is explicitly + marked as not ignored with a negative entry in the .gitignore file. + + * The merge-recursive machinery failed to refresh the cache entry for + a merge result in a couple of places, resulting in an unnecessary + merge failure, which has been fixed. + + * Fix for a bug revealed by a recent change to make the protocol v2 + the default. + + * "git merge signed-tag" while lacking the public key started to say + "No signature", which was utterly wrong. This regression has been + reverted. + + * MinGW's poll() emulation has been improved. + + * "git show" and others gave an object name in raw format in its + error output, which has been corrected to give it in hex. + + * Both "git ls-remote -h" and "git grep -h" give short usage help, + like any other Git subcommand, but it is not unreasonable to expect + that the former would behave the same as "git ls-remote --head" + (there is no other sensible behaviour for the latter). The + documentation has been updated in an attempt to clarify this. + +Also contains various documentation updates, code clean-ups and minor fixups. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 2a8e709916..61023f4097 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.25.1 +DEF_VER=v2.25.2 LF=' ' diff --git a/RelNotes b/RelNotes index c63ee7dc70..19e8340eb9 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.25.1.txt \ No newline at end of file +Documentation/RelNotes/2.25.2.txt \ No newline at end of file