+60

Documentation/RelNotes/2.25.2.txt

··· 1 1 + Git 2.25.2 Release Notes 2 2 + ======================== 3 3 + 4 4 + Fixes since v2.25.1 5 5 + ------------------- 6 6 + 7 7 + * Minor bugfixes to "git add -i" that has recently been rewritten in C. 8 8 + 9 9 + * An earlier update to show the location of working tree in the error 10 10 + message did not consider the possibility that a git command may be 11 11 + run in a bare repository, which has been corrected. 12 12 + 13 13 + * The "--recurse-submodules" option of various subcommands did not 14 14 + work well when run in an alternate worktree, which has been 15 15 + corrected. 16 16 + 17 17 + * Running "git rm" on a submodule failed unnecessarily when 18 18 + .gitmodules is only cache-dirty, which has been corrected. 19 19 + 20 20 + * "git rebase -i" identifies existing commits in its todo file with 21 21 + their abbreviated object name, which could become ambigous as it 22 22 + goes to create new commits, and has a mechanism to avoid ambiguity 23 23 + in the main part of its execution. A few other cases however were 24 24 + not covered by the protection against ambiguity, which has been 25 25 + corrected. 26 26 + 27 27 + * The index-pack code now diagnoses a bad input packstream that 28 28 + records the same object twice when it is used as delta base; the 29 29 + code used to declare a software bug when encountering such an 30 30 + input, but it is an input error. 31 31 + 32 32 + * The code to automatically shrink the fan-out in the notes tree had 33 33 + an off-by-one bug, which has been killed. 34 34 + 35 35 + * "git check-ignore" did not work when the given path is explicitly 36 36 + marked as not ignored with a negative entry in the .gitignore file. 37 37 + 38 38 + * The merge-recursive machinery failed to refresh the cache entry for 39 39 + a merge result in a couple of places, resulting in an unnecessary 40 40 + merge failure, which has been fixed. 41 41 + 42 42 + * Fix for a bug revealed by a recent change to make the protocol v2 43 43 + the default. 44 44 + 45 45 + * "git merge signed-tag" while lacking the public key started to say 46 46 + "No signature", which was utterly wrong. This regression has been 47 47 + reverted. 48 48 + 49 49 + * MinGW's poll() emulation has been improved. 50 50 + 51 51 + * "git show" and others gave an object name in raw format in its 52 52 + error output, which has been corrected to give it in hex. 53 53 + 54 54 + * Both "git ls-remote -h" and "git grep -h" give short usage help, 55 55 + like any other Git subcommand, but it is not unreasonable to expect 56 56 + that the former would behave the same as "git ls-remote --head" 57 57 + (there is no other sensible behaviour for the latter). The 58 58 + documentation has been updated in an attempt to clarify this. 59 59 + 60 60 + Also contains various documentation updates, code clean-ups and minor fixups.

+1 -24

Documentation/RelNotes/2.26.0.txt

··· 188 188 of gcc and clang. 189 189 190 190 * Minor bugfixes to "git add -i" that has recently been rewritten in C. 191 191 - (merge 849e43cc18 js/builtin-add-i-cmds later to maint). 192 191 193 192 * "git fetch --refmap=" option has got a better documentation. 194 193 ··· 211 210 * The "--recurse-submodules" option of various subcommands did not 212 211 work well when run in an alternate worktree, which has been 213 212 corrected. 214 214 - (merge a9472afb63 pb/recurse-submodule-in-worktree-fix later to maint). 215 213 216 214 * Futureproofing a test not to depend on the current implementation 217 215 detail. 218 216 219 217 * Running "git rm" on a submodule failed unnecessarily when 220 218 .gitmodules is only cache-dirty, which has been corrected. 221 221 - (merge 7edee32985 dt/submodule-rm-with-stale-cache later to maint). 222 219 223 220 * C pedantry ;-) fix. 224 224 - (merge cf82bff73f jk/clang-sanitizer-fixes later to maint). 225 221 226 222 * "git grep --no-index" should not get affected by the contents of 227 223 the .gitmodules file but when "--recurse-submodules" is given or ··· 238 234 in the main part of its execution. A few other cases however were 239 235 not covered by the protection against ambiguity, which has been 240 236 corrected. 241 241 - (merge 26027625dd js/rebase-i-with-colliding-hash later to maint). 242 237 243 238 * Allow the rebase.missingCommitsCheck configuration to kick in when 244 239 "rebase --edit-todo" and "rebase --continue" restarts the procedure. ··· 252 247 253 248 * The code to automatically shrink the fan-out in the notes tree had 254 249 an off-by-one bug, which has been killed. 255 255 - (merge dbc27477ff jh/notes-fanout-fix later to maint). 256 250 257 251 * The index-pack code now diagnoses a bad input packstream that 258 252 records the same object twice when it is used as delta base; the 259 253 code used to declare a software bug when encountering such an 260 254 input, but it is an input error. 261 261 - (merge a21781011f jk/index-pack-dupfix later to maint). 255 255 + 262 256 263 257 * The code to compute the commit-graph has been taught to use a more 264 258 robust way to tell if two object directories refer to the same ··· 270 264 branch.<name>.pushRemote is now also updated. 271 265 272 266 * Update to doc-diff. 273 273 - (merge 2607d39da3 jk/doc-diff-parallel later to maint). 274 267 275 268 * Doc markup fix. 276 276 - (merge 0aa6ce3094 jk/push-option-doc-markup-fix later to maint). 277 269 278 270 * "git check-ignore" did not work when the given path is explicitly 279 271 marked as not ignored with a negative entry in the .gitignore file. 280 280 - (merge 7ec8125fba en/check-ignore later to maint). 281 272 282 273 * The merge-recursive machinery failed to refresh the cache entry for 283 274 a merge result in a couple of places, resulting in an unnecessary 284 275 merge failure, which has been fixed. 285 285 - (merge fb1c18fc46 en/t3433-rebase-stat-dirty-failure later to maint). 286 276 287 277 * Fix for a bug revealed by a recent change to make the protocol v2 288 278 the default. 289 289 - (merge 3e96c66805 ds/partial-clone-fixes later to maint). 290 279 291 280 * In rare cases "git worktree add <path>" could think that <path> 292 281 was already a registered worktree even when it wasn't and refuse ··· 311 300 * "git merge signed-tag" while lacking the public key started to say 312 301 "No signature", which was utterly wrong. This regression has been 313 302 reverted. 314 314 - (merge 0106b1d4be hi/gpg-use-check-signature later to maint). 315 303 316 304 * MinGW's poll() emulation has been improved. 317 317 - (merge 94f4d01932 am/mingw-poll-fix later to maint). 318 305 319 306 * "git show" and others gave an object name in raw format in its 320 307 error output, which has been corrected to give it in hex. 321 321 - (merge 237a28173f hd/show-one-mergetag-fix later to maint). 322 308 323 309 * "git fetch" over HTTP walker protocol did not show any progress 324 310 output. We inherently do not know how much work remains, but still ··· 330 316 that the former would behave the same as "git ls-remote --head" 331 317 (there is no other sensible behaviour for the latter). The 332 318 documentation has been updated in an attempt to clarify this. 333 333 - (merge 1ff466c018 jc/doc-single-h-is-for-help later to maint). 334 319 335 320 * Other code cleanup, docfix, build fix, etc. 336 336 - (merge 26f924d50e en/simplify-check-updates-in-unpack-trees later to maint). 337 321 (merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint). 338 322 (merge f94f7bd00d am/test-pathspec-f-f-error-cases later to maint). 339 323 (merge c513a958b6 ss/t6025-modernize later to maint). ··· 344 328 (merge 7a9f8ca805 rs/parse-options-concat-dup later to maint). 345 329 (merge 517b60564e rs/strbuf-insertstr later to maint). 346 330 (merge f696a2b1c8 jk/mailinfo-cleanup later to maint). 347 347 - (merge 076ee3e8a2 js/test-write-junit-xml-fix later to maint). 348 331 (merge de26f02db1 js/test-avoid-pipe later to maint). 349 349 - (merge bfe2bbb47f js/test-unc-fetch later to maint). 350 350 - (merge 08809c09aa js/mingw-open-in-gdb later to maint). 351 351 - (merge cc4f2eb828 jk/doc-credential-helper later to maint). 352 352 - (merge e0020b2f82 es/outside-repo-errmsg-hints later to maint). 353 332 (merge a2dc43414c es/doc-mentoring later to maint). 354 354 - (merge 539052f42f jk/run-command-formatfix later to maint). 355 333 (merge 02bbbe9df9 es/worktree-cleanup later to maint). 356 334 (merge 2ce6d075fa rs/micro-cleanups later to maint). 357 335 (merge 27f182b3fc rs/blame-typefix-for-fingerprint later to maint). 358 336 (merge 3c29e21eb0 ma/test-cleanup later to maint). 359 337 (merge 240fc04f81 ag/rebase-remove-redundant-code later to maint). 360 360 - (merge 7f487ce062 js/ci-windows-update later to maint). 361 338 (merge d68ce906c7 rs/commit-graph-code-simplification later to maint). 362 339 (merge a51d9e8f07 rj/t1050-use-test-path-is-file later to maint). 363 340 (merge fd0bc17557 kk/complete-diff-color-moved later to maint).

+27 -16

unicode-width.h

··· 59 59 { 0x0B3F, 0x0B3F }, 60 60 { 0x0B41, 0x0B44 }, 61 61 { 0x0B4D, 0x0B4D }, 62 62 - { 0x0B56, 0x0B56 }, 62 62 + { 0x0B55, 0x0B56 }, 63 63 { 0x0B62, 0x0B63 }, 64 64 { 0x0B82, 0x0B82 }, 65 65 { 0x0BC0, 0x0BC0 }, ··· 82 82 { 0x0D41, 0x0D44 }, 83 83 { 0x0D4D, 0x0D4D }, 84 84 { 0x0D62, 0x0D63 }, 85 85 + { 0x0D81, 0x0D81 }, 85 86 { 0x0DCA, 0x0DCA }, 86 87 { 0x0DD2, 0x0DD4 }, 87 88 { 0x0DD6, 0x0DD6 }, ··· 139 140 { 0x1A65, 0x1A6C }, 140 141 { 0x1A73, 0x1A7C }, 141 142 { 0x1A7F, 0x1A7F }, 142 142 - { 0x1AB0, 0x1ABE }, 143 143 + { 0x1AB0, 0x1AC0 }, 143 144 { 0x1B00, 0x1B03 }, 144 145 { 0x1B34, 0x1B34 }, 145 146 { 0x1B36, 0x1B3A }, ··· 182 183 { 0xA806, 0xA806 }, 183 184 { 0xA80B, 0xA80B }, 184 185 { 0xA825, 0xA826 }, 186 186 + { 0xA82C, 0xA82C }, 185 187 { 0xA8C4, 0xA8C5 }, 186 188 { 0xA8E0, 0xA8F1 }, 187 189 { 0xA8FF, 0xA8FF }, ··· 223 225 { 0x10A3F, 0x10A3F }, 224 226 { 0x10AE5, 0x10AE6 }, 225 227 { 0x10D24, 0x10D27 }, 228 228 + { 0x10EAB, 0x10EAC }, 226 229 { 0x10F46, 0x10F50 }, 227 230 { 0x11001, 0x11001 }, 228 231 { 0x11038, 0x11046 }, ··· 238 241 { 0x11180, 0x11181 }, 239 242 { 0x111B6, 0x111BE }, 240 243 { 0x111C9, 0x111CC }, 244 244 + { 0x111CF, 0x111CF }, 241 245 { 0x1122F, 0x11231 }, 242 246 { 0x11234, 0x11234 }, 243 247 { 0x11236, 0x11237 }, ··· 273 277 { 0x11727, 0x1172B }, 274 278 { 0x1182F, 0x11837 }, 275 279 { 0x11839, 0x1183A }, 280 280 + { 0x1193B, 0x1193C }, 281 281 + { 0x1193E, 0x1193E }, 282 282 + { 0x11943, 0x11943 }, 276 283 { 0x119D4, 0x119D7 }, 277 284 { 0x119DA, 0x119DB }, 278 285 { 0x119E0, 0x119E0 }, ··· 305 312 { 0x16B30, 0x16B36 }, 306 313 { 0x16F4F, 0x16F4F }, 307 314 { 0x16F8F, 0x16F92 }, 315 315 + { 0x16FE4, 0x16FE4 }, 308 316 { 0x1BC9D, 0x1BC9E }, 309 317 { 0x1BCA0, 0x1BCA3 }, 310 318 { 0x1D167, 0x1D169 }, ··· 376 384 { 0x3099, 0x30FF }, 377 385 { 0x3105, 0x312F }, 378 386 { 0x3131, 0x318E }, 379 379 - { 0x3190, 0x31BA }, 380 380 - { 0x31C0, 0x31E3 }, 387 387 + { 0x3190, 0x31E3 }, 381 388 { 0x31F0, 0x321E }, 382 389 { 0x3220, 0x3247 }, 383 390 { 0x3250, 0x4DBF }, ··· 392 399 { 0xFE68, 0xFE6B }, 393 400 { 0xFF01, 0xFF60 }, 394 401 { 0xFFE0, 0xFFE6 }, 395 395 - { 0x16FE0, 0x16FE3 }, 402 402 + { 0x16FE0, 0x16FE4 }, 403 403 + { 0x16FF0, 0x16FF1 }, 396 404 { 0x17000, 0x187F7 }, 397 397 - { 0x18800, 0x18AF2 }, 405 405 + { 0x18800, 0x18CD5 }, 406 406 + { 0x18D00, 0x18D08 }, 398 407 { 0x1B000, 0x1B11E }, 399 408 { 0x1B150, 0x1B152 }, 400 409 { 0x1B164, 0x1B167 }, ··· 429 438 { 0x1F680, 0x1F6C5 }, 430 439 { 0x1F6CC, 0x1F6CC }, 431 440 { 0x1F6D0, 0x1F6D2 }, 432 432 - { 0x1F6D5, 0x1F6D5 }, 441 441 + { 0x1F6D5, 0x1F6D7 }, 433 442 { 0x1F6EB, 0x1F6EC }, 434 434 - { 0x1F6F4, 0x1F6FA }, 443 443 + { 0x1F6F4, 0x1F6FC }, 435 444 { 0x1F7E0, 0x1F7EB }, 436 436 - { 0x1F90D, 0x1F971 }, 437 437 - { 0x1F973, 0x1F976 }, 438 438 - { 0x1F97A, 0x1F9A2 }, 439 439 - { 0x1F9A5, 0x1F9AA }, 440 440 - { 0x1F9AE, 0x1F9CA }, 445 445 + { 0x1F90C, 0x1F93A }, 446 446 + { 0x1F93C, 0x1F945 }, 447 447 + { 0x1F947, 0x1F978 }, 448 448 + { 0x1F97A, 0x1F9CB }, 441 449 { 0x1F9CD, 0x1F9FF }, 442 442 - { 0x1FA70, 0x1FA73 }, 450 450 + { 0x1FA70, 0x1FA74 }, 443 451 { 0x1FA78, 0x1FA7A }, 444 444 - { 0x1FA80, 0x1FA82 }, 445 445 - { 0x1FA90, 0x1FA95 }, 452 452 + { 0x1FA80, 0x1FA86 }, 453 453 + { 0x1FA90, 0x1FAA8 }, 454 454 + { 0x1FAB0, 0x1FAB6 }, 455 455 + { 0x1FAC0, 0x1FAC2 }, 456 456 + { 0x1FAD0, 0x1FAD6 }, 446 457 { 0x20000, 0x2FFFD }, 447 458 { 0x30000, 0x3FFFD } 448 459 };