7d4bbfcb8b · matheusbsbs/matheus-bagliano

@@ -1,20 +1,18 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jul 2013, #09; Mon, 29)

4 -X-master-at: 8f6a3e5d71fa1800c3f330bab2b6b6399ec7aea7

5 -X-next-at: cf3f07e67f28b0068199b16bc6974f4bbafb4e51

3 +Subject: What's cooking in git.git (Jul 2013, #10; Wed, 31)

4 +X-master-at: 8dc84fdc48a79c70682e6c361a82d0f3e1db9a03

5 +X-next-at: 025c443e44c008c3a3dd7b83658f4e9734343e53

6

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

7 +What's cooking in git.git (Jul 2013, #10; Wed, 31)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -The shape of the upcoming release is pretty much known by now; all

15 -the topics that are marked for 'master' in this issue will likely to

16 -be in the final, and others will cook during the pre-release freeze

17 -period.

14 +Hopefully the 1.8.4-rc1 tomorrow with topics marked for 'master'

15 +in this issue of "What's cooking" report.

16

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

18 of the repositories listed at

@@ -24,165 +22,14 @@ of the repositories listed at

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

23 [Graduated to "master"]

24

27 -* ob/typofixes (2013-07-22) 3 commits

28 - (merged to 'next' on 2013-07-22 at 8574f9f)

29 - + typofix: in-code comments

30 - + typofix: documentation

31 - + typofix: release notes

32 -

33 -

34 -* es/contacts (2013-07-21) 5 commits

35 - (merged to 'next' on 2013-07-22 at a78c3d6)

36 - + contrib: contacts: add documentation

37 - + contrib: contacts: add mailmap support

38 - + contrib: contacts: interpret committish akin to format-patch

39 - + contrib: contacts: add ability to parse from committish

40 - + contrib: add git-contacts helper

41 -

42 - A helper to read from a set of format-patch output files or a range

43 - of commits and find those who may have insights to the code that

44 - the changes touch by running a series of "git blame" commands.

45 -

46 -

47 -* es/line-log-further-fixes (2013-07-23) 5 commits

48 - + line-log: fix "log -LN" crash when N is last line of file

49 - + range-set: satisfy non-empty ranges invariant

50 - + t4211: demonstrate crash when first -L encountered is empty range

51 - + t4211: demonstrate empty -L range crash

52 - + range-set: fix sort_and_merge_range_set() corner case bug

53 - (this branch is used by tr/line-log.)

54 -

55 -

56 -* jk/cat-file-batch-optim (2013-07-18) 9 commits

57 - (merged to 'next' on 2013-07-22 at 965897c)

58 - + Fix some sparse warnings

59 - + sha1_object_info_extended: pass object_info to helpers

60 - + sha1_object_info_extended: make type calculation optional

61 - + packed_object_info: make type lookup optional

62 - + packed_object_info: hoist delta type resolution to helper

63 - + sha1_loose_object_info: make type lookup optional

64 - + sha1_object_info_extended: rename "status" to "type"

65 - + cat-file: disable object/refname ambiguity check for batch mode

66 - + Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim

67 -

68 - If somebody wants to only know on-disk footprint of an object

69 - without having to know its type or payload size, we can bypass a

70 - lot of code to cheaply learn it.

71 -

72 -

73 -* jm/doc-ref-prune (2013-07-18) 2 commits

74 - (merged to 'next' on 2013-07-22 at 414e6ea)

75 - + Documentation: fix git-prune example usage

76 - + Documentation: remove --prune from pack-refs examples

77 -

78 -

79 -* mh/multimail (2013-07-22) 2 commits

80 - (merged to 'next' on 2013-07-22 at e27c933)

81 - + post-receive-email: deprecate script in favor of git-multimail

82 - + git-multimail: an improved replacement for post-receive-email

83 -

84 - An enhanced "post-receive" hook to send e-mail messages.

85 -

86 -

87 -* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit

88 - (merged to 'next' on 2013-07-22 at 144d135)

89 - + refs: do not invalidate the packed-refs cache unnecessarily

90 -

91 - This requires the platform lstat() to be correct to avoid false

92 - negatives.

93 -

94 -

95 -* ml/avoid-using-grep-on-crlf-files (2013-07-18) 1 commit

96 - (merged to 'next' on 2013-07-22 at f861472)

97 - + test-lib.sh - define and use GREP_STRIPS_CR

98 -

99 - On systems that understand a CRLF as a line ending, tests in this

100 - script that worked on files with CRLF line endings using "grep" to

101 - extract matching lines may lose the CR at the end of lines that

102 - match, causing the actual output not to match the expected output.

103 -

104 -

105 -* ml/cygwin-updates (2013-07-21) 4 commits

106 - (merged to 'next' on 2013-07-22 at e9c9872)

107 - + cygwin: stop forcing core.filemode=false

108 - + Cygwin 1.7 supports mmap

109 - + Cygwin 1.7 has thread-safe pread

110 - + Cygwin 1.7 needs compat/regex

111 -

112 - The tip one does _not_ revert c869753e (Force core.filemode to

113 - false on Cygwin., 2006-12-30) on purpose, so that people can

114 - still retain the old behaviour if they wanted to.

115 -

116 -

117 -* rh/template-updates (2013-07-15) 3 commits

118 - (merged to 'next' on 2013-07-22 at 53dffdd)

119 - + templates: spell ASCII in uppercase in pre-commit hook

120 - + templates: Reformat pre-commit hook's message

121 - + templates: Use heredoc in pre-commit hook

122 -

123 - This is an earlier part of a 6 patch series, with log message

124 - corrected.

125 -

126 -

127 -* rj/sparse (2013-07-21) 1 commit

128 - (merged to 'next' on 2013-07-22 at 24efece)

129 - + Revert "compat/unsetenv.c: Fix a sparse warning"

130 -

131 -

132 -* sb/misc-fixes (2013-07-15) 3 commits

133 - (merged to 'next' on 2013-07-21 at 880b08c)

134 - + diff.c: Do not initialize a variable, which gets reassigned anyway.

135 - + commit: Fix a memory leak in determine_author_info

136 - + daemon.c:handle: Remove unneeded check for null pointer.

137 -

138 - Assorted code cleanups and a minor fix.

139 -

140 -

141 -* sb/traverse-trees-bitmask-variable-name (2013-07-19) 1 commit

142 - (merged to 'next' on 2013-07-22 at be3227c)

143 - + traverse_trees(): clarify return value of the callback

144 -

145 -

146 -* tr/line-log (2013-07-23) 1 commit

147 - (merged to 'next' on 2013-07-23 at a0a7f9b)

148 - + Merge branch 'es/line-log-further-fixes' into tr/line-log

149 - (this branch uses es/line-log-further-fixes.)

150 -

151 ---------------------------------------------------

152 -[New Topics]

153 -

154 -* ob/typofixes (2013-07-29) 1 commit

155 - - many small typofixes

156 -

157 - Will merge to 'next'.

158 -

159 -

160 -* jh/remote-hg-fetch-fix (2013-07-25) 2 commits

161 - (merged to 'next' on 2013-07-25 at 33161ad)

162 - + Revert "remotes-hg: bugfix for fetching non local remotes"

163 - (merged to 'next' on 2013-07-24 at 9c96641)

164 - + remotes-hg: bugfix for fetching non local remotes

165 -

166 - Waiting for the final patch after discussion settles.

167 -

168 -

169 -* ma/hg-to-git (2013-07-23) 1 commit

170 - - hg-to-git: --allow-empty-message in git commit

171 -

172 - Will merge to 'next'.

173 -

174 -

175 -* nd/clone-connectivity-shortcut (2013-07-23) 1 commit

176 - - smart http: use the same connectivity check on cloning

177 -

178 - Will merge to 'next'.

179 -

180 -

25 * bc/completion-for-bash-3.0 (2013-07-24) 1 commit

26 (merged to 'next' on 2013-07-24 at 913d89c)

27 + git-completion.bash: replace zsh notation that breaks bash 3.X

28

185 - Will merge to 'master'.

29 +

30 +* ds/doc-two-kinds-of-tags (2013-07-29) 1 commit

31 + (merged to 'next' on 2013-07-30 at 1201ca7)

32 + + docs/git-tag: explain lightweight versus annotated tags

33

34

35 * jk/capabilities-doc (2013-07-26) 5 commits

@@ -194,81 +41,99 @@ of the repositories listed at

41 + docs: note that receive-pack knows side-band-64k capability

42 + docs: fix 'report-status' protocol capability thinko

43

197 - Will merge to 'master'.

44

45 +* jk/commit-how-to-abort-cherry-pick (2013-07-29) 1 commit

46 + (merged to 'next' on 2013-07-30 at 7b1c49c)

47 + + commit: tweak empty cherry pick advice for sequencer

48

200 -* jx/clean-interactive (2013-07-24) 2 commits

201 - - git-clean: implement partial matching for selection

202 - (merged to 'next' on 2013-07-24 at 1e63bb9)

203 - + Documentation/git-clean: fix description for range

49

50 +* mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit

51 + (merged to 'next' on 2013-07-30 at d8cc1ee)

52 + + do_one_ref(): save and restore value of current_ref

53

206 -* sb/mailmap-updates (2013-07-24) 1 commit

207 - (merged to 'next' on 2013-07-24 at 9f8e681)

208 - + .mailmap: combine more (email, name) to individual persons

54 + Fix a NULL-pointer dereference during nested iterations over

55 + references (for example, when replace references are being used).

56

210 - Will merge to 'master'.

57

58 +* rj/commit-slab-fix (2013-07-29) 1 commit

59 + (merged to 'next' on 2013-07-30 at 1914f37)

60 + + commit-slab.h: Fix memory allocation and addressing

61

213 -* tr/log-full-diff-keep-true-parents (2013-07-29) 2 commits

214 - - SQUASH??? free saved-parents slab when done

215 - - [PERHAPS LIKE THIS] log: use true parents for diff even when rewriting

62

63 +* rr/maint-tilde-markup-in-doc (2013-07-26) 1 commit

64 + (merged to 'next' on 2013-07-30 at c8f83d5)

65 + + config doc: quote paths, fixing tilde-interpretation

66

218 -* db/http-savecookies (2013-07-24) 1 commit

219 - - http: Add http.savecookies option to write out HTTP cookies

67

68 +* rr/rebase-autostash (2013-07-29) 1 commit

69 + (merged to 'next' on 2013-07-30 at 0095e2d)

70 + + git-rebase: fix typo

71

222 -* ds/doc-two-kinds-of-tags (2013-07-29) 1 commit

223 - - docs/git-tag: explain lightweight versus annotated tags

72

225 - Will merge to 'next' and then to 'master'.

73 +* sb/mailmap-updates (2013-07-24) 1 commit

74 + (merged to 'next' on 2013-07-24 at 9f8e681)

75 + + .mailmap: combine more (email, name) to individual persons

76

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

78 +[New Topics]

79

228 -* jk/commit-how-to-abort-cherry-pick (2013-07-29) 1 commit

229 - - commit: tweak empty cherry pick advice for sequencer

80 +* bc/unuse-packfile (2013-07-30) 1 commit

81 + - sha1_file: introduce close_one_pack() to close packs on fd pressure

82

231 - Will merge to 'next' and then to 'master'.

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

84

85

234 -* lf/echo-n-is-not-portable (2013-07-29) 1 commit

235 - - Avoid using `echo -n` anywhere

86 +* da/darwin (2013-07-30) 1 commit

87 + - imap-send: use Apple's Security framework for base64 encoding

88

237 - Will merge to 'next'.

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

90

91

240 -* rj/commit-slab-fix (2013-07-29) 1 commit

241 - - commit-slab.h: Fix memory allocation and addressing

92 +* jc/rm-submodule-error-message (2013-07-25) 1 commit

93 + - builtin/rm.c: consolidate error reporting for removing submodules

94

243 - Will merge to 'next' and then to 'master'.

95 + Consolidate two messages phrased subtly differently without a good

96 + reason.

97

98 + Will merge to 'next' and then to 'master', unless there is an objection.

99

246 -* rr/maint-tilde-markup-in-doc (2013-07-26) 1 commit

247 - - config doc: quote paths, fixing tilde-interpretation

100 +

101 +* ms/subtree-install-fix (2013-07-30) 1 commit

102 + - contrib/subtree: Fix make install target

103

104 Will merge to 'next' and then to 'master'.

105

106

252 -* rr/rebase-autostash (2013-07-29) 1 commit

253 - - git-rebase: fix typo

254 -

255 - Will merge to 'next' and then to 'master'.

107 +* nd/sq-quote-buf (2013-07-30) 3 commits

108 + - quote: remove sq_quote_print()

109 + - tar-tree: remove dependency on sq_quote_print()

110 + - for-each-ref, quote: convert *_quote_print -> *_quote_buf

111

112 + Code simplification as a preparatory step to something larger.

113

258 -* sb/fsck-opt-bool (2013-07-29) 1 commit

259 - - fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

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

115

261 - Will merge to 'next'.

116

117 +* jc/url-match (2013-07-31) 6 commits

118 + - config: "git config --get-urlmatch" parses section.<url>.key

119 + - builtin/config: refactor collect_config()

120 + - config: parse http.<url>.<variable> using urlmatch

121 + - config: add generic callback wrapper to parse section.<url>.key

122 + - config: add helper to normalize and match URLs

123 + - http.c: fix parsing of http.sslCertPasswordProtected variable

124

264 -* rr/feed-real-path-to-editor (2013-07-29) 1 commit

265 - - editor: use canonicalized absolute path

125 + Reroll of km/http-curl-config-per-url topic.

126

267 - Will merge to 'next'.

127 + Will merge to and cook in 'next'

128

129 --------------------------------------------------

130 [Stalled]

131

132 +* tr/log-full-diff-keep-true-parents (2013-07-29) 2 commits

133 + - SQUASH??? free saved-parents slab when done

134 + - [PERHAPS LIKE THIS] log: use true parents for diff even when rewriting

135 +

136 +

137 * tf/gitweb-ss-tweak (2013-07-15) 4 commits

138 - gitweb: make search help link less ugly

139 - gitweb: omit the repository owner when it is unset

@@ -306,20 +171,6 @@ of the repositories listed at

171 $gmane/225137

172

173

309 -* jl/submodule-mv (2013-04-23) 5 commits

310 - . submodule.c: duplicate real_path's return value

311 - . rm: delete .gitmodules entry of submodules removed from the work tree

312 - . Teach mv to update the path entry in .gitmodules for moved submodules

313 - . Teach mv to move submodules using a gitfile

314 - . Teach mv to move submodules together with their work trees

315 -

316 - "git mv A B" when moving a submodule A does "the right thing",

317 - inclusing relocating its working tree and adjusting the paths in

318 - the .gitmodules file.

319 -

320 - Ejected from 'pu', as it conflicts with nd/magic-pathspec.

321 -

322 -

174 * jk/list-objects-sans-blobs (2013-06-06) 4 commits

175 . archive: ignore blob objects when checking reachability

176 . list-objects: optimize "revs->blob_objects = 0" case

@@ -388,6 +239,79 @@ of the repositories listed at

239 --------------------------------------------------

240 [Cooking]

241

242 +* jl/submodule-mv (2013-07-30) 5 commits

243 + - rm: delete .gitmodules entry of submodules removed from the work tree

244 + - mv: update the path entry in .gitmodules for moved submodules

245 + - submodule.c: add .gitmodules staging helper functions

246 + - mv: move submodules using a gitfile

247 + - mv: move submodules together with their work trees

248 + (this branch uses nd/magic-pathspec.)

249 +

250 + "git mv A B" when moving a submodule A does "the right thing",

251 + inclusing relocating its working tree and adjusting the paths in

252 + the .gitmodules file.

253 +

254 + Waiting for a reroll.

255 +

256 +

257 +* ob/typofixes (2013-07-29) 1 commit

258 + (merged to 'next' on 2013-07-30 at ec2c897)

259 + + many small typofixes

260 +

261 + Will merge to 'next'.

262 +

263 +

264 +* ma/hg-to-git (2013-07-23) 1 commit

265 + (merged to 'next' on 2013-07-30 at 1dddc06)

266 + + hg-to-git: --allow-empty-message in git commit

267 +

268 + Will merge to 'master'.

269 +

270 +

271 +* nd/clone-connectivity-shortcut (2013-07-23) 1 commit

272 + (merged to 'next' on 2013-07-30 at 8d16721)

273 + + smart http: use the same connectivity check on cloning

274 +

275 + Will cook in 'next'.

276 +

277 +

278 +* jx/clean-interactive (2013-07-24) 2 commits

279 + (merged to 'next' on 2013-07-30 at b7fd474)

280 + + git-clean: implement partial matching for selection

281 + (merged to 'next' on 2013-07-24 at 1e63bb9)

282 + + Documentation/git-clean: fix description for range

283 +

284 + Will merge to 'master'.

285 +

286 +

287 +* db/http-savecookies (2013-07-30) 1 commit

288 + (merged to 'next' on 2013-07-30 at d2ad6e5)

289 + + http: add http.savecookies option to write out HTTP cookies

290 +

291 + Will cook in 'next'.

292 +

293 +

294 +* lf/echo-n-is-not-portable (2013-07-29) 1 commit

295 + (merged to 'next' on 2013-07-30 at e223ceb)

296 + + Avoid using `echo -n` anywhere

297 +

298 + Will merge to 'master'.

299 +

300 +

301 +* sb/fsck-opt-bool (2013-07-29) 1 commit

302 + (merged to 'next' on 2013-07-30 at 8a9964c)

303 + + fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

304 +

305 + Will cook in 'next'.

306 +

307 +

308 +* rr/feed-real-path-to-editor (2013-07-29) 1 commit

309 + (merged to 'next' on 2013-07-30 at 72c9bcb)

310 + + editor: use canonicalized absolute path

311 +

312 + Will cook in 'next'.

313 +

314 +

315 * rj/doc-rev-parse (2013-07-22) 2 commits

316 (merged to 'next' on 2013-07-22 at 8188667)

317 + rev-parse(1): logically group options

@@ -425,15 +349,6 @@ of the repositories listed at

349 Will cook in 'next'.

350

351

428 -* mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit

429 - - do_one_ref(): save and restore value of current_ref

430 -

431 - Fix a NULL-pointer dereference during nested iterations over

432 - references (for example, when replace references are being used).

433 -

434 - Will merge to 'next' and then to 'master'.

435 -

436 -

352 * nd/magic-pathspec (2013-07-23) 48 commits

353 (merged to 'next' on 2013-07-23 at 784c3a1)

354 + rm: do not set a variable twice without intermediate reading.

@@ -485,6 +400,7 @@ of the repositories listed at

400 + pathspec: i18n-ize error strings in pathspec parsing code

401 + move struct pathspec and related functions to pathspec.[ch]

402 + clean: remove unused variable "seen"

403 + (this branch is used by jl/submodule-mv.)

404

405 Use "struct pathspec" interface in more places, instead of array of

406 characters, the latter of which cannot express magic pathspecs

@@ -527,21 +443,6 @@ of the repositories listed at

443 Will cook in 'next'.

444

445

530 -* km/http-curl-config-per-url (2013-07-25) 6 commits

531 - (merged to 'next' on 2013-07-25 at 531e8cb)

532 - + docs: update http.<url>.* options documentation

533 - (merged to 'next' on 2013-07-23 at f84689b)

534 - + config: allow http.<url>.* any user matching

535 - + tests: add new test for the url_normalize function

536 - + config: improve support for http.<url>.* settings

537 - + config: add support for http.<url>.* settings

538 - + http.c: fix parsing of http.sslCertPasswordProtected variable

539 -

540 - Allows custom curl configuration per URL when talking over http.

541 -

542 - Will cook in 'next'.

543 -

544 -

446 * km/svn-1.8-serf-only (2013-07-18) 3 commits

447 (merged to 'next' on 2013-07-19 at ab8d034)

448 + Git.pm: revert _temp_cache use of temp_is_locked

@@ -616,7 +517,7 @@ of the repositories listed at

517 time ago, and it started biting us in places. This removes it and

518 uses the standard lstat() that comes with Cygwin.

519

619 - I am personally in favor of this simpler solution. Comments?

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

521

522

523 * jc/reflog-doc (2013-06-19) 1 commit

@@ -660,3 +561,32 @@ of the repositories listed at

561 (this branch uses jc/diff-filter-negation.)

562

563 Will cook in 'next' until a distant future.

564 +

565 +--------------------------------------------------

566 +[Discarded]

567 +

568 +* jh/remote-hg-fetch-fix (2013-07-25) 2 commits

569 + (merged to 'next' on 2013-07-25 at 33161ad)

570 + + Revert "remotes-hg: bugfix for fetching non local remotes"

571 + (merged to 'next' on 2013-07-24 at 9c96641)

572 + + remotes-hg: bugfix for fetching non local remotes

573 +

574 + Reverted.

575 +

576 + Waiting for the final patch to replace, after discussion settles.

577 +

578 +

579 +* km/http-curl-config-per-url (2013-07-31) 7 commits

580 + (merged to 'next' on 2013-07-31 at e88aad5)

581 + + Revert km/http-curl-config-per-url in its entirety

582 + (merged to 'next' on 2013-07-25 at 531e8cb)

583 + + docs: update http.<url>.* options documentation

584 + (merged to 'next' on 2013-07-23 at f84689b)

585 + + config: allow http.<url>.* any user matching

586 + + tests: add new test for the url_normalize function

587 + + config: improve support for http.<url>.* settings

588 + + config: add support for http.<url>.* settings

589 + + http.c: fix parsing of http.sslCertPasswordProtected variable

590 +

591 + Reverted to be replaced with a reroll (jc/url-match topic).

592 +

What's cooking (2013/07 #10)