51faf25335 · 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, #02; Mon, 4)

4 -X-master-at: f51a757fafc1e1ca9565381a13109932acd81dba

5 -X-next-at: 3b7952273237a5df57414b4a5327ce7e64e63255

3 +Subject: What's cooking in git.git (Feb 2013, #03; Wed, 6)

4 +X-master-at: 2f19ada7f8a5bb768816cf7334f65ae0ab03c8a7

5 +X-next-at: 8bc64348c96661c4cb37542730b0df4dd12eb8c2

6

7 -What's cooking in git.git (Feb 2013, #02; Mon, 4)

7 +What's cooking in git.git (Feb 2013, #03; Wed, 6)

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

9

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

@@ -22,115 +22,24 @@ repositories listed at

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

23 [Graduated to "master"]

24

25 -* jc/custom-comment-char (2013-01-16) 1 commit

26 - (merged to 'next' on 2013-01-25 at 91d8a5d)

27 - + Allow custom "comment char"

28 -

29 - Allow a configuration variable core.commentchar to customize the

30 - character used to comment out the hint lines in the edited text

31 - from the default '#'.

32 -

33 - This is half my work and half by Ralf Thielow. There may still be

34 - leftover '#' lurking around, though. My "git grep" says C code

35 - should be already fine, but git-rebase--interactive.sh could be

36 - converted (it should not matter, as the file is not really a

37 - free-form text).

38 -

39 -

40 -* jc/push-reject-reasons (2013-01-24) 4 commits

41 - (merged to 'next' on 2013-01-28 at b60be93)

42 - + push: finishing touches to explain REJECT_ALREADY_EXISTS better

43 - + push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

44 - + push: further simplify the logic to assign rejection reason

45 - + push: further clean up fields of "struct ref"

46 -

47 - Improve error and advice messages given locally when "git push"

48 - refuses when it cannot compute fast-forwardness by separating these

49 - cases from the normal "not a fast-forward; merge first and push

50 - again" case.

51 -

52 -

53 -* jk/config-parsing-cleanup (2013-01-23) 8 commits

54 - (merged to 'next' on 2013-01-28 at 9bc9411)

55 - + reflog: use parse_config_key in config callback

56 - + help: use parse_config_key for man config

57 - + submodule: simplify memory handling in config parsing

58 - + submodule: use parse_config_key when parsing config

59 - + userdiff: drop parse_driver function

60 - + convert some config callbacks to parse_config_key

61 - + archive-tar: use parse_config_key when parsing config

62 - + config: add helper function for parsing key names

63 -

64 - Configuration parsing for tar.* configuration variables were

65 - broken. Introduce a new config-keyname parser API to make the

66 - callers much less error prone.

67 -

68 -

69 -* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits

70 - (merged to 'next' on 2013-01-30 at c6d7e16)

71 - + logmsg_reencode: lazily load missing commit buffers

72 - + logmsg_reencode: never return NULL

73 - + commit: drop useless xstrdup of commit message

74 -

75 - Clarify the ownership rule for commit->buffer field, which some

76 - callers incorrectly accessed without making sure it is populated.

77 -

78 -

79 -* jk/remote-helpers-in-python-3 (2013-01-30) 10 commits

80 - (merged to 'next' on 2013-01-31 at 5a948aa)

81 - + git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"

82 - (merged to 'next' on 2013-01-28 at d898471)

83 - + git-remote-testpy: fix path hashing on Python 3

84 - (merged to 'next' on 2013-01-25 at acf9419)

85 - + git-remote-testpy: call print as a function

86 - + git-remote-testpy: don't do unbuffered text I/O

87 - + git-remote-testpy: hash bytes explicitly

88 - + svn-fe: allow svnrdump_sim.py to run with Python 3

89 - + git_remote_helpers: use 2to3 if building with Python 3

90 - + git_remote_helpers: force rebuild if python version changes

91 - + git_remote_helpers: fix input when running under Python 3

92 - + git_remote_helpers: allow building with Python 3

93 -

94 - Prepare remote-helper test written in Python to be run with Python3.

95 -

96 -

97 -* mm/add-u-A-sans-pathspec (2013-01-28) 1 commit

98 - (merged to 'next' on 2013-01-28 at fe762a6)

99 - + add: warn when -u or -A is used without pathspec

100 -

101 - Forbid "git add -u" and "git add -A" without pathspec run from a

102 - subdirectory, to train people to type "." (or ":/") to make the

103 - choice of default does not matter.

104 -

105 -

106 -* pw/git-p4-on-cygwin (2013-01-26) 21 commits

107 - (merged to 'next' on 2013-01-30 at 958ae3a)

108 - + git p4: introduce gitConfigBool

109 - + git p4: avoid shell when calling git config

110 - + git p4: avoid shell when invoking git config --get-all

111 - + git p4: avoid shell when invoking git rev-list

112 - + git p4: avoid shell when mapping users

113 - + git p4: disable read-only attribute before deleting

114 - + git p4 test: use test_chmod for cygwin

115 - + git p4: cygwin p4 client does not mark read-only

116 - + git p4 test: avoid wildcard * in windows

117 - + git p4 test: use LineEnd unix in windows tests too

118 - + git p4 test: newline handling

119 - + git p4: scrub crlf for utf16 files on windows

120 - + git p4: remove unreachable windows \r\n conversion code

121 - + git p4 test: translate windows paths for cygwin

122 - + git p4 test: start p4d inside its db dir

123 - + git p4 test: use client_view in t9806

124 - + git p4 test: avoid loop in client_view

125 - + git p4 test: use client_view to build the initial client

126 - + git p4: generate better error message for bad depot path

127 - + git p4: remove unused imports

128 - + git p4: temp branch name should use / even on windows

129 -

130 - Improve "git p4" on Cygwin.

25 +* ft/transport-report-segv (2013-01-31) 1 commit

26 + (merged to 'next' on 2013-02-02 at 6c450a7)

27 + + push: fix segfault when HEAD points nowhere

28 +

29 + A failure to push due to non-ff while on an unborn branch

30 + dereferenced a NULL pointer when showing an error message.

31 +

32 +

33 +* jc/fake-ancestor-with-non-blobs (2013-01-31) 3 commits

34 + (merged to 'next' on 2013-02-02 at 86d457a)

35 + + apply: diagnose incomplete submodule object name better

36 + + apply: simplify build_fake_ancestor()

37 + + git-am: record full index line in the patch used while rebasing

38 + (this branch is used by jc/extended-fake-ancestor-for-gitlink.)

39 +

40 + Rebasing the history of superproject with change in the submodule

41 + has been broken since v1.7.12.

42

132 ---------------------------------------------------

133 -[New Topics]

43

44 * jn/auto-depend-workaround-buggy-ccache (2013-02-01) 1 commit

45 (merged to 'next' on 2013-02-02 at db5940a)

@@ -140,80 +49,70 @@ repositories listed at

49 breaking the auto-generation of dependencies, which unfortunately

50 is still relevant because some people use ancient distros.

51

143 - Will merge to 'master'.

144 -

145 -

146 -* ct/autoconf-htmldir (2013-02-02) 1 commit

147 - - Honor configure's htmldir switch

148 -

149 - The autoconf subsystem passed --mandir down to generated

150 - config.mak.autogen but forgot to do the same for --htmldir.

151 -

152 - Will merge to 'next'.

52

53 +* sb/gpg-plug-fd-leak (2013-01-31) 1 commit

54 + (merged to 'next' on 2013-02-02 at c271a31)

55 + + gpg: close stderr once finished with it in verify_signed_buffer()

56

155 -* mk/tcsh-complete-only-known-paths (2013-02-03) 1 commit

156 - - completion: handle path completion and colon for tcsh script

157 - (this branch uses mp/complete-paths.)

57 + We forgot to close the file descriptor reading from "gpg" output,

58 + killing "git log --show-signature" on a long history.

59

159 - Manlio's "complete with known paths only" update to completion

160 - scripts returns directory names without trailing slash to

161 - compensate the addition of '/' done by bash that reads from our

162 - completion result. tcsh completion code that reads from our

163 - internal completion result does not add '/', so let it ask our

164 - complletion code to keep the '/' at the end.

60

166 - Will merge to 'next'.

61 +* ta/doc-no-small-caps (2013-02-01) 6 commits

62 + (merged to 'next' on 2013-02-02 at 77cbd0e)

63 + + Documentation: StGit is the right spelling, not StGIT

64 + + Documentation: describe the "repository" in repository-layout

65 + + Documentation: add a description for 'gitfile' to glossary

66 + + Documentation: do not use undefined terms git-dir and git-file

67 + + Documentation: the name of the system is 'Git', not 'git'

68 + + Documentation: avoid poor-man's small caps GIT

69

70 + Update documentation to change "GIT" which was a poor-man's small

71 + caps to "Git". The latter was the intended spelling.

72

169 -* jc/combine-diff-many-parents (2013-02-03) 1 commit

170 - - combine-diff: lift 32-way limit of combined diff

73 + Also change "git" spelled in all-lowercase to "Git" when it refers

74 + to the system as the whole or the concept it embodies, as opposed to

75 + the command the end users would type.

76

172 - We used to have an arbitrary 32 limit for combined diff input,

173 - resulting in incorrect number of leading colons shown when showing

174 - the "--raw --cc" output.

77 +--------------------------------------------------

78 +[New Topics]

79

176 - May want a couple of new tests.

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

81 + - apply: verify submodule commit object name better

82

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

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

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

86

179 -* jc/remove-export-from-config-mak-in (2013-02-03) 1 commit

180 - - config.mak.in: remove unused definitions

87 + Will merge to 'next'.

88

182 - config.mak.in template had an "export" line to cause a few

183 - common makefile variables to be exported; if they need to be

184 - expoted for autoconf/configure users, they should also be exported

185 - for people who write config.mak the same way. Move the "export" to

186 - the main Makefile.

89

90 +* tz/credential-authinfo (2013-02-05) 1 commit

91 + - Add contrib/credentials/netrc with GPG support

92

189 -* jk/apply-similaritly-parsing (2013-02-03) 1 commit

190 - - builtin/apply: tighten (dis)similarity index parsing

93 + A new read-only credential helper (in contrib/) to interact with

94 + the .netrc/.authinfo files. Hopefully mn/send-email-authinfo topic

95 + can rebuild on top of something like this.

96

192 - Make sure the similarity value shown in the "apply --summary"

193 - output is sensible, even when the input had a bogus value.

97 + Waiting for further reviews.

98

195 - Will merge to 'next'.

99

100 +* jx/utf8-printf-width (2013-02-05) 1 commit

101 + - Add utf8_fprintf helper which returns correct columns

102

198 -* nd/status-show-in-progress (2013-02-03) 1 commit

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

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

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

105

106 --------------------------------------------------

107 [Stalled]

108

204 -* dg/subtree-fixes (2013-01-08) 7 commits

205 - - contrib/subtree: mkdir the manual directory if needed

206 - - contrib/subtree: honor $(DESTDIR)

207 - - contrib/subtree: fix synopsis and command help

208 - - contrib/subtree: better error handling for "add"

209 - - contrib/subtree: add --unannotate option

210 - - contrib/subtree: use %B for split Subject/Body

211 - - t7900: remove test number comments

212 -

213 - contrib/subtree updates; there are a few more from T. Zheng that

214 - were posted separately, with an overlap.

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

110 + - git-send-email: add ~/.authinfo parsing

111

216 - Expecting a reroll.

112 + This triggered a subtopic to add a credential helper for

113 + authinfo/netrc files (with or without GPG encryption), but nobody

114 + seems to be working on connecting send-email to the credential

115 + framework.

116

117

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

@@ -237,17 +136,6 @@ repositories listed at

136 $gmane/211935

137

138

240 -* jl/submodule-deinit (2012-12-04) 1 commit

241 - - submodule: add 'deinit' command

242 -

243 - There was no Porcelain way to say "I no longer am interested in

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

245 - "submodule init". "submodule deinit" is the way to do so.

246 -

247 - Expecting a reroll.

248 - $gmane/212884

249 -

250 -

139 * jk/lua-hackery (2012-10-07) 6 commits

140 - pretty: fix up one-off format_commit_message calls

141 - Minimum compilation fixup

@@ -363,29 +251,97 @@ repositories listed at

251 --------------------------------------------------

252 [Cooking]

253

366 -* ft/transport-report-segv (2013-01-31) 1 commit

367 - (merged to 'next' on 2013-02-02 at 6c450a7)

368 - + push: fix segfault when HEAD points nowhere

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

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

256 + - contrib/subtree: honor DESTDIR

257 + - contrib/subtree: fix synopsis

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

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

260 + - contrib/subtree: remove test number comments

261

370 - A failure to push due to non-ff while on an unborn branch

371 - dereferenced a NULL pointer when showing an error message.

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

263 + ready to be merged to 'next'. For the remainder, they will have

264 + another day.

265 +

266 + Will merge to 'next'.

267 +

268 +

269 +* jl/submodule-deinit (2013-02-04) 1 commit

270 + - submodule: add 'deinit' command

271 +

272 + There was no Porcelain way to say "I no longer am interested in

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

274 + "submodule init". "submodule deinit" is the way to do so.

275 +

276 + Will merge to 'next'.

277 +

278 +

279 +* ct/autoconf-htmldir (2013-02-02) 1 commit

280 + (merged to 'next' on 2013-02-05 at bba4f8c)

281 + + Honor configure's htmldir switch

282 +

283 + The autoconf subsystem passed --mandir down to generated

284 + config.mak.autogen but forgot to do the same for --htmldir.

285

286 Will merge to 'master'.

287

288

376 -* sb/gpg-i18n (2013-01-31) 1 commit

377 - (merged to 'next' on 2013-02-02 at 7a54574)

378 - + gpg: allow translation of more error messages

289 +* mk/tcsh-complete-only-known-paths (2013-02-03) 1 commit

290 + (merged to 'next' on 2013-02-05 at 4409b08)

291 + + completion: handle path completion and colon for tcsh script

292 + (this branch uses mp/complete-paths.)

293 +

294 + Manlio's "complete with known paths only" update to completion

295 + scripts returns directory names without trailing slash to

296 + compensate the addition of '/' done by bash that reads from our

297 + completion result. tcsh completion code that reads from our

298 + internal completion result does not add '/', so let it ask our

299 + complletion code to keep the '/' at the end.

300

301 Will merge to 'master'.

302

303

383 -* sb/gpg-plug-fd-leak (2013-01-31) 1 commit

384 - (merged to 'next' on 2013-02-02 at c271a31)

385 - + gpg: close stderr once finished with it in verify_signed_buffer()

304 +* jc/combine-diff-many-parents (2013-02-05) 2 commits

305 + (merged to 'next' on 2013-02-05 at e382aa6)

306 + + t4038: add tests for "diff --cc --raw <trees>"

307 + + combine-diff: lift 32-way limit of combined diff

308

387 - We forgot to close the file descriptor reading from "gpg" output,

388 - killing "git log --show-signature" on a long history.

309 + We used to have an arbitrary 32 limit for combined diff input,

310 + resulting in incorrect number of leading colons shown when showing

311 + the "--raw --cc" output.

312 +

313 + Will merge to 'master'.

314 +

315 +

316 +* jc/remove-export-from-config-mak-in (2013-02-03) 1 commit

317 + - config.mak.in: remove unused definitions

318 +

319 + config.mak.in template had an "export" line to cause a few

320 + common makefile variables to be exported; if they need to be

321 + expoted for autoconf/configure users, they should also be exported

322 + for people who write config.mak the same way. Move the "export" to

323 + the main Makefile.

324 +

325 +

326 +* jk/apply-similaritly-parsing (2013-02-03) 1 commit

327 + (merged to 'next' on 2013-02-05 at ccf1c97)

328 + + builtin/apply: tighten (dis)similarity index parsing

329 +

330 + Make sure the similarity value shown in the "apply --summary"

331 + output is sensible, even when the input had a bogus value.

332 +

333 + Will merge to 'master'.

334 +

335 +

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

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

338 +

339 + Will merge to 'next'.

340 +

341 +

342 +* sb/gpg-i18n (2013-01-31) 1 commit

343 + (merged to 'next' on 2013-02-02 at 7a54574)

344 + + gpg: allow translation of more error messages

345

346 Will merge to 'master'.

347

@@ -408,7 +364,11 @@ repositories listed at

364 Will merge to 'master'.

365

366

411 -* sp/smart-http-content-type-check (2013-02-04) 1 commit

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

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

369 + + http_request: reset "type" strbuf before adding

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

371 + + t5551: fix expected error output

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

373 + Verify Content-Type from smart HTTP servers

374

@@ -416,8 +376,6 @@ repositories listed at

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

377 handled properly.

378

419 - Will merge to 'master'.

420 -

379

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

381 - doc: mention tracking for pull.default

@@ -428,19 +386,9 @@ repositories listed at

386

387 This is my "don't list it to catch readers' eyes, but make sure it

388 can be found if the reader looks for it" version; I'm not married

431 - to the layout and am willing to take a replacement patch.

389 + to the layout and will be happy to take a replacement patch.

390

433 -

434 -* jc/fake-ancestor-with-non-blobs (2013-01-31) 3 commits

435 - (merged to 'next' on 2013-02-02 at 86d457a)

436 - + apply: diagnose incomplete submodule object name better

437 - + apply: simplify build_fake_ancestor()

438 - + git-am: record full index line in the patch used while rebasing

439 -

440 - Rebasing the history of superproject with change in the submodule

441 - has been broken since v1.7.12.

442 -

443 - Will merge to 'master'.

391 + Waiting for couter-proposal patches.

392

393

394 * jk/doc-makefile-cleanup (2013-02-01) 1 commit

@@ -467,13 +415,6 @@ repositories listed at

415 Will merge to 'master'.

416

417

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

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

472 -

473 - Expecting a reroll.

474 - $gmane/215004, $gmane/215024.

475 -

476 -

418 * mp/complete-paths (2013-01-11) 1 commit

419 (merged to 'next' on 2013-01-30 at 70e4f1a)

420 + git-completion.bash: add support for path completion

@@ -551,8 +492,7 @@ repositories listed at

492 Will merge to 'master'.

493

494

554 -* jc/hidden-refs (2013-01-30) 8 commits

555 - - WIP: receive.allowupdatestohidden

495 +* jc/hidden-refs (2013-01-30) 7 commits

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

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

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

@@ -565,26 +505,10 @@ repositories listed at

505 the client. Optionally allow requests for histories leading to the

506 tips of hidden refs by updated clients.

507

568 - Will merge to 'next' after dropping the tip.

569 -

570 -

571 -* ta/doc-no-small-caps (2013-02-01) 6 commits

572 - (merged to 'next' on 2013-02-02 at 77cbd0e)

573 - + Documentation: StGit is the right spelling, not StGIT

574 - + Documentation: describe the "repository" in repository-layout

575 - + Documentation: add a description for 'gitfile' to glossary

576 - + Documentation: do not use undefined terms git-dir and git-file

577 - + Documentation: the name of the system is 'Git', not 'git'

578 - + Documentation: avoid poor-man's small caps GIT

579 -

580 - Update documentation to change "GIT" which was a poor-man's small

581 - caps to "Git". The latter was the intended spelling.

582 -

583 - Also change "git" spelled in all-lowercase to "Git" when it refers

584 - to the system as the whole or the concept it embodies, as opposed to

585 - the command the end users would type.

586 -

587 - Will merge to 'master'.

508 + Need to split the configuration into three (one for sending, one

509 + for receiving, and then another to cover both for convenience)

510 + before this topic can go forward. Perhaps people involved in the

511 + review cycle can help.

512

513

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

What's cooking (2013/02 #03)