@matheusbsbs / matheus-bagliano / commits / f174a8abf5

What's cooking (2018/11 #01)

Junio C Hamano committed Nov 1, 2018 at 18:53 UTC f174a8abf5753b8d91ffd78d10904bc714818f93
1 file changed +173 -58
whats-cooking.txt
+173 -58
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Oct 2018, #06; Tue, 30)
3 +Subject: What's cooking in git.git (Nov 2018, #01; Thu, 1)
4 X-master-at: 4ede3d42dfb57f9a41ac96a1f216c62eb7566cc2
5 -X-next-at: 53cd27f688b0bae2a5f2d8f5cea6ba63c6e4a781
5 +X-next-at: 0c4a18a71f0e8e4f10970951c5f8875f429eaef7
6
7 -What's cooking in git.git (Oct 2018, #06; Tue, 30)
7 +What's cooking in git.git (Nov 2018, #01; Thu, 1)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,11 @@ Here are the topics that have been cooking. Commits prefixed with
12 '+' are in 'next'. The ones marked with '.' do not appear in any of
13 the integration branches, but I am still holding onto them.
14
15 -Quite a few topics have graduated to 'master'. At seventh batch,
16 -'master' now has 530+ patches since v2.19 and 'next' has additional
17 -100+ patches pending. I am hoping that the topics involved in
18 -rewriting "rebase" and "rebase -i" in C can hit 'master' in the next
19 -batch, which would happen later this week.
15 +Two groups of "rewrite rebase/rebase-i in C" topics, together with a
16 +handful of associated fix-up topics to them, will all be merged to
17 +'master' tomorrow. Some of them haven't spent as much time as usual
18 +in 'next', so there still may be rough edges, but let's make sure we
19 +find them and smooth them out before the release.
20
21 You can find the changes described here in the integration branches
22 of the repositories listed at
@@ -349,14 +349,18 @@ of the repositories listed at
349 object into account (e.g. a tag object would want to go under
350 refs/tags/).
351
352 + The last few steps are questionable.
353 + cf. <87in1lkw54.fsf@evledraar.gmail.com>
354 +
355
356 * cb/printf-empty-format (2018-10-27) 1 commit
354 - - sequencer: cleanup for gcc warning in non developer mode
357 + (merged to 'next' on 2018-11-01 at 9fcb05f22c)
358 + + sequencer: cleanup for gcc warning in non developer mode
359 (this branch uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-autostash-fix, js/rebase-i-break, js/rebase-i-shortopt, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
360
361 Build fix for a topic in flight.
362
359 - Will follow ag/rebase-i-in-c.
363 + Will merge to 'master' together with pk/rebase-in-c-6-final.
364
365
366 * md/list-lazy-objects-fix (2018-10-29) 1 commit
@@ -407,24 +411,26 @@ of the repositories listed at
411
412
413 * nd/wildmatch-double-asterisk (2018-10-29) 1 commit
410 - - wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode
414 + (merged to 'next' on 2018-11-01 at 627186d020)
415 + + wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode
416
417 A pattern with '**' that does not have a slash on either side used
418 to be an invalid one, but the code now treats such double-asterisks
419 the same way as two normal asterisks that happen to be adjacent to
420 each other.
421
417 - Will merge to 'next'.
422 + Will merge to 'master'.
423
424
425 * rj/header-cleanup (2018-10-29) 3 commits
421 - - commit-reach.h: add missing declarations (hdr-check)
422 - - ewok_rlw.h: add missing 'inline' to function definition
423 - - fetch-object.h: add missing declaration (hdr-check)
426 + (merged to 'next' on 2018-11-01 at 975e56048f)
427 + + commit-reach.h: add missing declarations (hdr-check)
428 + + ewok_rlw.h: add missing 'inline' to function definition
429 + + fetch-object.h: add missing declaration (hdr-check)
430
431 Code cleanup.
432
427 - Will merge to 'next'.
433 + Will merge to 'master'.
434
435
436 * js/mingw-ns-filetime (2018-10-24) 3 commits
@@ -439,21 +445,118 @@ of the repositories listed at
445
446
447 * bp/refresh-index-using-preload (2018-10-30) 1 commit
442 - - speed up refresh_index() by utilizing preload_index()
448 + (merged to 'next' on 2018-11-01 at 289e6bcece)
449 + + speed up refresh_index() by utilizing preload_index()
450
451 The helper function to refresh the cached stat information in the
452 in-core index has learned to perform the lstat() part of the
453 operation in parallel on multi-core platforms.
454
448 - Will merge to 'next'.
455 + Will merge to 'master'.
456
457
458 * sg/test-verbose-log (2018-10-30) 1 commit
452 - - test-lib: introduce the '-V' short option for '--verbose-log'
459 + (merged to 'next' on 2018-11-01 at 0c4a18a71f)
460 + + test-lib: introduce the '-V' short option for '--verbose-log'
461
462 Our test scripts can now take the '-V' option as a synonym for the
463 '--verbose-log' option.
464
465 + Will merge to 'master'.
466 +
467 +
468 +* ab/pack-tests-cleanup (2018-10-31) 3 commits
469 + - index-pack tests: don't leave test repo dirty at end
470 + - pack-objects tests: don't leave test .git corrupt at end
471 + - pack-objects test: modernize style
472 +
473 + A couple of tests used to leave the repository in a state that is
474 + deliberately corrupt, which have been corrected.
475 +
476 + Will merge to 'next'.
477 +
478 +
479 +* jk/detect-truncated-zlib-input (2018-10-31) 4 commits
480 + - Adjust for 2.19.x series
481 + - cat-file: handle streaming failures consistently
482 + - check_stream_sha1(): handle input underflow
483 + - t1450: check large blob in trailing-garbage test
484 +
485 + A regression in Git 2.12 era made "git fsck" fall into an infinite
486 + loop while processing truncated loose objects.
487 +
488 + Will merge to 'next'.
489 +
490 +
491 +* jk/proto-v2-ref-prefix-fix (2018-10-31) 2 commits
492 + - ls-remote: pass heads/tags prefixes to transport
493 + - ls-remote: do not send ref prefixes for patterns
494 +
495 + "git ls-remote $there foo" was broken by recent update for the
496 + protocol v2 and stopped showing refs that match 'foo' that are not
497 + refs/{heads,tags}/foo, which has been fixed.
498 +
499 + Will merge to 'next'.
500 +
501 +
502 +* jk/stream-pack-non-delta-clarification (2018-10-31) 1 commit
503 + - read_istream_pack_non_delta(): document input handling
504 +
505 + Additional comment on a tricky piece of code to help developers.
506 +
507 + Will merge to 'next'.
508 +
509 +
510 +* js/mingw-isatty-and-dup2 (2018-10-31) 1 commit
511 + - mingw: fix isatty() after dup2()
512 +
513 + Windows fix.
514 +
515 + Will merge to 'next'.
516 +
517 +
518 +* js/mingw-perl5lib (2018-10-31) 4 commits
519 + - mingw: unset PERL5LIB by default
520 + - config: move Windows-specific config settings into compat/mingw.c
521 + - config: allow for platform-specific core.* config settings
522 + - config: rename `dummy` parameter to `cb` in git_default_config()
523 +
524 + Windows fix.
525 +
526 + Will merge to 'next'.
527 +
528 +
529 +* js/mingw-utf8-env (2018-10-31) 2 commits
530 + - mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8)
531 + - t7800: fix quoting
532 +
533 + Windows fix.
534 +
535 + Will merge to 'next'.
536 +
537 +
538 +* ma/sequencer-do-reset-saner-loop-termination (2018-10-31) 1 commit
539 + - sequencer: break out of loop explicitly
540 +
541 + Code readability fix.
542 +
543 + Will merge to 'next'.
544 +
545 +
546 +* nb/worktree-api-doc (2018-10-31) 2 commits
547 + - worktree: rename is_worktree_locked to worktree_lock_reason
548 + - worktree: update documentation for lock_reason and lock_reason_valid
549 +
550 + Code readability fix.
551 +
552 + Will merge to 'next'.
553 +
554 +
555 +* sh/mingw-safer-compat-poll (2018-11-01) 1 commit
556 + - poll: use GetTickCount64() to avoid wrap-around issues
557 +
558 + Windows fix.
559 +
560 Will merge to 'next'.
561
562 --------------------------------------------------
@@ -494,8 +597,11 @@ of the repositories listed at
597
598 The in-core repository instances are passed through more codepaths.
599
600 + On hold.
601 Not quite correct?
602 cf. <20181025091406.GK30222@szeder.dev>
603 + Reroll being worked on.
604 + cf. <20181030220817.61691-1-sbeller@google.com>
605
606
607 * en/merge-path-collision (2018-10-22) 8 commits
@@ -509,15 +615,19 @@ of the repositories listed at
615 - Add testcases for consistency in file collision conflict handling
616 (this branch uses en/merge-cleanup-more.)
617
618 + Updates for corner cases in merge-recursive.
619
513 -* jt/tighten-fetch-proto-v2-response (2018-10-22) 2 commits
514 - - SQUASH???
620 + Expecting a reroll.
621 + cf. <CABPp-BGq1YDdzZ6CqzCp9QXPZy6XxV8sujyRxwBc-EnS+ygSrg@mail.gmail.com>
622 +
623 +
624 +* jt/tighten-fetch-proto-v2-response (2018-11-01) 1 commit
625 - fetch-pack: be more precise in parsing v2 response
626
627 "git fetch" was a bit loose in parsing resposes from the other side
628 when talking over the protocol v2.
629
520 - Will squash the fix and merge to 'next'.
630 + Will merge to 'next'.
631
632
633 * nd/complete-format-patch (2018-10-22) 1 commit
@@ -631,8 +741,9 @@ of the repositories listed at
741
742
743 * nd/per-worktree-config (2018-10-22) 2 commits
634 - - worktree: add per-worktree config files
635 - - t1300: extract and use test_cmp_config()
744 + (merged to 'next' on 2018-11-01 at 3746343ca8)
745 + + worktree: add per-worktree config files
746 + + t1300: extract and use test_cmp_config()
747
748 A fourth class of configuration files (in addition to the
749 traditional "system wide", "per user in the $HOME directory" and
@@ -640,7 +751,7 @@ of the repositories listed at
751 that different worktrees that share the same repository (hence the
752 same $GIT_DIR/config file) can use different customization.
753
643 - Will merge to 'next'.
754 + Will merge to 'master'.
755
756
757 * nd/submodule-unused-vars (2018-10-22) 1 commit
@@ -661,8 +772,7 @@ of the repositories listed at
772 Will merge to 'master'.
773
774
664 -* ag/rev-parse-all-exclude-fix (2018-10-29) 2 commits
665 - - SQUASH???
775 +* ag/rev-parse-all-exclude-fix (2018-11-01) 1 commit
776 - rev-parse: clear --exclude list after 'git rev-parse --all'
777
778 "git rev-parse --exclude=* --branches --branches" (i.e. first
@@ -671,7 +781,7 @@ of the repositories listed at
781 worked as expected, but "--exclude=* --all --all" did not work the
782 same way, which has been fixed.
783
674 - Will merge to 'next' after squashing the tests in.
784 + Will merge to 'next'.
785
786
787 * bp/reset-quiet (2018-10-24) 3 commits
@@ -781,36 +891,40 @@ of the repositories listed at
891
892
893 * js/rebase-i-shortopt (2018-10-26) 1 commit
784 - - rebase -i: recognize short commands without arguments
894 + (merged to 'next' on 2018-11-01 at 4e9da19145)
895 + + rebase -i: recognize short commands without arguments
896 (this branch uses ag/rebase-i-in-c and js/rebase-i-break; is tangled with ag/sequencer-reduce-rewriting-todo, cb/printf-empty-format, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
897
898 "git rebase -i" learned to take 'b' as the short form of 'break'
899 option in the todo list.
900
790 - Will merge to 'next'.
901 + Will merge to 'master' together with pk/rebase-in-c-6-final.
902
903
904 * sg/test-rebase-editor-fix (2018-10-29) 1 commit
794 - - t3404-rebase-interactive: test abbreviated commands
905 + (merged to 'next' on 2018-11-01 at 271e0fc663)
906 + + t3404-rebase-interactive: test abbreviated commands
907
796 - Will merge to 'next'.
908 + Will merge to 'master'.
909
910
911 * ss/travis-ci-force-vm-mode (2018-10-26) 1 commit
800 - - travis-ci: no longer use containers
912 + (merged to 'next' on 2018-11-01 at 8596bb2a65)
913 + + travis-ci: no longer use containers
914
915 The "container" mode of TravisCI is going away. Our .travis.yml
916 file is getting prepared for the transition.
917
805 - Will merge to 'next'.
918 + Will merge to 'master'.
919
920
921 * tb/char-may-be-unsigned (2018-10-26) 1 commit
809 - - path.c: char is not (always) signed
922 + (merged to 'next' on 2018-11-01 at 9e14f289f8)
923 + + path.c: char is not (always) signed
924
925 Build portability fix.
926
813 - Will merge to 'next'.
927 + Will merge to 'master'.
928
929
930 * jt/upload-pack-v2-fix-shallow (2018-10-19) 3 commits
@@ -827,15 +941,17 @@ of the repositories listed at
941 Will merge to 'master'.
942
943
830 -* pw/am-rebase-read-author-script (2018-10-19) 5 commits
944 +* pw/am-rebase-read-author-script (2018-11-01) 5 commits
945 - sequencer: use read_author_script()
946 - add read_author_script() to libgit
947 - am: rename read_author_script()
948 - am: improve author-script error reporting
949 - am: don't die in read_author_script()
950
837 - Expecting a reroll.
838 - cf. <55a2a458-c71e-0018-5fd7-b66e349ddb3d@talktalk.net>
951 + Unify code to read the author-script used in "git am" and the
952 + commands that use the sequencer machinery, e.g. "git rebase -i".
953 +
954 + Will merge to 'next'.
955
956
957 * sb/submodule-url-to-absolute (2018-10-18) 1 commit
@@ -888,6 +1004,9 @@ of the repositories listed at
1004 Add sha-256 hash and plug it through the code to allow building Git
1005 with the "NewHash".
1006
1007 + Expecting a reroll.
1008 + cf. <20181031225521.GA573515@genre.crustytoothpaste.net>
1009 +
1010
1011 * js/mingw-http-ssl (2018-10-26) 3 commits
1012 (merged to 'next' on 2018-10-26 at 318e82e101)
@@ -950,17 +1069,16 @@ of the repositories listed at
1069
1070 Typofix.
1071
953 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1072 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1073
1074
956 -* jc/war-on-string-list (2018-10-27) 2 commits
957 - - SQUASH???
1075 +* jc/war-on-string-list (2018-11-01) 1 commit
1076 - fetch: replace string-list used as a look-up table with a hashmap
1077
1078 Replace three string-list instances used as look-up tables in "git
1079 fetch" with hashmaps.
1080
963 - Will merge to 'next' after squashing the update in.
1081 + Will merge to 'next'.
1082
1083
1084 * js/rebase-i-break (2018-10-12) 2 commits
@@ -973,7 +1091,7 @@ of the repositories listed at
1091 insert in the to-do list. Upon hitting it, the command returns
1092 control back to the user.
1093
976 - Will merge to 'master' after 'pk/rebase-in-c-6-final'.
1094 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1095
1096
1097 * js/remote-archive-v2 (2018-09-28) 4 commits
@@ -1049,6 +1167,7 @@ of the repositories listed at
1167 consider per-worktree refs of other worktrees as starting points to
1168 prevent data loss.
1169
1170 + Will merge to 'next'.
1171
1172
1173 * ds/reachable-topo-order (2018-10-18) 7 commits
@@ -1066,7 +1185,7 @@ of the repositories listed at
1185 cf. <pull.25.v4.git.gitgitgadget@gmail.com>
1186
1187
1069 -* sb/submodule-recursive-fetch-gets-the-tip (2018-10-26) 11 commits
1188 +* sb/submodule-recursive-fetch-gets-the-tip (2018-10-31) 11 commits
1189 - builtin/fetch: check for submodule updates in any ref update
1190 - fetch: try fetching submodules if needed objects were not fetched
1191 - submodule.c: fetch in submodules git directory instead of in worktree
@@ -1097,7 +1216,7 @@ of the repositories listed at
1216 used by "rebase -i" that was rewritten in C, tying the loose end
1217 between two GSoC topics that stomped on each other's toes.
1218
1100 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1219 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1220
1221
1222 * js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
@@ -1110,7 +1229,7 @@ of the repositories listed at
1229 cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
1230
1231
1113 -* ao/submodule-wo-gitmodules-checked-out (2018-10-26) 10 commits
1232 +* ao/submodule-wo-gitmodules-checked-out (2018-10-31) 10 commits
1233 - t/helper: add test-submodule-nested-repo-config
1234 - submodule: support reading .gitmodules when it's not in the working tree
1235 - submodule: add a helper to check if it is safe to write to .gitmodules
@@ -1127,8 +1246,7 @@ of the repositories listed at
1246 HEAD:.gitmodules when the .gitmodules file is missing from the
1247 working tree.
1248
1130 - Expecting a reroll.
1131 - cf. <20181010205645.e1529eff9099805029b1d6ef@ao2.it>
1249 + Will merge to 'next'.
1250
1251
1252 * pk/rebase-in-c-2-basic (2018-09-06) 11 commits
@@ -1148,7 +1266,7 @@ of the repositories listed at
1266
1267 Rewrite "git rebase" in C.
1268
1151 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1269 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1270
1271
1272 * pk/rebase-in-c-3-acts (2018-09-06) 7 commits
@@ -1164,7 +1282,7 @@ of the repositories listed at
1282
1283 Rewrite "git rebase" in C.
1284
1167 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1285 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1286
1287
1288 * pk/rebase-in-c-4-opts (2018-10-11) 18 commits
@@ -1191,7 +1309,7 @@ of the repositories listed at
1309
1310 Rewrite "git rebase" in C.
1311
1194 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1312 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1313
1314
1315 * pk/rebase-in-c-5-test (2018-10-11) 6 commits
@@ -1206,7 +1324,7 @@ of the repositories listed at
1324
1325 Rewrite "git rebase" in C.
1326
1209 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1327 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1328
1329
1330 * pk/rebase-in-c-6-final (2018-10-11) 1 commit
@@ -1292,7 +1410,7 @@ of the repositories listed at
1410
1411 Rewrite of the remaining "rebase -i" machinery in C.
1412
1295 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1413 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1414
1415
1416 * pk/rebase-in-c (2018-08-06) 3 commits
@@ -1304,8 +1422,7 @@ of the repositories listed at
1422
1423 Rewrite of the "rebase" machinery in C.
1424
1307 - Will merge to 'master' together with pk/rebase-i-in-c-6-final.
1308 -
1425 + Will merge to 'master' together with pk/rebase-in-c-6-final.
1426
1427 --------------------------------------------------
1428 [Discarded]
@@ -1320,5 +1437,3 @@ of the repositories listed at
1437 Discarded.
1438 Reverted out of 'next'.
1439 cf. <87sh0slvxm.fsf@evledraar.gmail.com>
1323 -
1324 -