0e73d8a5b9 · 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 (Jul 2017, #09; Mon, 31)

4 -X-master-at: e2d9c46130247dd31d0421d2b2fc4bfd014c085e

5 -X-next-at: c4a70dcba25ee98fc8ee2906dbd251ddf5551c27

3 +Subject: What's cooking in git.git (Aug 2017, #01; Fri, 4)

4 +X-master-at: 4384e3cde2ce8ecd194202e171ae16333d241326

5 +X-next-at: 98096fd7a85b93626db8757f944f2d8ffdf7e96a

6

7 -What's cooking in git.git (Jul 2017, #09; Mon, 31)

7 +What's cooking in git.git (Aug 2017, #01; Fri, 4)

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

9

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

@@ -12,9 +12,14 @@ 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 -Even though -rc2 was scheduled for today, I'll wait for a few days

16 -so that we can tag with updated l10n; there isn't much change since

17 -the first release candidate.

15 +The 2.14-rc2 was a bit delayed for various reasons and then there

16 +wasn't any last-minite regressions discovered and fixed during that

17 +timeframe, so I just decided to skip the second release candidate

18 +and go straight to tag the final, which was done a few minutes ago.

19 +

20 +I expect that the tree to stay a bit quiet for a week until the first

21 +maintenance release for 2.14 series is tagged, perhaps by the end of

22 +the next week.

23

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

25 of the repositories listed at

@@ -24,6 +29,20 @@ of the repositories listed at

29 --------------------------------------------------

30 [Graduated to "master"]

31

32 +* ah/patch-id-doc (2017-07-28) 1 commit

33 + (merged to 'next' on 2017-08-04 at 7808b7abd3)

34 + + doc: remove unsupported parameter from patch-id

35 +

36 + Docfix.

37 +

38 +

39 +* as/diff-options-grammofix (2017-07-31) 1 commit

40 + (merged to 'next' on 2017-08-01 at bfc60e3ec5)

41 + + diff-options doc: grammar fix

42 +

43 + A grammofix.

44 +

45 +

46 * js/blame-lib (2017-07-24) 1 commit

47 (merged to 'next' on 2017-07-26 at db0d081012)

48 + blame: fix memory corruption scrambling revision name in error message

@@ -33,10 +52,73 @@ of the repositories listed at

52 --------------------------------------------------

53 [New Topics]

54

36 -* as/diff-options-grammofix (2017-07-31) 1 commit

37 - - diff-options doc: grammar fix

55 +* jk/rev-list-empty-input (2017-08-02) 4 commits

56 + (merged to 'next' on 2017-08-04 at cb4f9b84e0)

57 + + revision: do not fallback to default when rev_input_given is set

58 + + rev-list: don't show usage when we see empty ref patterns

59 + + revision: add rev_input_given flag

60 + + t6018: flesh out empty input/output rev-list tests

61 +

62 + "git log --tag=no-such-tag" showed log starting from HEAD, which

63 + has been fixed---it now shows nothing.

64 +

65 + Will cook in 'next'.

66 +

67 +

68 +* jt/t1450-fsck-corrupt-packfile (2017-07-28) 1 commit

69 + (merged to 'next' on 2017-08-04 at 44d09da2fc)

70 + + tests: ensure fsck fails on corrupt packfiles

71 +

72 + A test update.

73 +

74 + Will cook in 'next'.

75 +

76 +

77 +* ma/pager-per-subcommand-action (2017-08-03) 7 commits

78 + (merged to 'next' on 2017-08-04 at 0f760bcf5d)

79 + + git.c: ignore pager.* when launching builtin as dashed external

80 + + tag: change default of `pager.tag` to "on"

81 + + tag: respect `pager.tag` in list-mode only

82 + + t7006: add tests for how git tag paginates

83 + + git.c: provide setup_auto_pager()

84 + + git.c: let builtins opt for handling `pager.foo` themselves

85 + + builtin.h: take over documentation from api-builtin.txt

86 +

87 + The "tag.pager" configuration variable was useless for those who

88 + actually create tag objects, as it interfered with the use of an

89 + editor. A new mechanism has been introduced for commands to enable

90 + pager depending on what operation is being carried out to fix this,

91 + and then "git tag -l" is made to run pager by default.

92 +

93 + Will cook in 'next'.

94 +

95 + If this works out OK, I think there are low-hanging fruits in

96 + other commands like "git branch" that outputs long list in one mode

97 + while taking input in another.

98

39 - A grammofix.

99 +

100 +* pw/sequence-rerere-autoupdate (2017-08-02) 6 commits

101 + - cherry-pick/revert: reject --rerere-autoupdate when continuing

102 + - cherry-pick/revert: remember --rerere-autoupdate

103 + - t3504: use test_commit

104 + - rebase -i: honor --rerere-autoupdate

105 + - rebase: honor --rerere-autoupdate

106 + - am: remember --rerere-autoupdate setting

107 +

108 + Commands like "git rebase" accepted the --rerere-autoupdate option

109 + from the command line, but did not always use it. This has been

110 + fixed.

111 +

112 + Will merge to and cook in 'next'.

113 +

114 +

115 +* bw/clone-recursive-quiet (2017-08-04) 1 commit

116 + - clone: teach recursive clones to respect -q

117 +

118 + "git clone --recurse-submodules --quiet" did not pass the quiet

119 + option down to submodules.

120 +

121 + Will merge to and cook in 'next'.

122

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

124 [Stalled]

@@ -135,28 +217,34 @@ of the repositories listed at

217

218

219 * js/git-gui-msgfmt-on-windows (2017-07-25) 7 commits

138 - - Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows

139 - - git-gui (MinGW): make use of MSys2's msgfmt

140 - - Merge remote-tracking branch 'philoakley/dup-gui'

141 - - git gui: allow for a long recentrepo list

142 - - git gui: de-dup selected repo from recentrepo history

143 - - git gui: cope with duplicates in _get_recentrepo

144 - - git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

220 + (merged to 'next' on 2017-08-01 at 219577a73e)

221 + + Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows

222 + + git-gui (MinGW): make use of MSys2's msgfmt

223 + + Merge remote-tracking branch 'philoakley/dup-gui'

224 + + git gui: allow for a long recentrepo list

225 + + git gui: de-dup selected repo from recentrepo history

226 + + git gui: cope with duplicates in _get_recentrepo

227 + + git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

228

229 Because recent Git for Windows do come with a real msgfmt, the

230 build procedure for git-gui has been updated to use it instead of a

231 hand-rolled substitute.

232

233 + Will cook in 'next'.

234 + As we haven't heard from Pat, let's advance the update to 'next'

235 + ourselves.

236 +

237

238 * jt/subprocess-handshake (2017-07-26) 3 commits

152 - - sub-process: refactor handshake to common function

153 - - Documentation: migrate sub-process docs to header

154 - - Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake

239 + (merged to 'next' on 2017-08-01 at a0f78deffd)

240 + + sub-process: refactor handshake to common function

241 + + Documentation: migrate sub-process docs to header

242 + + Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake

243 (this branch uses ls/filter-process-delayed.)

244

245 Code cleanup.

246

159 - Will merge to and cook in 'next'.

247 + Will cook in 'next'.

248

249

250 * lg/merge-signoff (2017-07-25) 1 commit

@@ -204,7 +292,7 @@ of the repositories listed at

292 cf. <CACBZZX7M=H8tNkZXpHBvv0rbY58EJk4dkoUzGKMftWoKUqF8sA@mail.gmail.com>

293

294

207 -* bw/submodule-config-cleanup (2017-07-26) 17 commits

295 +* bw/submodule-config-cleanup (2017-08-03) 17 commits

296 - submodule: remove gitmodules_config

297 - unpack-trees: improve loading of .gitmodules

298 - submodule-config: lazy-load a repository's .gitmodules file

@@ -212,7 +300,7 @@ of the repositories listed at

300 - submodule-config: remove support for overlaying repository config

301 - diff: stop allowing diff to have submodules configured in .git/config

302 - submodule: remove submodule_config callback routine

215 - - unpack-trees: don't rely on overlayed config

303 + - unpack-trees: don't respect submodule.update

304 - submodule: don't rely on overlayed config when setting diffopts

305 - fetch: don't overlay config with submodule-config

306 - submodule--helper: don't overlay config in update-clone

@@ -229,42 +317,46 @@ of the repositories listed at

317

318

319 * jb/t8008-cleanup (2017-07-26) 1 commit

232 - - t8008: rely on rev-parse'd HEAD instead of sha1 value

320 + (merged to 'next' on 2017-08-01 at f979c9340d)

321 + + t8008: rely on rev-parse'd HEAD instead of sha1 value

322

323 Code clean-up.

324

236 - Will merge to and cook in 'next'.

325 + Will cook in 'next'.

326

327

328 * rg/rerere-train-overwrite (2017-07-26) 1 commit

240 - - contrib/rerere-train: optionally overwrite existing resolutions

329 + (merged to 'next' on 2017-08-01 at 7fcd42974c)

330 + + contrib/rerere-train: optionally overwrite existing resolutions

331

332 The "rerere-train" script (in contrib/) learned the "--overwrite"

333 option to allow overwriting existing recorded resolutions.

334

245 - Will merge to and cook in 'next'.

335 + Will cook in 'next'.

336

337

338 * dl/credential-cache-socket-in-xdg-cache (2017-07-27) 1 commit

249 - - credential-cache: interpret an ECONNRESET as an EOF

339 + (merged to 'next' on 2017-08-01 at 87687ae1d4)

340 + + credential-cache: interpret an ECONNRESET as an EOF

341

342 A recently added test for the "credential-cache" helper revealed

343 that EOF detection done around the time the connection to the cache

344 daemon is torn down were flaky. This was fixed by reacting to

345 ECONNRESET and behaving as if we got an EOF.

346

256 - Will merge to and cook in 'next'.

347 + Will cook in 'next'.

348

349

350 * eb/contacts-reported-by (2017-07-27) 1 commit

260 - - git-contacts: also recognise "Reported-by:"

351 + (merged to 'next' on 2017-08-01 at cca9972d6b)

352 + + git-contacts: also recognise "Reported-by:"

353

354 "git contacts" (in contrib/) now lists the address on the

355 "Reported-by:" trailer to its output, in addition to those on

356 S-o-b: and other trailers, to make it easier to notify (and thank)

357 the original bug reporter.

358

267 - Will merge to and cook in 'next'.

359 + Will cook in 'next'.

360

361

362 * js/run-process-parallel-api-fix (2017-07-21) 1 commit

@@ -357,19 +449,26 @@ of the repositories listed at

449 cf. <20170717172709.GL93855@aiede.mtv.corp.google.com>

450

451

360 -* bw/grep-recurse-submodules (2017-07-18) 10 commits

361 - - grep: recurse in-process using 'struct repository'

362 - - submodule: merge repo_read_gitmodules and gitmodules_config

363 - - submodule: check for unmerged .gitmodules outside of config parsing

364 - - submodule: check for unstaged .gitmodules outside of config parsing

365 - - submodule: remove fetch.recursesubmodules from submodule-config parsing

366 - - submodule: remove submodule.fetchjobs from submodule-config parsing

367 - - config: add config_from_gitmodules

368 - - cache.h: add GITMODULES_FILE macro

369 - - repository: have the_repository use the_index

370 - - repo_read_index: don't discard the index

452 +* bw/grep-recurse-submodules (2017-08-02) 10 commits

453 + (merged to 'next' on 2017-08-04 at 4e60c34bad)

454 + + grep: recurse in-process using 'struct repository'

455 + + submodule: merge repo_read_gitmodules and gitmodules_config

456 + + submodule: check for unmerged .gitmodules outside of config parsing

457 + + submodule: check for unstaged .gitmodules outside of config parsing

458 + + submodule: remove fetch.recursesubmodules from submodule-config parsing

459 + + submodule: remove submodule.fetchjobs from submodule-config parsing

460 + + config: add config_from_gitmodules

461 + + cache.h: add GITMODULES_FILE macro

462 + + repository: have the_repository use the_index

463 + + repo_read_index: don't discard the index

464 (this branch is used by bw/submodule-config-cleanup.)

465

466 + "git grep --recurse-submodules" has been reworked to give a more

467 + consistent output across submodule boundary (and do its thing

468 + without having to fork a separate process).

469 +

470 + Will cook in 'next'.

471 +

472

473 * bw/object-id (2017-07-17) 3 commits

474 (merged to 'next' on 2017-07-18 at 90d27c0e7c)

What's cooking (2017/08 #01)