baaf26bc39 · 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 (Mar 2020, #03; Mon, 9)

4 -X-master-at: b4374e96c84ed9394fed363973eb540da308ed4f

5 -X-next-at: 3b80da1da63efb9efa783b9cd17a44b73ecbe37a

3 +Subject: What's cooking in git.git (Mar 2020, #04; Mon, 16)

4 +X-master-at: 6c85aac65fb455af85745130ce35ddae4678db84

5 +X-next-at: e327a58236cc95b4efc12994231bc709cb52d153

6

7 -What's cooking in git.git (Mar 2020, #03; Mon, 9)

7 +What's cooking in git.git (Mar 2020, #04; Mon, 16)

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

9

10 Here are the topics that have been cooking. Commits prefixed with

@@ -12,6 +12,8 @@ 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 +Git 2.26-rc2 has been tagged.

16 +

17 You can find the changes described here in the integration branches

18 of the repositories listed at

19

@@ -20,173 +22,128 @@ of the repositories listed at

22 --------------------------------------------------

23 [Graduated to "master"]

24

23 -* am/mingw-poll-fix (2020-02-27) 1 commit

24 - (merged to 'next' on 2020-03-02 at 7082619f34)

25 - + mingw: workaround for hangs when sending STDIN

25 +* dr/push-remote-ref-update (2020-03-03) 1 commit

26 + (merged to 'next' on 2020-03-09 at 5a72128815)

27 + + remote: drop "explicit" parameter from remote_ref_for_branch()

28

27 - MinGW's poll() emulation has been improved.

29 + Code clean-up.

30

31

30 -* am/pathspec-f-f-more (2020-02-19) 8 commits

31 - (merged to 'next' on 2020-03-02 at 33ff7e29f0)

32 - + stash push: support the --pathspec-from-file option

33 - + stash: eliminate crude option parsing

34 - + doc: stash: synchronize <pathspec> description

35 - + doc: stash: document more options

36 - + doc: stash: split options from description (2)

37 - + doc: stash: split options from description (1)

38 - + rm: support the --pathspec-from-file option

39 - + doc: rm: synchronize <pathspec> description

32 +* ds/sparse-add (2020-03-09) 1 commit

33 + (merged to 'next' on 2020-03-09 at 4e675cfd89)

34 + + t1091: don't grep for `strerror()` string

35

41 - "git rm" and "git stash" learns the new "--pathspec-from-file"

42 - option.

36 + Test fix.

37

38

45 -* en/merge-path-collision (2020-02-27) 1 commit

46 - (merged to 'next' on 2020-03-02 at cb2655c779)

47 - + merge-recursive: apply collision handling unification to recursive case

39 +* en/rebase-backend (2020-03-11) 3 commits

40 + (merged to 'next' on 2020-03-11 at 52a3c30dc4)

41 + + git-rebase.txt: highlight backend differences with commit rewording

42 + + sequencer: clear state upon dropping a become-empty commit

43 + + i18n: unmark a message in rebase.c

44

49 - Handling of conflicting renames in merge-recursive have further

50 - been made consistent with how existing codepaths try to mimic what

51 - is done to add/add conflicts.

45 + Band-aid fixes for two fallouts from switching the default "rebase"

46 + backend.

47

48

54 -* en/test-cleanup (2020-02-27) 5 commits

55 - (merged to 'next' on 2020-03-02 at 93a81886b7)

56 - + t6020: new test with interleaved lexicographic ordering of directories

57 - + t6022, t6046: test expected behavior instead of testing a proxy for it

58 - + t3035: prefer test_must_fail to bash negation for git commands

59 - + t6020, t6022, t6035: update merge tests to use test helper functions

60 - + t602[1236], t6034: modernize test formatting

49 +* en/test-cleanup (2020-03-13) 1 commit

50 + (merged to 'next' on 2020-03-15 at a2807c8476)

51 + + t6022, t6046: fix flaky files-are-updated checks

52

62 - Test cleanup.

53 + Test fixes.

54

55

65 -* hd/show-one-mergetag-fix (2020-03-02) 1 commit

66 - (merged to 'next' on 2020-03-02 at 12fe907f8d)

67 - + show_one_mergetag: print non-parent in hex form.

56 +* es/outside-repo-errmsg-hints (2020-03-15) 1 commit

57 + (merged to 'next' on 2020-03-15 at 12be04a348)

58 + + prefix_path: show gitdir if worktree unavailable

59

69 - "git show" and others gave an object name in raw format in its

70 - error output, which has been corrected to give it in hex.

60 + An earlier update to show the location of working tree in the error

61 + message did not consider the possibility that a git command may be

62 + run in a bare repository, which has been corrected.

63

64

73 -* kk/complete-diff-color-moved (2020-02-24) 1 commit

74 - (merged to 'next' on 2020-03-02 at 1bdb401f6a)

75 - + completion: add diff --color-moved[-ws]

65 +* jc/doc-single-h-is-for-help (2020-02-27) 1 commit

66 + (merged to 'next' on 2020-03-09 at 9580bb63a2)

67 + + Documentation: clarify that `-h` alone stands for `help`

68

77 - Completion update.

69 + Both "git ls-remote -h" and "git grep -h" give short usage help,

70 + like any other Git subcommand, but it is not unreasonable to expect

71 + that the former would behave the same as "git ls-remote --head"

72 + (there is no other sensible behaviour for the latter). The

73 + documentation has been updated in an attempt to clarify this.

74

75 +--------------------------------------------------

76 +[New Topics]

77

80 -* pb/am-show-current-patch (2020-02-20) 5 commits

81 - (merged to 'next' on 2020-03-02 at 30b5300705)

82 - + am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch

83 - + am: support --show-current-patch=raw as a synonym for--show-current-patch

84 - + am: convert "resume" variable to a struct

85 - + parse-options: convert "command mode" to a flag

86 - + parse-options: add testcases for OPT_CMDMODE()

78 +* sg/commit-slab-clarify-peek (2020-03-10) 1 commit

79 + (merged to 'next' on 2020-03-11 at 0496b26f23)

80 + + commit-slab: clarify slabname##_peek()'s return value

81

88 - "git am --short-current-patch" is a way to show the piece of e-mail

89 - for the stopped step, which is not suitable to directly feed "git

90 - apply" (it is designed to be a good "git am" input). It learned a

91 - new option to show only the patch part.

82 + In-code comment update.

83

84 + Will cook in 'next'.

85

94 -* rj/t1050-use-test-path-is-file (2020-02-24) 1 commit

95 - (merged to 'next' on 2020-03-02 at 68a681640e)

96 - + t1050: replace test -f with test_path_is_file

86

98 - Code cleanup.

87 +* rs/doc-passthru-fetch-options (2020-03-11) 1 commit

88 + (merged to 'next' on 2020-03-12 at f08dab7228)

89 + + pull: document more passthru options

90

91 + Doc update.

92

101 -* rs/show-progress-in-dumb-http-fetch (2020-03-03) 1 commit

102 - (merged to 'next' on 2020-03-05 at 98ed6360e7)

103 - + remote-curl: show progress for fetches over dumb HTTP

93 + Will cook in 'next'.

94

105 - "git fetch" over HTTP walker protocol did not show any progress

106 - output. We inherently do not know how much work remains, but still

107 - we can show something not to bore users.

95

96 +* bc/filter-process (2020-03-16) 8 commits

97 + - t0021: test filter metadata for additional cases

98 + - builtin/reset: compute checkout metadata for reset

99 + - builtin/rebase: compute checkout metadata for rebases

100 + - builtin/clone: compute checkout metadata for clones

101 + - builtin/checkout: compute checkout metadata for checkouts

102 + - convert: provide additional metadata to filters

103 + - convert: permit passing additional metadata to filter processes

104 + - builtin/checkout: pass branch info down to checkout_worktree

105

110 -* rt/format-zero-length-fix (2020-02-28) 2 commits

111 - (merged to 'next' on 2020-03-02 at a4070ef573)

112 - + config.mak.dev: re-enable -Wformat-zero-length

113 - + rebase-interactive.c: silence format-zero-length warnings

106 + Provide more information (e.g. the object of the tree-ish in which

107 + the blob being converted appears, in addition to its path, which

108 + has already been given) to smudge/clean conversion filters.

109

115 - Recently we inadvertently added a few instances of using 0-width

116 - format string to functions that we mark as printf-like without any

117 - developers noticing. The root cause was that the compiler warning

118 - that is triggered by this is almost always useless and we disabled

119 - the warning in our developer builds, but not for general public.

120 - The new instances have been corrected, and the warning has been

121 - resurrected in the developer builds.

110 + Will merge to 'next'.

111

123 ---------------------------------------------------

124 -[New Topics]

112

126 -* hi/gpg-prefer-check-signature (2020-03-05) 2 commits

127 - - gpg-interface: prefer check_signature() for GPG verification

128 - - t: increase test coverage of signature verification output

113 +* bc/faq (2020-03-15) 1 commit

114 + - docs: add a FAQ

115

130 - The code to interface with GnuPG has been refactored.

116 + Doc update.

117

118

133 -* jc/maintain-doc (2020-03-09) 1 commit

134 - (merged to 'next' on 2020-03-09 at 7f1a754f60)

135 - + update how-to-maintain-git

119 +* ds/check-connected-reprepare-packed-git (2020-03-15) 1 commit

120 + (merged to 'next' on 2020-03-16 at 609a322030)

121 + + connected.c: reprepare packs for corner cases

122

137 - Doc update.

123 + Corner case "git fetch" fix.

124

125 Will cook in 'next'.

126

127

142 -* am/real-path-fix (2020-03-06) 4 commits

143 - - get_superproject_working_tree(): return strbuf

144 - - real_path_if_valid(): remove unsafe API

145 - - real_path: remove unsafe API

146 - - set_git_dir: fix crash when used with real_path()

128 +* en/oidset-uninclude-hashmap (2020-03-15) 1 commit

129 + (merged to 'next' on 2020-03-16 at a79879866d)

130 + + oidset: remove unnecessary include

131

148 - The real_path() convenience function can easily be misused; with a

149 - bit of code refactoring in the callers' side, its use has been

150 - eliminated.

132 + Code clean-up.

133

152 - Expecting a reroll.

153 - cf. <c1c3c6ec-6361-5711-15e8-01e5ccdb651f@syntevo.com>

134 + Will cook in 'next'.

135

136

156 -* ds/sparse-add (2020-03-09) 1 commit

157 - (merged to 'next' on 2020-03-09 at 4e675cfd89)

158 - + t1091: don't grep for `strerror()` string

159 -

160 - Test fix.

137 +* jc/log-no-mailmap (2020-03-16) 3 commits

138 + - log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap

139 + - clone: reorder --recursive/--recurse-submodules

140 + - parse-options: teach "git cmd -h" to show alias as alias

141

162 - Will merge to 'master'.

142 + "git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"

143

144 --------------------------------------------------

145 [Stalled]

146

167 -* yz/p4-py3 (2020-02-13) 14 commits

168 - - ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere

169 - - git-p4: use python3's input() everywhere

170 - - git-p4: simplify regex pattern generation for parsing diff-tree

171 - - git-p4: use dict.items() iteration for python3 compatibility

172 - - git-p4: use functools.reduce instead of reduce

173 - - git-p4: fix freezing while waiting for fast-import progress

174 - - git-p4: use marshal format version 2 when sending to p4

175 - - git-p4: open .gitp4-usercache.txt in text mode

176 - - git-p4: convert path to unicode before processing them

177 - - git-p4: encode/decode communication with git for python3

178 - - git-p4: encode/decode communication with p4 for python3

179 - - git-p4: remove string type aliasing

180 - - git-p4: change the expansion test from basestring to list

181 - - git-p4: make python2.7 the oldest supported version

182 -

183 - Update "git p4" to work with Python 3.

184 -

185 - Hold.

186 - Waiting for SoB from Szeder on the last step.

187 - cf. <xmqqk14qqj7n.fsf@gitster-ct.c.googlers.com>

188 -

189 -

147 * dl/merge-autostash (2020-01-13) 17 commits

148 - pull: pass --autostash to merge

149 - t5520: make test_pull_autostash() accept expect_parent_num

@@ -265,13 +222,58 @@ of the repositories listed at

222 --------------------------------------------------

223 [Cooking]

224

268 -* dr/push-remote-ref-update (2020-03-03) 1 commit

269 - (merged to 'next' on 2020-03-09 at 5a72128815)

270 - + remote: drop "explicit" parameter from remote_ref_for_branch()

225 +* yz/p4-py3 (2020-03-10) 14 commits

226 + (merged to 'next' on 2020-03-11 at 01ca57c2b2)

227 + + ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere

228 + + git-p4: use python3's input() everywhere

229 + + git-p4: simplify regex pattern generation for parsing diff-tree

230 + + git-p4: use dict.items() iteration for python3 compatibility

231 + + git-p4: use functools.reduce instead of reduce

232 + + git-p4: fix freezing while waiting for fast-import progress

233 + + git-p4: use marshal format version 2 when sending to p4

234 + + git-p4: open .gitp4-usercache.txt in text mode

235 + + git-p4: convert path to unicode before processing them

236 + + git-p4: encode/decode communication with git for python3

237 + + git-p4: encode/decode communication with p4 for python3

238 + + git-p4: remove string type aliasing

239 + + git-p4: change the expansion test from basestring to list

240 + + git-p4: make python2.7 the oldest supported version

241

272 - Code clean-up.

242 + Update "git p4" to work with Python 3.

243 +

244 + Will cook in 'next'.

245 +

246 +

247 +* hi/gpg-prefer-check-signature (2020-03-15) 2 commits

248 + - gpg-interface: prefer check_signature() for GPG verification

249 + - t: increase test coverage of signature verification output

250

274 - Will merge to 'master'.

251 + The code to interface with GnuPG has been refactored.

252 +

253 + Will merge to 'next'.

254 +

255 +

256 +* jc/maintain-doc (2020-03-09) 1 commit

257 + (merged to 'next' on 2020-03-09 at 7f1a754f60)

258 + + update how-to-maintain-git

259 +

260 + Doc update.

261 +

262 + Will cook in 'next'.

263 +

264 +

265 +* am/real-path-fix (2020-03-10) 4 commits

266 + (merged to 'next' on 2020-03-11 at 1f843820a7)

267 + + get_superproject_working_tree(): return strbuf

268 + + real_path_if_valid(): remove unsafe API

269 + + real_path: remove unsafe API

270 + + set_git_dir: fix crash when used with real_path()

271 +

272 + The real_path() convenience function can easily be misused; with a

273 + bit of code refactoring in the callers' side, its use has been

274 + eliminated.

275 +

276 + Will cook in 'next'.

277

278

279 * tb/commit-graph-split-merge (2020-03-05) 3 commits

@@ -287,15 +289,15 @@ of the repositories listed at

289 Will cook in 'next'.

290

291

290 -* ah/force-pull-rebase-configuration (2020-03-05) 2 commits

291 - - SQUASH???

292 - - pull: warn if the user didn't say whether to rebase or to merge

292 +* ah/force-pull-rebase-configuration (2020-03-10) 1 commit

293 + (merged to 'next' on 2020-03-11 at c79dbbaf9c)

294 + + pull: warn if the user didn't say whether to rebase or to merge

295

296 "git pull" learned to warn when no pull.rebase configuration

297 exists, and neither --[no-]rebase nor --ff-only is given (which

298 would result a merge).

299

298 - Needs to add some tests.

300 + Will cook in 'next'.

301

302

303 * tg/retire-scripted-stash (2020-03-05) 2 commits

@@ -310,16 +312,6 @@ of the repositories listed at

312 cf. <20200306172913.GF1571684@cat>

313

314

313 -* es/outside-repo-errmsg-hints (2020-03-03) 1 commit

314 - - prefix_path: show gitdir if worktree unavailable

315 -

316 - An earlier update to show the location of working tree in the error

317 - message did not consider the possibility that a git command may be

318 - run in a bare repository, which has been corrected.

319 -

320 - May want a test or two.

321 -

322 -

315 * js/https-proxy-config (2020-03-05) 2 commits

316 (merged to 'next' on 2020-03-09 at 8a06f8501d)

317 + http: add environment variable support for HTTPS proxies

@@ -331,35 +323,21 @@ of the repositories listed at

323 Will cook in 'next'.

324

325

334 -* jc/doc-single-h-is-for-help (2020-02-27) 1 commit

335 - (merged to 'next' on 2020-03-09 at 9580bb63a2)

336 - + Documentation: clarify that `-h` alone stands for `help`

337 -

338 - Both "git ls-remote -h" and "git grep -h" give short usage help,

339 - like any other Git subcommand, but it is not unreasonable to expect

340 - that the former would behave the same as "git ls-remote --head"

341 - (there is no other sensible behaviour for the latter). The

342 - documentation has been updated in an attempt to clarify this.

343 -

344 - Will merge to 'master'.

345 -

346 -

347 -* pw/advise-rebase-skip (2019-12-06) 9 commits

348 - - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts

349 - - rebase: fix advice when a fixup creates an empty commit

350 - - commit: give correct advice for empty commit during a rebase

351 - - commit: encapsulate determine_whence() for sequencer

352 - - commit: use enum value for multiple cherry-picks

353 - - sequencer: write CHERRY_PICK_HEAD for reword and edit

354 - - cherry-pick: check commit error messages

355 - - cherry-pick: add test for `--skip` advice in `git commit`

356 - - t3404: use test_cmp_rev

326 +* pw/advise-rebase-skip (2019-12-06) 7 commits

327 + (merged to 'next' on 2020-03-11 at 80386de756)

328 + + commit: give correct advice for empty commit during a rebase

329 + + commit: encapsulate determine_whence() for sequencer

330 + + commit: use enum value for multiple cherry-picks

331 + + sequencer: write CHERRY_PICK_HEAD for reword and edit

332 + + cherry-pick: check commit error messages

333 + + cherry-pick: add test for `--skip` advice in `git commit`

334 + + t3404: use test_cmp_rev

335

336 The mechanism to prevent "git commit" from making an empty commit

337 or amending during an interrupted cherry-pick was broken during the

338 rewrite of "git rebase" in C, which has been corrected.

339

362 - Will discard the tip two, which are still RFC, and advance the rest.

340 + Will cook in 'next'.

341 cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>

342

343

@@ -397,6 +375,11 @@ of the repositories listed at

375 - t/lib-submodule-update: remove outdated test description

376 - t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED

377

378 + Fix "git checkout --recurse-submodules" of a nested submodule

379 + hierarchy.

380 +

381 + Will merge to 'next'.

382 +

383

384 * bc/sha-256-part-1-of-4 (2020-02-28) 22 commits

385 - fast-import: add options for rewriting submodules

@@ -424,8 +407,7 @@ of the repositories listed at

407

408 SHA-256 transition continues.

409

427 - Tentatively I dropped the bits about signed tag, as it depended on

428 - a reverted change to the gpg interface API.

410 + Will merge to 'next'.

411

412

413 * hw/advise-ng (2020-03-05) 4 commits

@@ -469,7 +451,7 @@ of the repositories listed at

451 The "bugreport" tool.

452

453 As the scope of the topic got trimmed, hopefully these early parts

472 - can be polished quickly enough?

454 + can be polished quickly enough to be merged down.

455

456

457 * gs/commit-graph-path-filter (2020-02-12) 12 commits

@@ -492,3 +474,14 @@ of the repositories listed at

474

475 Will be rerolled with bytesex fixes squashed in.

476 Breakage due to byte-order dependency reported.

477 +

478 +--------------------------------------------------

479 +[Discarded]

480 +

481 +* jc/rebase-backend-keep-old-default (2020-03-10) 1 commit

482 + . rebase: do not switch the default to 'merge' just yet

483 +

484 + The "merge" backend of "git rebase" still has a few bugs and

485 + unexpected behaviour that need to be ironed out before it becomes

486 + the default. Let's switch the default back to the "apply" backend

487 + for now.

What's cooking (2020/03 #04)