a3ffa1e1fb · matheusbsbs/matheus-bagliano

@@ -1,19 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: 02339dd5295d7add78ab409300b985e5888af0ee

5 -X-next-at: ffa3c6506ad4ad51b33a54dee5c10a07cee019f0

3 +Subject: What's cooking in git.git (Feb 2013, #07; Sun, 17)

4 +X-master-at: 004825d314db4ba3f34ef499e3522ef72792d896

5 +X-next-at: 838f5639caf00f6b9b0bfab81f201c6402762bf9

6

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

7 +What's cooking in git.git (Feb 2013, #07; Sun, 17)

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 -A preview of the upcoming release 1.8.2-rc0 is expected to be tagged

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

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

14 +The tip of the 'master' is at 1.8.2-rc0; new topics that are not

15 +listed in this report are likely to be too late for the upcoming

16 +release.

17

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

19 repositories listed at

@@ -21,95 +21,80 @@ repositories listed at

21 http://git-blame.blogspot.com/p/git-public-repositories.html

22

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

24 -[Graduated to "master"]

25 -

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 -

31 -

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 -

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

24 +[New Topics]

25

26 +* da/difftool-fixes (2013-02-17) 5 commits

27 + - [DONTMERGE] expect reroll $gmane/216376

28 + - t7800: "defaults" is no longer a builtin tool name

29 + - t7800: modernize tests

30 + - t7800: Update copyright notice

31 + - difftool: silence uninitialized variable warning

32

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

33 + Minor maintenance updates to difftool, and updates to its tests.

34 + Expecting a reroll.

35 + $gmane/216376

36

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

51 - ready.

37

38 +* jk/smart-http-robustify (2013-02-17) 3 commits

39 + - remote-curl: sanity check ref advertisement from server

40 + - remote-curl: verify smart-http metadata lines

41 + - pkt-line: teach packet_get_line a no-op mode

42

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

43 + Parse the HTTP exchange that implements the native Git protocol as

44 + a series of stateless RPC more carefully to diagnose protocol

45 + breakage better.

46

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".

47 + Will merge to and hold in 'next'.

48

49

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

50 +* nd/read-directory-recursive-optim (2013-02-17) 1 commit

51 + - read_directory: avoid invoking exclude machinery on tracked files

52

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

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

53 + "git status" has been optimized by taking advantage of the fact

54 + that paths that are already known to the index do not have to be

55 + checked against the .gitignore mechanism under some conditions.

56

57 + Will merge to and hold in 'next'.

58

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

59 +--------------------------------------------------

60 +[Graduated to "master"]

61

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

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

64 + + p4merge: fix printf usage

65

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

66

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

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

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

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

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

70

71

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

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

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

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

75 + + upload-pack: simplify request validation

76 + + upload-pack: share more code

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

78

79 + Allow the server side to redact the refs/ namespace it shows to the

80 + client.

81

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

82

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

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

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

86

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

87 + "git log --grep=<pattern>" has been taught to honor the logoutput

88 + encoding when matching the log message against the given pattern.

89

90

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

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

107 - + Update CodingGuidelines for Perl

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

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

93 + + rebase -i: respect core.commentchar

94

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

95 + Finishing touches to core.commentchar topic to teach it to "rebase

96 + -i" as well.

97

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

112 -[New Topics]

98

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

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

@@ -119,7 +104,28 @@ repositories listed at

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

105 "rm -rf" barf on an empty argument list.

106

122 - Will merge to 'master'.

107 +

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

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

110 + + Allow building with xmlparse.h

111 +

112 + Old expat needs to include xmlparse.h instead of expat.h header

113 + file.

114 +

115 +

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

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

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

119 +

120 +

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

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

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

124 + + config: Introduce diff.algorithm variable

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

126 +

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

128 + "diff --histogram".

129

130

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

@@ -131,22 +137,10 @@ repositories listed at

137 Allows skipping the untracked check GIT_PS1_SHOWUNTRACKEDFILES

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

139

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.

140

147 -

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

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

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

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

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

144

145 --------------------------------------------------

146 [Stalled]

@@ -158,58 +152,6 @@ repositories listed at

152 $gmane/211935

153

154

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

162 - - pretty: fix up one-off format_commit_message calls

163 - - Minimum compilation fixup

164 - - Makefile: make "lua" a bit more configurable

165 - - add a "lua" pretty format

166 - - add basic lua infrastructure

167 - - pretty: make some commit-parsing helpers more public

168 -

169 - Interesting exercise. When we do this for real, we probably would want

170 - to wrap a commit to make it more like an "object" with methods like

171 - "parents", etc.

172 -

173 -

174 -* rc/maint-complete-git-p4 (2012-09-24) 1 commit

175 - - Teach git-completion about git p4

176 -

177 - Comment from Pete will need to be addressed ($gmane/206172).

178 -

179 -

180 -* jc/maint-name-rev (2012-09-17) 7 commits

181 - - describe --contains: use "name-rev --algorithm=weight"

182 - - name-rev --algorithm=weight: tests and documentation

183 - - name-rev --algorithm=weight: cache the computed weight in notes

184 - - name-rev --algorithm=weight: trivial optimization

185 - - name-rev: --algorithm option

186 - - name_rev: clarify the logic to assign a new tip-name to a commit

187 - - name-rev: lose unnecessary typedef

188 -

189 - "git name-rev" names the given revision based on a ref that can be

190 - reached in the smallest number of steps from the rev, but that is

191 - not useful when the caller wants to know which tag is the oldest one

192 - that contains the rev. This teaches a new mode to the command that

193 - uses the oldest ref among those which contain the rev.

194 -

195 - I am not sure if this is worth it; for one thing, even with the help

196 - from notes-cache, it seems to make the "describe --contains" even

197 - slower. Also the command will be unusably slow for a user who does

198 - not have a write access (hence unable to create or update the

199 - notes-cache).

200 -

201 - Stalled mostly due to lack of responses.

202 -

203 -

204 -* jc/xprm-generation (2012-09-14) 1 commit

205 - - test-generation: compute generation numbers and clock skews

206 -

207 - A toy to analyze how bad the clock skews are in histories of real

208 - world projects.

209 -

210 - Stalled mostly due to lack of responses.

211 -

212 -

155 * jc/add-delete-default (2012-08-13) 1 commit

156 - git add: notice removal of tracked paths by default

157

@@ -220,7 +162,8 @@ repositories listed at

162 Resurrected from graveyard, as I thought it was a worthwhile thing

163 to do in the longer term.

164

223 - Stalled mostly due to lack of responses.

165 + There seems to be some interest. Let's see if it results in a solid

166 + execution of a sensible transition plan towards Git 2.0.

167

168

169 * mb/remote-default-nn-origin (2012-07-11) 6 commits

@@ -244,21 +187,19 @@ repositories listed at

187 --------------------------------------------------

188 [Cooking]

189

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 -

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

254 - "diff --histogram".

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

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

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

193 + - gpg_interface: allow to request status return

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

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

196

256 - Will merge to 'master'.

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

198 + tags.

199

200

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

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

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

203

204 Will merge to 'master'.

205

@@ -271,53 +212,19 @@ repositories listed at

212 $gmane/216229

213

214

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 -

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 -

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 -

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 -

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 -

308 -

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

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

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

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

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

220 + parse_fetch_refspec(): clarify the codeflow a bit

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

221

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

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

224 Gerrit (e.g. $gmane/215701).

225

226 + Will cook in 'next'.

227 +

228

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

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

@@ -339,21 +246,13 @@ repositories listed at

246 $gmane/215771

247

248

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

249 +* nd/count-garbage (2013-02-15) 4 commits

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

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

252 - sha1_file: reorder code in prepare_packed_git_one()

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

254

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

349 - counterparts could be improved.

350 -

351 -

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'.

255 + Will merge to 'next'.

256

257

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

@@ -367,16 +266,13 @@ repositories listed at

266 $gmane/215556

267

268

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

269 +* jl/submodule-deinit (2013-02-17) 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

377 - Expecting another reroll.

378 - $gmane/216276

379 -

276

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

278 (merged to 'next' on 2013-02-12 at eb8af04)

@@ -407,20 +303,7 @@ repositories listed at

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

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

305

410 - Will merge to 'next', unless a replacement materializes soonish.

411 -

412 -

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

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 -

423 - Will merge to 'master'.

306 + Will merge to 'next'.

307

308

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

@@ -475,3 +358,57 @@ repositories listed at

358

359 Waiting for further reviews.

360 $gmane/216327 may need to be addressed.

361 +

362 +--------------------------------------------------

363 +[Discarded]

364 +

365 +* jc/maint-name-rev (2012-09-17) 7 commits

366 + - describe --contains: use "name-rev --algorithm=weight"

367 + - name-rev --algorithm=weight: tests and documentation

368 + - name-rev --algorithm=weight: cache the computed weight in notes

369 + - name-rev --algorithm=weight: trivial optimization

370 + - name-rev: --algorithm option

371 + - name_rev: clarify the logic to assign a new tip-name to a commit

372 + - name-rev: lose unnecessary typedef

373 +

374 + "git name-rev" names the given revision based on a ref that can be

375 + reached in the smallest number of steps from the rev, but that is

376 + not useful when the caller wants to know which tag is the oldest one

377 + that contains the rev. This teaches a new mode to the command that

378 + uses the oldest ref among those which contain the rev.

379 +

380 + I am not sure if this is worth it; for one thing, even with the help

381 + from notes-cache, it seems to make the "describe --contains" even

382 + slower. Also the command will be unusably slow for a user who does

383 + not have a write access (hence unable to create or update the

384 + notes-cache).

385 +

386 + Stalled mostly due to lack of responses.

387 +

388 +

389 +* jc/xprm-generation (2012-09-14) 1 commit

390 + - test-generation: compute generation numbers and clock skews

391 +

392 + A toy to analyze how bad the clock skews are in histories of real

393 + world projects.

394 +

395 + Stalled mostly due to lack of responses.

396 +

397 +

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

399 + - pretty: fix up one-off format_commit_message calls

400 + - Minimum compilation fixup

401 + - Makefile: make "lua" a bit more configurable

402 + - add a "lua" pretty format

403 + - add basic lua infrastructure

404 + - pretty: make some commit-parsing helpers more public

405 +

406 + Interesting exercise. When we do this for real, we probably would want

407 + to wrap a commit to make it more like an "object" with methods like

408 + "parents", etc.

409 +

410 +

411 +* rc/maint-complete-git-p4 (2012-09-24) 1 commit

412 + - Teach git-completion about git p4

413 +

414 + Comment from Pete will need to be addressed ($gmane/206172).

What's cooking (2013/02 #07)