f9e6c34c38 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jun 2022, #06; Fri, 17)

4 -X-master-at: 5b71c59bc3b9365075e2a175aa7b6f2b0c84ce44

5 -X-next-at: 763f9739486ebf52dadb6c56742daf07e738829f

3 +Subject: What's cooking in git.git (Jun 2022, #07; Wed, 22)

4 +X-master-at: f770e9f396d48b567ef7b37d273e91ad570a3522

5 +X-next-at: 5c70b8d9af74545ad2b62bd035c293f139c02a5c

6

7 -What's cooking in git.git (Jun 2022, #06; Fri, 17)

7 +What's cooking in git.git (Jun 2022, #07; Wed, 22)

8 --------------------------------------------------

9

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

@@ -13,7 +13,7 @@ topic is stable enough to be used and are candidate to be in a

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

14 and aren't considered "accepted" at all.

15

16 -Git 2.37-rc1 has been tagged.

16 +Git 2.37-rc2 has been tagged.

17

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

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

@@ -46,110 +46,113 @@ Release tarballs are available at:

46 --------------------------------------------------

47 [New Topics]

48

49 -* cr/setup-bug-typo (2022-06-17) 1 commit

50 - (merged to 'next' on 2022-06-17 at 8834ffe0ab)

51 - + setup: fix function name in a BUG() message

49 +* dr/i18n-die-warn-error-usage (2022-06-21) 1 commit

50 + - i18n: mark message helpers prefix for translation

51

53 - Typofix in a BUG() message.

52 + Give _() markings to fatal/warning/usage: that is shown in front of

53 + these messages.

54

55 - Will cook in 'next'.

56 - source: <pull.1255.git.1654782920256.gitgitgadget@gmail.com>

55 + Will merge to 'next'?

56 + source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@gmail.com>

57

58

59 -* zk/push-use-bitmaps (2022-06-17) 1 commit

60 - - send-pack.c: add config push.useBitmaps

59 +* ds/t5510-brokequote (2022-06-21) 1 commit

60 + - t5510: replace 'origin' with URL more carefully

61

62 - "git push" sometimes perform poorly when reachability bitmaps are

63 - used, even in a repository where other operations are helped by

64 - bitmaps. The push.useBitmaps configuration variable is introduced

65 - to allow disabling use of reachability bitmaps only for "git push".

62 + Test fix.

63 + source: <484a330e-0902-6e1b-8189-63c72dcea494@github.com>

64

67 - Will merge to 'next'?

68 - source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>

65

70 ---------------------------------------------------

71 -[Graduated to 'master']

66 +* en/merge-restore-to-pristine (2022-06-21) 6 commits

67 + - merge: do not exit restore_state() prematurely

68 + - merge: ensure we can actually restore pre-merge state

69 + - merge: make restore_state() restore staged state too

70 + - merge: fix save_state() to work when there are racy-dirty files

71 + - merge: remove unused variable

72 + - t6424: make sure a failed merge preserves local changes

73

73 -* ab/credentials-in-url-more (2022-06-15) 2 commits

74 - (merged to 'next' on 2022-06-16 at de19b3b40c)

75 - + transfer doc: move fetch.credentialsInUrl to "transfer" config namespace

76 - + fetch doc: note "pushurl" caveat about "credentialsInUrl", elaborate

74 + When "git merge" finds that it cannot perform a merge, it should

75 + restore the working tree to the state before the command was

76 + initiated, but in some corner cases it didn't.

77

78 - Rename fetch.credentialsInUrl to transfer.credentialsInUrl as the

79 - single configuration variable should work both in pushing and

80 - fetching.

81 - source: <cover-0.2-00000000000-20220615T103852Z-avarab@gmail.com>

78 + Needs review.

79 + source: <pull.1231.v2.git.1655621424.gitgitgadget@gmail.com>

80

81

84 -* cb/path-owner-check-with-sudo-plus (2022-06-17) 1 commit

85 - (merged to 'next' on 2022-06-17 at 518afcbc48)

86 - + git-compat-util: allow root to access both SUDO_UID and root owned

82 +* rs/combine-diff-with-incompatible-options (2022-06-21) 2 commits

83 + - combine-diff: abort if --output is given

84 + - combine-diff: abort if --ignore-matching-lines is given

85

88 - "sudo git foo" used to consider a repository owned by the original

89 - user a safe one to access; it now also considers a repository owned

90 - by root a safe one, too (after all, if an attacker can craft a

91 - malicious repository owned by root, the box is 0wned already).

92 - source: <20220617202338.27984-1-carenas@gmail.com>

86 + Certain diff options are currently ignored when combined-diff is

87 + shown; mark them as incompatible with the feature.

88

89 + Will merge to 'next'?

90 + source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>

91

95 -* ds/more-test-coverage (2022-06-16) 4 commits

96 - (merged to 'next' on 2022-06-16 at 3f0452418c)

97 - + cache-tree: remove cache_tree_find_path()

98 - + pack-write: drop always-NULL parameter

99 - + t5329: test 'git gc --cruft' without '--prune=now'

100 - + t2107: test 'git update-index --verbose'

92

102 - Improve test coverage with a handful of tests.

103 - source: <pull.1261.v2.git.1655385230.gitgitgadget@gmail.com>

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

94 + - apply: support case-only renames in case-insensitive filesystems

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

96 + - t4141: test "git apply" with core.ignorecase

97

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

99 + case-insensitive filesystem.

100

106 -* jc/cocci-cleanup (2022-06-07) 1 commit

107 - (merged to 'next' on 2022-06-16 at 990576f5c5)

108 - + cocci: retire is_null_sha1() rule

101 + Needs review.

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

103

110 - Remove a coccinelle rule that is no longer relevant.

111 - source: <xmqq7d5suoqt.fsf@gitster.g>

104

105 +* zh/ls-files-format (2022-06-21) 1 commit

106 + - ls-files: introduce "--format" option

107

114 -* jk/bug-fl-va-list-fix (2022-06-16) 1 commit

115 - (merged to 'next' on 2022-06-16 at 8150aebb0f)

116 - + bug_fl(): correctly initialize trace2 va_list

108 + "git ls-files" learns the "--format" option to tweak its output.

109

118 - Fix buggy va_list usage in recent code.

119 - source: <YquMyakxYnU6mI5a@coredump.intra.peff.net>

110 + Needs review.

111 + source: <pull.1262.v3.git.1655777140231.gitgitgadget@gmail.com>

112

113

122 -* jk/perf-lib-test-titles (2022-06-16) 1 commit

123 - (merged to 'next' on 2022-06-16 at 064d7efa99)

124 - + perf-lib: fix missing test titles in output

114 +* ab/test-quoting-fix (2022-06-21) 3 commits

115 + - config tests: fix harmless but broken "rm -r" cleanup

116 + - test-lib.sh: fix prepend_var() quoting issue

117 + - tests: add missing double quotes to included library paths

118

126 - Show test titles to the performance test output again.

127 - source: <YqrXLO5oMYeOr2PB@coredump.intra.peff.net>

119 + Fixes for tests when the source directory has unusual characters in

120 + its path, e.g. whitespaces, double-quotes, etc.

121

122 + Expecting a reroll.

123 + source: <cover-0.3-00000000000-20220621T221928Z-avarab@gmail.com>

124

130 -* js/ci-github-workflow-markup (2022-06-13) 3 commits

131 - (merged to 'next' on 2022-06-15 at 03eb5e68ed)

132 - + ci(github): also mark up compile errors

133 - + ci(github): use grouping also in the `win-build` job

134 - + ci(github): bring back the 'print test failures' step

125

136 - Recent CI update hides certain failures in test jobs, which has

137 - been corrected.

126 +* en/merge-dual-dir-renames-fix (2022-06-21) 3 commits

127 + - merge-ort: fix issue with dual rename and add/add conflict

128 + - merge-ort: shuffle the computation and cleanup of potential collisions

129 + - t6423: add tests of dual directory rename plus add/add conflict

130

139 - source: <pull.1253.v2.git.1655125988.gitgitgadget@gmail.com>

131 + Fixes a long-standing corner case bug around directory renames in

132 + the merge-ort strategy.

133

134 + Needs review.

135 + source: <pull.1268.git.1655871651.gitgitgadget@gmail.com>

136

142 -* js/misc-fixes (2022-06-16) 6 commits

143 - (merged to 'next' on 2022-06-16 at 2f1f98e403)

144 - + relative_url(): fix incorrect condition

145 - + pack-mtimes: avoid closing a bogus file descriptor

146 - + read_index_from(): avoid memory leak

147 - + submodule--helper: avoid memory leak when fetching submodules

148 - + submodule-config: avoid memory leak

149 - + fsmonitor: avoid memory leak in `fsm_settings__get_incompatible_msg()`

137 +--------------------------------------------------

138 +[Graduated to 'master']

139 +

140 +* jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits

141 + (merged to 'next' on 2022-06-15 at e580db03e9)

142 + + git-prompt: fix expansion of branch colour codes

143 + (merged to 'next' on 2022-06-08 at 201a84ad63)

144 + + git-prompt: make colourization consistent

145 +

146 + Bash command line prompt (in contrib/) update.

147 + source: <20220607115024.64724-1-joak-pet@online.no>

148 +

149 +

150 +* tb/cruft-packs (2022-06-21) 1 commit

151 + (merged to 'next' on 2022-06-21 at 0703251124)

152 + + gc: simplify --cruft description

153

151 - Assorted fixes to problems found by Coverity.

152 - source: <pull.1264.git.1655336146.gitgitgadget@gmail.com>

154 + Docfix.

155 + source: <157741e2-cd06-9304-bb21-c67c2cbd923e@web.de>

156

157 --------------------------------------------------

158 [Stalled]

@@ -214,6 +217,28 @@ Release tarballs are available at:

217 --------------------------------------------------

218 [Cooking]

219

220 +* cr/setup-bug-typo (2022-06-17) 1 commit

221 + (merged to 'next' on 2022-06-17 at 8834ffe0ab)

222 + + setup: fix function name in a BUG() message

223 +

224 + Typofix in a BUG() message.

225 +

226 + Will cook in 'next'.

227 + source: <pull.1255.git.1654782920256.gitgitgadget@gmail.com>

228 +

229 +

230 +* zk/push-use-bitmaps (2022-06-17) 1 commit

231 + - send-pack.c: add config push.useBitmaps

232 +

233 + "git push" sometimes perform poorly when reachability bitmaps are

234 + used, even in a repository where other operations are helped by

235 + bitmaps. The push.useBitmaps configuration variable is introduced

236 + to allow disabling use of reachability bitmaps only for "git push".

237 +

238 + Will merge to 'next'?

239 + source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>

240 +

241 +

242 * jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit

243 - remote: handle negative refspecs in git remote show

244 (this branch is used by jk/t5505-restructure.)

@@ -242,20 +267,14 @@ Release tarballs are available at:

267 source: <YqrTsbXbEjx0Pabn@coredump.intra.peff.net>

268

269

245 -* ro/mktree-allow-missing-fix (2022-06-16) 1 commit

246 - - mktree: do not load objects under '--missing'

270 +* ro/mktree-allow-missing-fix (2022-06-21) 1 commit

271 + - mktree: do not check type of remote objects

272

273 "git mktree --missing" lazily fetched objects that are missing from

274 the local object store, which was totally unnecessary.

275

251 - Waiting for review response.

252 - source: <1566aed1-a38f-a9ca-241c-21b56d732328@roku.com>

253 -

254 -

255 -* jc/apply-icase-tests (2022-06-13) 1 commit

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

257 -

258 - source: <xmqqo7yw77qo.fsf@gitster.g>

276 + Will merge to 'next'?

277 + source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>

278

279

280 * ll/curl-accept-language (2022-06-13) 2 commits

@@ -290,20 +309,10 @@ Release tarballs are available at:

309 source: <9df761c3-355a-ede9-7971-b32687fe9abb@web.de>

310

311

293 -* tl/pack-bitmap-trace (2022-06-13) 5 commits

294 - - bitmap: add trace2 outputs during open "bitmap" file

295 - - pack-bitmap.c: using error() instead of silently returning -1

296 - - pack-bitmap.c: make warnings support i18N when opening bitmap

297 - - pack-bitmap.c: rename "idx_name" to "bitmap_name"

298 - - pack-bitmap.c: continue looping when first MIDX bitmap is found

299 -

300 - Add trace2 traces in code paths involving the pack bitmaps.

301 -

302 - Needs review.

303 - source: <cover.1655018322.git.dyroneteng@gmail.com>

304 -

305 -

306 -* ds/branch-checked-out (2022-06-15) 5 commits

312 +* ds/branch-checked-out (2022-06-21) 7 commits

313 + (merged to 'next' on 2022-06-21 at e42bc4566f)

314 + + branch: drop unused worktrees variable

315 + + fetch: stop passing around unused worktrees variable

316 (merged to 'next' on 2022-06-17 at c881874257)

317 + branch: fix branch_checked_out() leaks

318 + branch: use branch_checked_out() when deleting refs

@@ -364,18 +373,6 @@ Release tarballs are available at:

373 source: <xmqqfskdieqz.fsf@gitster.g>

374

375

367 -* jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits

368 - (merged to 'next' on 2022-06-15 at e580db03e9)

369 - + git-prompt: fix expansion of branch colour codes

370 - (merged to 'next' on 2022-06-08 at 201a84ad63)

371 - + git-prompt: make colourization consistent

372 -

373 - Bash command line prompt (in contrib/) update.

374 -

375 - Will merge to 'master'.

376 - source: <20220607115024.64724-1-joak-pet@online.no>

377 -

378 -

376 * ab/build-gitweb (2022-06-02) 7 commits

377 - Makefile: build 'gitweb' in the default target

378 - gitweb/Makefile: include in top-level Makefile

@@ -501,17 +498,17 @@ Release tarballs are available at:

498 source: <29053d029f8ec61095a2ad557be38b1d485a158f.1654635432.git.gitgitgadget@gmail.com>

499

500

504 -* gg/worktree-from-the-above (2022-05-20) 3 commits

501 +* gg/worktree-from-the-above (2022-06-21) 2 commits

502 - dir: minor refactoring / clean-up

506 - - dir: cache git_dir's realpath

503 - dir: traverse into repository

504

505 With a non-bare repository, with core.worktree pointing at a

506 directory that has the repository as its subdirectory, regressed in

507 Git 2.27 days.

508

513 - Needs review.

514 - source: <20220520192840.8942-1-ggossdev@gmail.com>

509 + Will merge to 'next'.

510 + source: <20220616234433.225-1-gg.oss@outlook.com>

511 + source: <20220616231956.154-1-gg.oss@outlook.com>

512

513

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

@@ -528,3 +525,26 @@ Release tarballs are available at:

525

526 Thoughts?

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

528 +

529 +--------------------------------------------------

530 +[Discarded]

531 +

532 +* jc/apply-icase-tests (2022-06-13) 1 commit

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

534 +

535 + Now a part of tk/apply-case-insensitive topic.

536 + source: <xmqqo7yw77qo.fsf@gitster.g>

537 +

538 +

539 +* tl/pack-bitmap-trace (2022-06-21) 5 commits

540 + . bitmap: add trace2 outputs during open "bitmap" file

541 + . pack-bitmap.c: using error() instead of silently returning -1

542 + . pack-bitmap.c: make warnings support i18N when opening bitmap

543 + . pack-bitmap.c: rename "idx_name" to "bitmap_name"

544 + . pack-bitmap.c: continue looping when first MIDX bitmap is found

545 +

546 + Add trace2 traces in code paths involving the pack bitmaps.

547 +

548 + source: <cover.1655817253.git.dyroneteng@gmail.com>

549 +

550 +

What's cooking (2022/06 #07)