a4d7b2f1de · 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 (Feb 2013, #05; Tue, 12)

4 -X-master-at: 5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc

5 -X-next-at: eb8af04df752f55c917e7cc25b82840b4b6083f7

3 +Subject: What's cooking in git.git (Feb 2013, #06; Thu, 14)

4 +X-master-at: 02339dd5295d7add78ab409300b985e5888af0ee

5 +X-next-at: ffa3c6506ad4ad51b33a54dee5c10a07cee019f0

6

7 -What's cooking in git.git (Feb 2013, #05; Tue, 12)

7 +What's cooking in git.git (Feb 2013, #06; Thu, 14)

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

9

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

@@ -12,7 +12,8 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'.

13

14 A preview of the upcoming release 1.8.2-rc0 is expected to be tagged

15 -late this week.

15 +late this week. At around that time, we may want to discard

16 +long-stalled topics that did not see activities as well.

17

18 You can find the changes described here in the integration branches of the

19 repositories listed at

@@ -22,80 +23,134 @@ repositories listed at

23 --------------------------------------------------

24 [Graduated to "master"]

25

25 -* sp/smart-http-content-type-check (2013-02-06) 3 commits

26 - (merged to 'next' on 2013-02-06 at 8bc6434)

27 - + http_request: reset "type" strbuf before adding

28 - (merged to 'next' on 2013-02-05 at 157812c)

29 - + t5551: fix expected error output

30 - (merged to 'next' on 2013-02-04 at d0759cb)

31 - + Verify Content-Type from smart HTTP servers

26 +* al/mergetool-printf-fix (2013-02-10) 2 commits

27 + (merged to 'next' on 2013-02-11 at 5f9bc4e)

28 + + difftool--helper: fix printf usage

29 + + git-mergetool: print filename when it contains %

30

33 - The smart HTTP clients forgot to verify the content-type that comes

34 - back from the server side to make sure that the request is being

35 - handled properly.

31

37 ---------------------------------------------------

38 -[New Topics]

32 +* bw/get-tz-offset-perl (2013-02-09) 3 commits

33 + (merged to 'next' on 2013-02-11 at b9c8893)

34 + + cvsimport: format commit timestamp ourselves without using strftime

35 + + perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases

36 + + Move Git::SVN::get_tz to Git::get_tz_offset

37

40 -* da/p4merge-mktemp-fix (2013-02-10) 1 commit

41 - - p4merge: fix printf usage

38 + "git-cvsimport" and "git-svn" miscomputed TZ offset at DST boundary.

39

43 - Will merge to 'next'.

40

41 +* dg/subtree-fixes (2013-02-05) 6 commits

42 + (merged to 'next' on 2013-02-09 at 8f19ebe)

43 + + contrib/subtree: make the manual directory if needed

44 + + contrib/subtree: honor DESTDIR

45 + + contrib/subtree: fix synopsis

46 + + contrib/subtree: better error handling for 'subtree add'

47 + + contrib/subtree: use %B for split subject/body

48 + + contrib/subtree: remove test number comments

49

46 -* jn/shell-disable-interactive (2013-02-11) 2 commits

47 - - shell: pay attention to exit status from 'help' command

48 - - shell doc: emphasize purpose and security model

50 + contrib/subtree updates, but here are only the ones that looked

51 + ready.

52

50 - Will merge to 'next'.

53

54 +* jc/extended-fake-ancestor-for-gitlink (2013-02-05) 1 commit

55 + (merged to 'next' on 2013-02-09 at 2d3547b)

56 + + apply: verify submodule commit object name better

57

53 -* jk/read-commit-buffer-data-after-free (2013-02-11) 1 commit

54 - - log: re-encode commit messages before grepping

58 + Instead of requiring the full 40-hex object names on the index

59 + line, we can read submodule commit object names from the textual

60 + diff when synthesizing a fake ancestore tree for "git am -3".

61

56 - Will merge to 'next'.

62

63 +* jk/diff-graph-cleanup (2013-02-12) 6 commits

64 + (merged to 'next' on 2013-02-12 at 6e764c1)

65 + + combine-diff.c: teach combined diffs about line prefix

66 + + diff.c: use diff_line_prefix() where applicable

67 + + diff: add diff_line_prefix function

68 + + diff.c: make constant string arguments const

69 + + diff: write prefix to the correct file

70 + + graph: output padding for merge subsequent parents

71

59 -* mk/old-expat (2013-02-11) 1 commit

60 - - Allow building with xmlparse.h

72 + Refactors a lot of repetitive code sequence from the graph drawing

73 + code and adds it to the combined diff output.

74

62 - Will merge to 'next'.

75

76 +* jk/error-const-return (2013-02-08) 1 commit

77 + (merged to 'next' on 2013-02-11 at ba8dba3)

78 + + Use __VA_ARGS__ for all of error's arguments

79

65 -* ef/non-ascii-parse-options-error-diag (2013-02-11) 1 commit

66 - - parse-options: report uncorrupted multi-byte options

80

68 - Will merge to 'next'.

81 +* jx/utf8-printf-width (2013-02-11) 1 commit

82 + (merged to 'next' on 2013-02-11 at 968b4e2)

83 + + Add utf8_fprintf helper that returns correct number of columns

84

85 + Use a new helper that prints a message and counts its display width

86 + to align the help messages parse-options produces.

87

71 -* jk/rebase-i-comment-char (2013-02-12) 1 commit

72 - - rebase -i: respect core.commentchar

88

74 - Will merge to 'next'.

89 +* mg/bisect-doc (2013-02-11) 1 commit

90 + (merged to 'next' on 2013-02-11 at 6125304)

91 + + git-bisect.txt: clarify that reset quits bisect

92

93

77 -* mm/config-local-completion (2013-02-12) 1 commit

78 - - completion: support 'git config --local'

94 +* mm/remote-mediawiki-build (2013-02-08) 2 commits

95 + (merged to 'next' on 2013-02-11 at 4ebb902)

96 + + git-remote-mediawiki: use toplevel's Makefile

97 + + Makefile: make script-related rules usable from subdirectories

98 +

99 +

100 +* nd/status-show-in-progress (2013-02-05) 1 commit

101 + (merged to 'next' on 2013-02-11 at 5ffcbc2)

102 + + status: show the branch name if possible in in-progress info

103

80 - Will merge to 'next'.

104 +

105 +* tz/perl-styles (2013-02-06) 1 commit

106 + (merged to 'next' on 2013-02-09 at c8cff17)

107 + + Update CodingGuidelines for Perl

108 +

109 + Add coding guidelines for writing Perl scripts for Git.

110

111 --------------------------------------------------

83 -[Stalled]

112 +[New Topics]

113

85 -* mp/diff-algo-config (2013-01-16) 3 commits

86 - - diff: Introduce --diff-algorithm command line option

87 - - config: Introduce diff.algorithm variable

88 - - git-completion.bash: Autocomplete --minimal and --histogram for git-diff

114 +* mk/make-rm-depdirs-could-be-empty (2013-02-13) 1 commit

115 + (merged to 'next' on 2013-02-14 at d966248)

116 + + Makefile: don't run "rm" without any files

117

90 - Add diff.algorithm configuration so that the user does not type

91 - "diff --histogram".

118 + "make COMPUTE_HEADER_DEPENDENCIES=no clean" would try to run "rm

119 + -rf $(dep_dirs)" with an empty dep_dir, but some implementations of

120 + "rm -rf" barf on an empty argument list.

121 +

122 + Will merge to 'master'.

123 +

124 +

125 +* mw/bash-prompt-show-untracked-config (2013-02-13) 3 commits

126 + (merged to 'next' on 2013-02-14 at 809dbcf)

127 + + t9903: add extra tests for bash.showDirtyState

128 + + t9903: add tests for bash.showUntrackedFiles

129 + + shell prompt: add bash.showUntrackedFiles option

130

93 - Looking better; may want tests to protect it from future breakages,

94 - but otherwise it looks ready for 'next'.

131 + Allows skipping the untracked check GIT_PS1_SHOWUNTRACKEDFILES

132 + asks for the git-prompt (in contrib/) per repository.

133

96 - Expecting a follow-up to add tests.

134 + Will merge to 'master'.

135 +

136 +

137 +* mg/gpg-interface-using-status (2013-02-14) 5 commits

138 + - pretty: make %GK output the signing key for signed commits

139 + - pretty: parse the gpg status lines rather than the output

140 + - gpg_interface: allow to request status return

141 + - log-tree: rely upon the check in the gpg_interface

142 + - gpg-interface: check good signature in a reliable way

143 +

144 + Call "gpg" using the right API when validating the signature on

145 + tags.

146

147

148 +* mm/config-intro-in-git-doc (2013-02-14) 1 commit

149 + - git.txt: update description of the configuration mechanism

150 +

151 +--------------------------------------------------

152 +[Stalled]

153 +

154 * mb/gitweb-highlight-link-target (2012-12-20) 1 commit

155 - Highlight the link target line in Gitweb using CSS

156

@@ -189,123 +244,114 @@ repositories listed at

244 --------------------------------------------------

245 [Cooking]

246

192 -* jc/fetch-raw-sha1 (2013-02-07) 4 commits

193 - - fetch: fetch objects by their exact SHA-1 object names

194 - - upload-pack: optionally allow fetching from the tips of hidden refs

195 - - fetch: use struct ref to represent refs to be fetched

196 - - parse_fetch_refspec(): clarify the codeflow a bit

197 - (this branch uses jc/hidden-refs.)

247 +* mp/diff-algo-config (2013-01-16) 3 commits

248 + (merged to 'next' on 2013-02-14 at cd765dc)

249 + + diff: Introduce --diff-algorithm command line option

250 + + config: Introduce diff.algorithm variable

251 + + git-completion.bash: Autocomplete --minimal and --histogram for git-diff

252

199 - Allows requests to fetch objects at any tip of refs (including

200 - hidden ones). It seems that there may be use cases even outside

201 - Gerrit (e.g. $gmane/215701).

253 + Add diff.algorithm configuration so that the user does not type

254 + "diff --histogram".

255

256 + Will merge to 'master'.

257

204 -* jk/diff-graph-cleanup (2013-02-12) 6 commits

205 - (merged to 'next' on 2013-02-12 at 6e764c1)

206 - + combine-diff.c: teach combined diffs about line prefix

207 - + diff.c: use diff_line_prefix() where applicable

208 - + diff: add diff_line_prefix function

209 - + diff.c: make constant string arguments const

210 - + diff: write prefix to the correct file

211 - + graph: output padding for merge subsequent parents

258

213 - Refactors a lot of repetitive code sequence from the graph drawing

214 - code and adds it to the combined diff output.

259 +* da/p4merge-mktemp-fix (2013-02-10) 1 commit

260 + (merged to 'next' on 2013-02-14 at c5fc5ba)

261 + + p4merge: fix printf usage

262

263 Will merge to 'master'.

264

265

219 -* mn/send-email-works-with-credential (2013-02-12) 6 commits

220 - - git-send-email: use git credential to obtain password

221 - - Git.pm: add interface for git credential command

222 - - Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

223 - - Git.pm: refactor command_close_bidi_pipe to use _cmd_close

224 - - Git.pm: fix example in command_close_bidi_pipe documentation

225 - - Git.pm: allow command_close_bidi_pipe to be called as method

226 -

227 - Hooks the credential system to send-email.

228 - Rerolled.

229 - Waiting for a review.

266 +* jn/shell-disable-interactive (2013-02-11) 2 commits

267 + - shell: pay attention to exit status from 'help' command

268 + - shell doc: emphasize purpose and security model

269

270 + Expecting a reroll.

271 + $gmane/216229

272

232 -* tz/perl-styles (2013-02-06) 1 commit

233 - (merged to 'next' on 2013-02-09 at c8cff17)

234 - + Update CodingGuidelines for Perl

273

236 - Add coding guidelines for writing Perl scripts for Git.

274 +* jk/read-commit-buffer-data-after-free (2013-02-11) 1 commit

275 + (merged to 'next' on 2013-02-14 at 220e3a8)

276 + + log: re-encode commit messages before grepping

277

278 Will merge to 'master'.

279

280

241 -* al/mergetool-printf-fix (2013-02-10) 2 commits

242 - (merged to 'next' on 2013-02-11 at 5f9bc4e)

243 - + difftool--helper: fix printf usage

244 - + git-mergetool: print filename when it contains %

281 +* mk/old-expat (2013-02-11) 1 commit

282 + (merged to 'next' on 2013-02-14 at 5fb47ce)

283 + + Allow building with xmlparse.h

284

285 Will merge to 'master'.

286

287

249 -* jk/error-const-return (2013-02-08) 1 commit

250 - (merged to 'next' on 2013-02-11 at ba8dba3)

251 - + Use __VA_ARGS__ for all of error's arguments

288 +* ef/non-ascii-parse-options-error-diag (2013-02-11) 1 commit

289 + (merged to 'next' on 2013-02-14 at 10cbdf8)

290 + + parse-options: report uncorrupted multi-byte options

291

292 Will merge to 'master'.

293

294

256 -* mm/remote-mediawiki-build (2013-02-08) 2 commits

257 - (merged to 'next' on 2013-02-11 at 4ebb902)

258 - + git-remote-mediawiki: use toplevel's Makefile

259 - + Makefile: make script-related rules usable from subdirectories

295 +* jk/rebase-i-comment-char (2013-02-12) 1 commit

296 + (merged to 'next' on 2013-02-14 at 0ed2f48)

297 + + rebase -i: respect core.commentchar

298

299 Will merge to 'master'.

300

301

264 -* nd/branch-show-rebase-bisect-state (2013-02-08) 1 commit

265 - - branch: show rebase/bisect info when possible instead of "(no branch)"

266 -

267 - Expecting a reroll.

268 - $gmane/215771

302 +* mm/config-local-completion (2013-02-12) 1 commit

303 + (merged to 'next' on 2013-02-14 at 26bf6c2)

304 + + completion: support 'git config --local'

305

306 + Will merge to 'master'.

307

271 -* nd/count-garbage (2013-02-08) 3 commits

272 - - count-objects: report how much disk space taken by garbage files

273 - - count-objects: report garbage files in pack directory too

274 - - git-count-objects.txt: describe each line in -v output

308

276 - Expecting a reroll.

277 - $gmane/216127

309 +* jc/fetch-raw-sha1 (2013-02-07) 4 commits

310 + (merged to 'next' on 2013-02-14 at ffa3c65)

311 + + fetch: fetch objects by their exact SHA-1 object names

312 + + upload-pack: optionally allow fetching from the tips of hidden refs

313 + + fetch: use struct ref to represent refs to be fetched

314 + + parse_fetch_refspec(): clarify the codeflow a bit

315 + (this branch uses jc/hidden-refs.)

316

317 + Allows requests to fetch objects at any tip of refs (including

318 + hidden ones). It seems that there may be use cases even outside

319 + Gerrit (e.g. $gmane/215701).

320

280 -* wk/man-deny-current-branch-is-default-these-days (2013-02-08) 1 commit

281 - - user-manual: Update for receive.denyCurrentBranch=refuse

321

283 - Will merge to 'next'.

322 +* mn/send-email-works-with-credential (2013-02-12) 6 commits

323 + - git-send-email: use git credential to obtain password

324 + - Git.pm: add interface for git credential command

325 + - Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

326 + - Git.pm: refactor command_close_bidi_pipe to use _cmd_close

327 + - Git.pm: fix example in command_close_bidi_pipe documentation

328 + - Git.pm: allow command_close_bidi_pipe to be called as method

329

330 + Hooks the credential system to send-email.

331 + Rerolled.

332 + Waiting for a review.

333

286 -* bw/get-tz-offset-perl (2013-02-09) 3 commits

287 - (merged to 'next' on 2013-02-11 at b9c8893)

288 - + cvsimport: format commit timestamp ourselves without using strftime

289 - + perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases

290 - + Move Git::SVN::get_tz to Git::get_tz_offset

334

292 - Will merge to 'master'.

335 +* nd/branch-show-rebase-bisect-state (2013-02-08) 1 commit

336 + - branch: show rebase/bisect info when possible instead of "(no branch)"

337

338 + Expecting a reroll.

339 + $gmane/215771

340

295 -* mg/bisect-doc (2013-02-11) 1 commit

296 - (merged to 'next' on 2013-02-11 at 6125304)

297 - + git-bisect.txt: clarify that reset quits bisect

341

299 - Will merge to 'master'.

342 +* nd/count-garbage (2013-02-13) 4 commits

343 + - count-objects: report how much disk space taken by garbage files

344 + - count-objects: report garbage files in pack directory too

345 + - sha1_file: reorder code in prepare_packed_git_one()

346 + - git-count-objects.txt: describe each line in -v output

347

348 + Looked good, but the handling of files with known-corrupt .idx

349 + counterparts could be improved.

350

302 -* jc/extended-fake-ancestor-for-gitlink (2013-02-05) 1 commit

303 - (merged to 'next' on 2013-02-09 at 2d3547b)

304 - + apply: verify submodule commit object name better

351

306 - Instead of requiring the full 40-hex object names on the index

307 - line, we can read submodule commit object names from the textual

308 - diff when synthesizing a fake ancestore tree for "git am -3".

352 +* wk/man-deny-current-branch-is-default-these-days (2013-02-14) 1 commit

353 + (merged to 'next' on 2013-02-14 at 6fab9d4)

354 + + user-manual: Update for receive.denyCurrentBranch=refuse

355

356 Will merge to 'master'.

357

@@ -321,32 +367,6 @@ repositories listed at

367 $gmane/215556

368

369

324 -* jx/utf8-printf-width (2013-02-11) 1 commit

325 - (merged to 'next' on 2013-02-11 at 968b4e2)

326 - + Add utf8_fprintf helper that returns correct number of columns

327 -

328 - Use a new helper that prints a message and counts its display width

329 - to align the help messages parse-options produces.

330 -

331 - Will merge to 'master'.

332 -

333 -

334 -* dg/subtree-fixes (2013-02-05) 6 commits

335 - (merged to 'next' on 2013-02-09 at 8f19ebe)

336 - + contrib/subtree: make the manual directory if needed

337 - + contrib/subtree: honor DESTDIR

338 - + contrib/subtree: fix synopsis

339 - + contrib/subtree: better error handling for 'subtree add'

340 - + contrib/subtree: use %B for split subject/body

341 - + contrib/subtree: remove test number comments

342 -

343 - contrib/subtree updates, but here are only the ones that looked

344 - ready to be merged to 'next'. For the remainder, they will have

345 - another day.

346 -

347 - Will merge to 'master'.

348 -

349 -

370 * jl/submodule-deinit (2013-02-06) 1 commit

371 - submodule: add 'deinit' command

372

@@ -354,7 +374,8 @@ repositories listed at

374 this submodule", once you express your interest in a submodule with

375 "submodule init". "submodule deinit" is the way to do so.

376

357 - Will merge to 'next'.

377 + Expecting another reroll.

378 + $gmane/216276

379

380

381 * jc/remove-export-from-config-mak-in (2013-02-12) 2 commits

@@ -372,12 +393,7 @@ repositories listed at

393 broken installation of manpages (but not other documentation

394 formats).

395

375 -

376 -* nd/status-show-in-progress (2013-02-05) 1 commit

377 - (merged to 'next' on 2013-02-11 at 5ffcbc2)

378 - + status: show the branch name if possible in in-progress info

379 -

380 - Will merge to 'master'.

396 + Will cook in 'next'.

397

398

399 * jc/mention-tracking-for-pull-default (2013-01-31) 1 commit

@@ -395,15 +411,16 @@ repositories listed at

411

412

413 * jc/hidden-refs (2013-02-07) 3 commits

398 - - upload/receive-pack: allow hiding ref hierarchies

399 - - upload-pack: simplify request validation

400 - - upload-pack: share more code

414 + (merged to 'next' on 2013-02-14 at b69f9cc)

415 + + upload/receive-pack: allow hiding ref hierarchies

416 + + upload-pack: simplify request validation

417 + + upload-pack: share more code

418 (this branch is used by jc/fetch-raw-sha1.)

419

420 Allow the server side to redact the refs/ namespace it shows to the

421 client.

422

406 - Will merge to 'next'.

423 + Will merge to 'master'.

424

425

426 * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

@@ -456,22 +473,5 @@ repositories listed at

473 - commit, cherry-pick -s: remove broken support for multiline rfc2822 fields

474 - sequencer.c: rework search for start of footer to improve clarity

475

459 - Will merge to 'next'.

460 -

461 ---------------------------------------------------

462 -[Discarded]

463 -

464 -* mn/send-email-authinfo (2013-01-29) 1 commit

465 - . git-send-email: add ~/.authinfo parsing

466 -

467 - Instead of making send-email directly read from .netrc/.authinfo,

468 - mn/send-email-works-with-credential topic hooks the program to our

469 - credential framework, and tz/credential-authinfo topic gives access

470 - to these file formats to credential consumers.

471 -

472 -

473 -* mm/allow-contrib-build (2013-02-07) 2 commits

474 - . perl.mak: introduce $(GIT_ROOT_DIR) to allow inclusion from other directories

475 - . Makefile: extract perl-related rules to make them available from other dirs

476 -

477 - Superseded by mm/remote-mediawiki-build.

476 + Waiting for further reviews.

477 + $gmane/216327 may need to be addressed.

What's cooking (2013/02 #06)