8412335fc3 · matheusbsbs/matheus-bagliano

@@ -1,20 +1,26 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Aug 2022, #03; Mon, 8)

3 -X-master-at: c50926e1f48891e2671e1830dbcd2912a4563450

4 -X-next-at: c1821dd516c3fe71ff8009bcb7fca5764e49a4b9

2 +Subject: What's cooking in git.git (Aug 2022, #04; Thu, 11)

3 +X-master-at: 5502f77b6944eda8e26813d8f542cffe7d110aea

4 +X-next-at: 219fe53025fdf5c3fb79d289a36eb2cad3f38a04

5

6 -What's cooking in git.git (Aug 2022, #03; Mon, 8)

6 +What's cooking in git.git (Aug 2022, #04; Thu, 11)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking in my tree. Commits

10 prefixed with '+' are in 'next' (being in 'next' is a sign that a

11 -topic is stable enough to be used and are candidate to be in a

12 -future release). Commits prefixed with '-' are only in 'seen',

13 -and aren't considered "accepted" at all.

14 -

15 -A handful of topics have graduated to the 'master' track, and half a

16 -dozen topics are now in 'next' to cook. We are starting the week #5

17 -of a 12-week cycle (cf. https://tinyurl.com/gitCal).

11 +topic is stable enough to be used and are candidate to be in a future

12 +release). Commits prefixed with '-' are only in 'seen', and aren't

13 +considered "accepted" at all. A topic without enough support may be

14 +discarded after a long period of no activity.

15 +

16 +A maintenance release, Git 2.37.2, has been tagged. There wasn't

17 +any reason why it had to be done on this day, and there isn't any

18 +security-sensitive fixes in there, but as we have accumulated a few

19 +fixes on the 'master' front, it was a good time to flush them down

20 +to the maintenance track. Those who are running 'master' or better

21 +have been running with all these fixes for more than a week and do

22 +not have to worry about it. We are in the week #5 of a 12-week

23 +cycle (cf. https://tinyurl.com/gitCal).

24

25 Copies of the source code to Git live in many repositories, and the

26 following is a list of the ones I push into or their mirrors. Some

@@ -45,76 +51,71 @@ Release tarballs are available at:

51 https://www.kernel.org/pub/software/scm/git/

52

53 --------------------------------------------------

48 -[Graduated to 'master']

49 -

50 -* ca/unignore-local-installation-on-windows (2022-07-27) 1 commit

51 - (merged to 'next' on 2022-08-01 at 1d4f4c32a6)

52 - + cmake: support local installations of git

53 -

54 - Fix build procedure for Windows that uses CMake so that it can pick

55 - up the shell interpreter from local installation location.

56 - source: <pull.1304.git.1658912756815.gitgitgadget@gmail.com>

57 -

58 -

59 -* jk/struct-zero-init-with-older-gcc (2022-07-31) 1 commit

60 - (merged to 'next' on 2022-08-01 at cde4f95964)

61 - + config.mak.dev: squelch -Wno-missing-braces for older gcc

62 -

63 - Older gcc with -Wall complains about the universal zero initializer

64 - "struct s = { 0 };" idiom, which makes developers' lives

65 - inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The

66 - build procedure has been tweaked to help these compilers.

67 - source: <YuQ60ZUPBHAVETD7@coredump.intra.peff.net>

68 -

69 -

70 -* js/lstat-mingw-enotdir-fix (2022-07-29) 1 commit

71 - (merged to 'next' on 2022-08-01 at 10499943b7)

72 - + lstat(mingw): correctly detect ENOTDIR scenarios

73 -

74 - Fix to lstat() emulation on Windows.

75 - source: <pull.1291.v3.git.1659089152877.gitgitgadget@gmail.com>

76 -

77 -

78 -* js/mingw-with-python (2022-07-29) 3 commits

79 - (merged to 'next' on 2022-08-01 at 73b8f06182)

80 - + mingw: remove unneeded `NO_CURL` directive

81 - + mingw: remove unneeded `NO_GETTEXT` directive

82 - + windows: include the Python bits when building Git for Windows

54 +[New Topics]

55

84 - Conditionally allow building Python interpreter on Windows

85 - source: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>

56 +* fc/vimdiff-layout-vimdiff3-fix (2022-08-10) 7 commits

57 + (merged to 'next' on 2022-08-11 at a14fec292f)

58 + + mergetools: vimdiff: simplify tabfirst

59 + + mergetools: vimdiff: fix single window layouts

60 + + mergetools: vimdiff: rework tab logic

61 + + mergetools: vimdiff: fix for diffopt

62 + + mergetools: vimdiff: silence annoying messages

63 + + mergetools: vimdiff: make vimdiff3 actually work

64 + + mergetools: vimdiff: fix comment

65

66 + "vimdiff3" regression fix.

67

88 -* js/ort-clean-up-after-failed-merge (2022-07-31) 2 commits

89 - (merged to 'next' on 2022-08-01 at 0c9f02f3ec)

90 - + merge-ort: do leave trace2 region even if checkout fails

91 - + merge-ort: clean up after failed merge

68 + Will merge to 'master'.

69 + source: <20220810154618.307275-1-felipe.contreras@gmail.com>

70

93 - Plug memory leaks in the failure code path in the "merge-ort" merge

94 - strategy backend.

95 - source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>

71

72 +* jk/fsck-tree-mode-bits-fix (2022-08-10) 3 commits

73 + (merged to 'next' on 2022-08-11 at 219fe53025)

74 + + fsck: downgrade tree badFilemode to "info"

75 + + fsck: actually detect bad file modes in trees

76 + + tree-walk: add a mechanism for getting non-canonicalized modes

77

98 -* js/t5351-freebsd-fix (2022-07-29) 2 commits

99 - (merged to 'next' on 2022-08-01 at b47609e891)

100 - + t5351: avoid using `test_cmp` for binary data

101 - + t5351: avoid relying on `core.fsyncMethod = batch` to be supported

78 + "git fsck" reads mode from tree objects but canonicalizes the mode

79 + before passing it to the logic to check object sanity, which has

80 + hid broken tree objects from the checking logic. This has been

81 + corrected, but to help exiting projects with broken tree objects

82 + that they cannot fix retroactively, the severity of anomalies this

83 + code detects has been demoted to "info" for now.

84

103 - Some tests assumed that core.fsyncMethod=batch is supported

104 - everywhere, which broke FreeBSD.

105 - source: <pull.1308.git.1659097724.gitgitgadget@gmail.com>

85 + Will merge to 'master'.

86 + source: <YvQcNpizy9uOZiAz@coredump.intra.peff.net>

87 +

88 +

89 +* ag/merge-strategies-in-c (2022-08-10) 14 commits

90 + - sequencer: use the "octopus" strategy without forking

91 + - sequencer: use the "resolve" strategy without forking

92 + - merge: use the "octopus" strategy without forking

93 + - merge: use the "resolve" strategy without forking

94 + - merge-octopus: rewrite in C

95 + - merge-recursive: move better_branch_name() to merge.c

96 + - merge-resolve: rewrite in C

97 + - merge-one-file: rewrite in C

98 + - update-index: move add_cacheinfo() to read-cache.c

99 + - merge-index: add a new way to invoke `git-merge-one-file'

100 + - merge-index: drop the index

101 + - merge-index: libify merge_one_path() and merge_all()

102 + - t6060: add tests for removed files

103 + - t6060: modify multiple files to expose a possible issue with merge-index

104 +

105 + An attempt to rewrite remaining merge strategies from shell to C.

106 + source: <20220809185429.20098-1-alban.gruin@gmail.com>

107

108 --------------------------------------------------

108 -[New Topics]

109 +[Cooking]

110

110 -* sy/mv-into-cone (2022-08-05) 9 commits

111 +* sy/mv-out-of-cone (2022-08-10) 9 commits

112 - mv: check overwrite for in-to-out move

113 - advice.h: add advise_on_moving_dirty_path()

114 - mv: cleanup empty WORKING_DIRECTORY

115 - mv: from in-cone to out-of-cone

116 - mv: remove BOTH from enum update_mode

117 - mv: check if <destination> is a SKIP_WORKTREE_DIR

117 - - mv: free the *with_slash in check_dir_in_index()

118 + - mv: free the with_slash in check_dir_in_index()

119 - mv: rename check_dir_in_index() to empty_dir_has_sparse_contents()

120 - t7002: add tests for moving from in-cone to out-of-cone

121

@@ -123,18 +124,7 @@ Release tarballs are available at:

124 that is "out of cone". Handling of such a case has been improved.

125

126 Will merge to 'next'?

126 - source: <20220805030528.1535376-1-shaoxuan.yuan02@gmail.com>

127 -

128 -

129 -* fr/vimdiff-layout-colors-fix (2022-08-07) 3 commits

130 - - mergetools: vimdiff: update unit tests

131 - - mergetools: vimdiff: fix single tab mode, single window mode and colors

132 - - mergetools: vimdiff: fix comment

133 -

134 - "vimdiff3" regression fix.

135 -

136 - Will merge to 'next'?

137 - source: <20220808053459.184367-1-greenfoo@u92.eu>

127 + source: <20220809120910.2021413-1-shaoxuan.yuan02@gmail.com>

128

129

130 * sy/sparse-rm (2022-08-08) 5 commits

@@ -150,36 +140,6 @@ Release tarballs are available at:

140 Will merge to 'next'?

141 source: <20220807041335.1790658-1-shaoxuan.yuan02@gmail.com>

142

153 ---------------------------------------------------

154 -[Stalled]

155 -

156 -* tk/apply-case-insensitive (2022-06-21) 3 commits

157 - - apply: support case-only renames in case-insensitive filesystems

158 - - reset: new failing test for reset of case-insensitive duplicate in index

159 - - t4141: test "git apply" with core.ignorecase

160 -

161 - "git apply" barfed on a patch that makes a case-only rename on a

162 - case-insensitive filesystem.

163 -

164 - Needs review.

165 - source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>

166 -

167 -

168 -* bc/stash-export (2022-04-08) 4 commits

169 - - builtin/stash: provide a way to import stashes from a ref

170 - - builtin/stash: provide a way to export stashes to a ref

171 - - builtin/stash: factor out revision parsing into a function

172 - - object-name: make get_oid quietly return an error

173 -

174 - A mechanism to export and import stash entries to and from a normal

175 - commit to transfer it across repositories has been introduced.

176 -

177 - Expecting a reroll.

178 - cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>

179 - source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>

180 -

181 ---------------------------------------------------

182 -[Cooking]

143

144 * lt/symbolic-ref-sanity (2022-08-01) 1 commit

145 (merged to 'next' on 2022-08-03 at 443647b94a)

@@ -191,12 +151,13 @@ Release tarballs are available at:

151 source: <YugYNzQYWqDCmOqN@coredump.intra.peff.net>

152

153

194 -* vd/scalar-generalize-diagnose (2022-08-03) 10 commits

154 +* vd/scalar-generalize-diagnose (2022-08-10) 11 commits

155 - scalar: update technical doc roadmap

196 - - scalar-diagnose: use 'git diagnose --all'

156 + - scalar-diagnose: use 'git diagnose --mode=all'

157 - builtin/bugreport.c: create '--diagnose' option

198 - - builtin/diagnose.c: gate certain data behind '--all'

158 + - builtin/diagnose.c: add '--mode' option

159 - builtin/diagnose.c: create 'git diagnose' builtin

160 + - diagnose.c: add option to configure archive contents

161 - scalar-diagnose: move functionality to common location

162 - scalar-diagnose: move 'get_disk_info()' to 'compat/'

163 - scalar-diagnose: add directory to archiver more gently

@@ -207,8 +168,8 @@ Release tarballs are available at:

168 material has been lifted from "scalar" and made into a feature of

169 "git bugreport".

170

210 - Expecting responses to reviews.

211 - source: <pull.1310.v2.git.1659577543.gitgitgadget@gmail.com>

171 + Will merge to 'next'?

172 + source: <pull.1310.v3.git.1660174473.gitgitgadget@gmail.com>

173

174

175 * gc/git-reflog-doc-markup (2022-08-01) 1 commit

@@ -360,7 +321,7 @@ Release tarballs are available at:

321 source: <20220725123857.2773963-1-szeder.dev@gmail.com>

322

323

363 -* ds/bundle-uri-clone (2022-08-02) 5 commits

324 +* ds/bundle-uri-clone (2022-08-10) 5 commits

325 - clone: --bundle-uri cannot be combined with --depth

326 - bundle-uri: add support for http(s):// and file://

327 - clone: add --bundle-uri option

@@ -368,10 +329,7 @@ Release tarballs are available at:

329 - remote-curl: add 'get' capability

330

331 Implement "git clone --bundle-uri".

371 -

372 - Expecting a reroll.

373 - cf. <9afd5eb2-44a0-6342-6006-5dbdefba9947@github.com>

374 - source: <pull.1300.v2.git.1659443384.gitgitgadget@gmail.com>

332 + source: <pull.1300.v3.git.1660050703.gitgitgadget@gmail.com>

333

334

335 * ds/decorate-filter-tweak (2022-08-05) 11 commits

@@ -563,28 +521,29 @@ Release tarballs are available at:

521

522

523 * js/safe-directory-plus (2022-08-08) 5 commits

566 - - mingw: handle a file owned by the Administrators group correctly

567 - - mingw: be more informative when ownership check fails on FAT32

568 - - mingw: provide details about unsafe directories' ownership

569 - - setup: prepare for more detailed "dubious ownership" messages

570 - - setup: fix some formatting

524 + (merged to 'next' on 2022-08-10 at 3d32a87210)

525 + + mingw: handle a file owned by the Administrators group correctly

526 + + mingw: be more informative when ownership check fails on FAT32

527 + + mingw: provide details about unsafe directories' ownership

528 + + setup: prepare for more detailed "dubious ownership" messages

529 + + setup: fix some formatting

530

531 Platform-specific code that determines if a directory is OK to use

532 as a repository has been taught to report more details, especially

533 on Windows.

534

576 - Will merge to 'next'.

535 + Will merge to 'master'.

536 source: <pull.1286.v2.git.1659965270.gitgitgadget@gmail.com>

537

538

580 -* po/doc-add-renormalize (2022-07-09) 1 commit

581 - - doc add: renormalize is not idempotent for CRCRLF

539 +* po/doc-add-renormalize (2022-08-10) 1 commit

540 + (merged to 'next' on 2022-08-11 at 53851663eb)

541 + + doc add: renormalize is not idempotent for CRCRLF

542

543 Documentation for "git add --renormalize" has been improved.

544

585 - Expecting a reroll.

586 - cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>

587 - source: <d3b8ed97a105ea1d7e656c964b7eee378e11ede6.1657385781.git.gitgitgadget@gmail.com>

545 + Will merge to 'master'.

546 + source: <20220810144450.470-2-philipoakley@iee.email>

547

548

549 * po/glossary-around-traversal (2022-07-09) 3 commits

@@ -642,14 +601,14 @@ Release tarballs are available at:

601 source: <cover.1654552560.git.me@ttaylorr.com>

602

603

645 -* ds/bundle-uri-more (2022-07-25) 2 commits

604 +* ds/bundle-uri-more (2022-08-10) 2 commits

605 - bundle-uri: add example bundle organization

606 - docs: document bundle URI standard

607

649 - The "bundle URI" topic.

608 + The "bundle URI" design gets documented.

609

651 - Needs review.

652 - source: <pull.1248.v3.git.1658757188.gitgitgadget@gmail.com>

610 + Will merge to 'next'.

611 + source: <pull.1248.v4.git.1660050761.gitgitgadget@gmail.com>

612

613

614 * js/bisect-in-c (2022-06-27) 16 commits

@@ -679,36 +638,48 @@ Release tarballs are available at:

638 --------------------------------------------------

639 [Discarded]

640

682 -* ar/send-email-confirm-by-default (2022-04-22) 1 commit

683 - . send-email: always confirm by default

641 +* mb/doc-rerere-autoupdate (2022-07-15) 1 commit

642 + . cherry-pick doc: clarify no-rerere-autoupdate still allows rerere

643

685 - "git send-email" is changed so that by default it asks for

686 - confirmation before sending each message out.

644 + Clarifies that the "--no-rerere-autoupdate" option does not disable

645 + the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).

646

688 - Discarded.

689 - I wanted to like this, and had it in the version of Git I use

690 - myself for daily work, but the prompting turned out to be somewhat

691 - distracting.

692 - source: <20220422083629.1404989-1-hi@alyssa.is>

647 + Superseded by jc/rerere-autoupdate-doc

648 + source: <20220715092527.1567837-1-mail@beyermatthias.de>

649

650

695 -* mt/doc-config (2022-07-14) 3 commits

696 - . doc: notes: unify configuration variables definitions

697 - . doc: apply: unify configuration variables definitions

698 - . doc: grep: unify configuration variables definitions

651 +* fr/vimdiff-layout-colors-fix (2022-08-07) 3 commits

652 + . mergetools: vimdiff: update unit tests

653 + . mergetools: vimdiff: fix single tab mode, single window mode and colors

654 + . mergetools: vimdiff: fix comment

655

700 - Unify description of configuration variables used by individual

701 - commands in the documentation of the commands and the documentation

702 - of the "git config".

656 + "vimdiff3" regression fix.

657

704 - Retracted.

705 - cf. <20220723134834.9693-1-matheus.bernardino@usp.br>

706 - source: <cover.1657819649.git.matheus.bernardino@usp.br>

658 + Superseded by fc/vimdiff-layout-vimdiff3-fix

659 + source: <20220808053459.184367-1-greenfoo@u92.eu>

660

661

709 -* mb/doc-rerere-autoupdate (2022-07-15) 1 commit

710 - . cherry-pick doc: clarify no-rerere-autoupdate still allows rerere

662 +* tk/apply-case-insensitive (2022-06-21) 3 commits

663 + . apply: support case-only renames in case-insensitive filesystems

664 + . reset: new failing test for reset of case-insensitive duplicate in index

665 + . t4141: test "git apply" with core.ignorecase

666

712 - Clarifies that the "--no-rerere-autoupdate" option does not disable

713 - the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).

714 - source: <20220715092527.1567837-1-mail@beyermatthias.de>

667 + "git apply" barfed on a patch that makes a case-only rename on a

668 + case-insensitive filesystem.

669 +

670 + In stalled state for too long.

671 + source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>

672 +

673 +

674 +* bc/stash-export (2022-04-08) 4 commits

675 + . builtin/stash: provide a way to import stashes from a ref

676 + . builtin/stash: provide a way to export stashes to a ref

677 + . builtin/stash: factor out revision parsing into a function

678 + . object-name: make get_oid quietly return an error

679 +

680 + A mechanism to export and import stash entries to and from a normal

681 + commit to transfer it across repositories has been introduced.

682 +

683 + In stalled state for too long.

684 + cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>

685 + source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>

What's cooking (2022/08 #04)