2625f91f30 · matheusbsbs/matheus-bagliano

@@ -1,26 +1,27 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2011, #03; Sun, 11)

3 -X-master-at: 2f9e2e75874e0f0722382106e2e189cc3f95cc7d

4 -X-next-at: 3361ec88dee79e371d3b68c985d8dd7bdc0c4e6c

2 +Subject: What's cooking in git.git (Sep 2011, #04; Mon, 12)

3 +X-master-at: 5738c9c21e53356ab5020912116e7f82fd2d428f

4 +X-next-at: f7b2633f782e177423b9f0a0fb76c4f5ae0d8364

5

6 -What's cooking in git.git (Sep 2011, #03; Sun, 11)

6 +What's cooking in git.git (Sep 2011, #04; Mon, 12)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

10 only in 'pu' while commits prefixed with '+' are in 'next'.

11

12 -Some of the recent patches are fixes to new feature topics already merged

13 -to "master" and are being fast tracked for 1.7.7-rc1, but otherwise

14 -patches for new features and fixes to longstanding issues will stay in

15 -'pu' or 'next' until the 1.7.7 final.

12 +The tip of 'master' is tagged as 1.7.7-rc1. Unfortunately k.org seems to

13 +be still down, so there will be no pre-built rpms nor pre-formatted manual

14 +or documentation pages.

15

17 -I was hoping that k.org would be back into healthy state soonish and that

18 -is why I haven't tagged the -rc1 yet, but it has already been two weeks,

19 -so sometime in the middle of the coming week -rc1 will happen with or

20 -without k.org repository keeping in sync with us.

16 +I've tentatively uploaded a release candidate tarball at:

17

22 -In the meantime, here are the repositories that have my integration

23 -branches:

18 + http://code.google.com/p/git-core/downloads/list

19 +

20 +and its SHA-1 checksum is:

21 +

22 +80dfcce410d2f36ffed4c8b48c8c896a45159e41 git-1.7.7.rc1.tar.gz

23 +

24 +Here are the repositories that have my integration branches:

25

26 With maint, master, next, pu and todo:

27

@@ -39,10 +40,107 @@ With all the topics and integration branches:

40 --------------------------------------------------

41 [New Topics]

42

43 +* ph/format-patch-no-color (2011-09-12) 1 commit

44 + - format-patch: ignore ui.color

45 +

46 +This fix for the recent regression probably should be in 1.7.7 final.

47 +Will merge to "master" soonish.

48 +

49 +--------------------------------------------------

50 +[Graduated to "master"]

51 +

52 +* jl/maint-fetch-submodule-check-fix (2011-09-09) 1 commit

53 + + fetch: skip on-demand checking when no submodules are configured

54 +

55 +* jn/remote-helpers-doc (2011-09-01) 3 commits

56 + + (short) documentation for the testgit remote helper

57 + + Documentation/git-remote-helpers: explain how import works with multiple refs

58 + + Documentation/remote-helpers: explain capabilities first

59 +

60 +--------------------------------------------------

61 +[Stalled]

62 +

63 +* jk/default-attr (2011-08-26) 1 commit

64 + - attr: map builtin userdiff drivers to well-known extensions

65 +

66 +Not urgent; I fixed up the test breakage just for fun.

67 +

68 +* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits

69 + - Accept tags in HEAD or MERGE_HEAD

70 + - merge: remove global variable head[]

71 + - merge: keep stash[] a local variable

72 +

73 +Probably needs a re-roll to aim a bit higher.

74 +Not urgent; will not be in 1.7.7.

75 +

76 +* tr/doc-note-rewrite (2011-09-05) 1 commit

77 + - Documentation: "on for all" configuration of notes.rewriteRef

78 +

79 +It was questioned if the new text suggests a sane and safe thing to do.

80 +

81 +* jk/add-i-hunk-filter (2011-07-27) 5 commits

82 + (merged to 'next' on 2011-08-11 at 8ff9a56)

83 + + add--interactive: add option to autosplit hunks

84 + + add--interactive: allow negatation of hunk filters

85 + + add--interactive: allow hunk filtering on command line

86 + + add--interactive: factor out regex error handling

87 + + add--interactive: refactor patch mode argument processing

88 +

89 +Needs documentation updates, tests, and integration with the higher level

90 +callers, e.g. "git add -p".

91 +

92 +* jh/receive-count-limit (2011-05-23) 10 commits

93 + - receive-pack: Allow server to refuse pushes with too many objects

94 + - pack-objects: Estimate pack size; abort early if pack size limit is exceeded

95 + - send-pack/receive-pack: Allow server to refuse pushing too large packs

96 + - pack-objects: Allow --max-pack-size to be used together with --stdout

97 + - send-pack/receive-pack: Allow server to refuse pushes with too many commits

98 + - pack-objects: Teach new option --max-commit-count, limiting #commits in pack

99 + - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities

100 + - Tighten rules for matching server capabilities in server_supports()

101 + - send-pack: Attempt to retrieve remote status even if pack-objects fails

102 + - Update technical docs to reflect side-band-64k capability in receive-pack

103 +

104 +Would need another round to separate per-pack and per-session limits.

105 +

106 +* jm/mergetool-pathspec (2011-06-22) 2 commits

107 + - mergetool: Don't assume paths are unmerged

108 + - mergetool: Add tests for filename with whitespace

109 +

110 +I think this is a good idea, but it probably needs a re-roll.

111 +Cf. $gmane/176254, 176255, 166256

112 +

113 +* jk/generation-numbers (2011-09-11) 8 commits

114 + - metadata-cache.c: make two functions static

115 + - limit "contains" traversals based on commit generation

116 + - check commit generation cache validity against grafts

117 + - pretty: support %G to show the generation number of a commit

118 + - commit: add commit_generation function

119 + - add metadata-cache infrastructure

120 + - decorate: allow storing values instead of pointers

121 + - Merge branch 'jk/tag-contains-ab' (early part) into HEAD

122 +

123 +The initial "tag --contains" de-pessimization without need for generation

124 +numbers is already in; backburnered.

125 +

126 +* sr/transport-helper-fix-rfc (2011-07-19) 2 commits

127 + - t5800: point out that deleting branches does not work

128 + - t5800: document inability to push new branch with old content

129 +

130 +* po/cygwin-backslash (2011-08-05) 2 commits

131 + - On Cygwin support both UNIX and DOS style path-names

132 + - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep

133 +

134 +--------------------------------------------------

135 +[Cooking]

136 +

137 * hl/iso8601-more-zone-formats (2011-09-09) 2 commits

138 - fixup? simplification and tightening

139 - date.c: Support iso8601 timezone formats

140

141 +Not urgent.

142 +Will squash them into one and push them forward to "next", though.

143 +

144 * jc/signed-push (2011-09-09) 7 commits

145 . push -s: support pre-receive-signature hook

146 . push -s: receiving end

@@ -82,28 +180,43 @@ topic on top of this topic later.

180 - t6300: add more body-parsing tests

181 - t7004: factor out gpg setup

182

183 +Not urgent.

184 +Looked more or less reasonable, though.

185 +

186 * wh/normalize-alt-odb-path (2011-09-07) 1 commit

187 - sha1_file: normalize alt_odb path before comparing and storing

188

189 +Not urgent.

190 +Looked more or less reasonable, though.

191 +

192 * fk/use-kwset-pickaxe-grep-f (2011-09-11) 2 commits

193 - obstack.c: Fix some sparse warnings

194 - sparse: Fix an "Using plain integer as NULL pointer" warning

195

196 +In general we would prefer to see these fixed at the upstream first, but

197 +we have essentially forked from them at their last GPLv2 versions...

198 +

199 * jc/make-static (2011-09-11) 2 commits

200 (merged to 'next' on 2011-09-11 at 2acb0af)

201 + vcs-svn: remove unused functions and make some static

202 + make-static: master

203

97 -* jl/maint-fetch-submodule-check-fix (2011-09-09) 1 commit

98 - - fetch: skip on-demand checking when no submodules are configured

204 +I am not sure about the droppage of a few unused functions in the topmost

205 +patch.

206

207 * rj/quietly-create-dep-dir (2011-09-11) 1 commit

208 - Makefile: Make dependency directory creation less noisy

209

210 +Not urgent.

211 +Will merge to "next", though.

212 +

213 * js/cred-macos-x-keychain (2011-09-11) 1 commit

214 - contrib: add a credential helper for Mac OS X's keychain

215 (this branch uses jk/http-auth-keyring.)

216

217 +Welcome addition to build our confidence in the jk/http-auth-keyring topic.

218 +Will merge to "next".

219 +

220 * mh/check-ref-format (2011-09-11) 8 commits

221 - Add tools to avoid the use of unnormalized refnames.

222 - Do not allow ".lock" at the end of any refname component

@@ -114,6 +227,8 @@ topic on top of this topic later.

227 - Change bad_ref_char() to return a boolean value

228 - t1402: add some more tests

229

230 +Another reroll coming.

231 +

232 * mz/remote-rename (2011-09-11) 4 commits

233 - remote: only update remote-tracking branch if updating refspec

234 - remote rename: warn when refspec was not updated

@@ -123,66 +238,7 @@ topic on top of this topic later.

238 * rj/maint-t9159-svn-rev-notation (2011-09-11) 1 commit

239 - t9159-*.sh: Add an svn version check

240

126 ---------------------------------------------------

127 -[Stalled]

128 -

129 -* jk/add-i-hunk-filter (2011-07-27) 5 commits

130 - (merged to 'next' on 2011-08-11 at 8ff9a56)

131 - + add--interactive: add option to autosplit hunks

132 - + add--interactive: allow negatation of hunk filters

133 - + add--interactive: allow hunk filtering on command line

134 - + add--interactive: factor out regex error handling

135 - + add--interactive: refactor patch mode argument processing

136 -

137 -Needs documentation updates, tests, and integration with the higher level

138 -callers, e.g. "git add -p".

139 -

140 -* jh/receive-count-limit (2011-05-23) 10 commits

141 - - receive-pack: Allow server to refuse pushes with too many objects

142 - - pack-objects: Estimate pack size; abort early if pack size limit is exceeded

143 - - send-pack/receive-pack: Allow server to refuse pushing too large packs

144 - - pack-objects: Allow --max-pack-size to be used together with --stdout

145 - - send-pack/receive-pack: Allow server to refuse pushes with too many commits

146 - - pack-objects: Teach new option --max-commit-count, limiting #commits in pack

147 - - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities

148 - - Tighten rules for matching server capabilities in server_supports()

149 - - send-pack: Attempt to retrieve remote status even if pack-objects fails

150 - - Update technical docs to reflect side-band-64k capability in receive-pack

151 -

152 -Would need another round to separate per-pack and per-session limits.

153 -

154 -* jm/mergetool-pathspec (2011-06-22) 2 commits

155 - - mergetool: Don't assume paths are unmerged

156 - - mergetool: Add tests for filename with whitespace

157 -

158 -I think this is a good idea, but it probably needs a re-roll.

159 -Cf. $gmane/176254, 176255, 166256

160 -

161 -* jk/generation-numbers (2011-09-11) 8 commits

162 - - metadata-cache.c: make two functions static

163 - - limit "contains" traversals based on commit generation

164 - - check commit generation cache validity against grafts

165 - - pretty: support %G to show the generation number of a commit

166 - - commit: add commit_generation function

167 - - add metadata-cache infrastructure

168 - - decorate: allow storing values instead of pointers

169 - - Merge branch 'jk/tag-contains-ab' (early part) into HEAD

170 -

171 -The initial "tag --contains" de-pessimization without need for generation

172 -numbers is already in; backburnered.

173 -

174 -* sr/transport-helper-fix-rfc (2011-07-19) 2 commits

175 - - t5800: point out that deleting branches does not work

176 - - t5800: document inability to push new branch with old content

177 -

178 -* po/cygwin-backslash (2011-08-05) 2 commits

179 - - On Cygwin support both UNIX and DOS style path-names

180 - - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep

181 -

182 -I think a further refactoring (no, not my suggestion) was offered?

183 -

184 ---------------------------------------------------

185 -[Cooking]

241 +Ack/Nack from people involved in git-svn?

242

243 * cb/common-prefix-unification (2011-09-11) 4 commits

244 - dir.c: make common_prefix_len() static

@@ -190,14 +246,40 @@ I think a further refactoring (no, not my suggestion) was offered?

246 - consolidate pathspec_prefix and common_prefix

247 - remove prefix argument from pathspec_prefix

248

249 +Will merge to "next" after squashing the tip one into "consolidate" patch.

250 +

251 * cb/send-email-help (2011-09-05) 1 commit

252 - send-email: add option -h

253

254 +I think we should further amend to drop the fully-spelled "help" that will

255 +be intercepted by "git" wrapper before moving this forward.

256 +

257 +A separate set of patches to remove the hidden fully-spelled "help" from

258 +other commands would be nice to have as companion patches as well.

259 +

260 * jc/fetch-pack-fsck-objects (2011-09-04) 3 commits

261 - test: fetch/receive with fsckobjects

262 - transfer.fsckobjects: unify fetch/receive.fsckobjects

263 - fetch.fsckobjects: verify downloaded objects

264

265 +We had an option to verify the sent objects before accepting a push but

266 +lacked the corresponding option when fetching. In the light of the recent

267 +k.org incident, a change like this would be a good addition.

268 +

269 +Will merge to "next" to cook for more.

270 +

271 +* jc/fetch-verify (2011-09-01) 3 commits

272 + - fetch: verify we have everything we need before updating our ref

273 + - rev-list --verify-object

274 + - list-objects: pass callback data to show_objects()

275 + (this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify.)

276 +

277 +During a fetch, we verify that the pack stream is self consistent,

278 +but did not verify that the refs that are updated are consistent with

279 +objects contained in the packstream, and this adds such a check.

280 +

281 +Will merge to "next" to cook for more.

282 +

283 * jc/receive-verify (2011-09-09) 6 commits

284 - receive-pack: check connectivity before concluding "git push"

285 - check_everything_connected(): libify

@@ -205,20 +287,25 @@ I think a further refactoring (no, not my suggestion) was offered?

287 - fetch: verify we have everything we need before updating our ref

288 - rev-list --verify-object

289 - list-objects: pass callback data to show_objects()

208 - (this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify and jc/fetch-verify.)

290 + (this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify.)

291

210 -* tr/doc-note-rewrite (2011-09-05) 1 commit

211 - - Documentation: "on for all" configuration of notes.rewriteRef

292 +While accepting a push, we verify that the pack stream is self consistent,

293 +but did not verify that the refs the push updates are consistent with

294 +objects contained in the packstream, and this adds such a check.

295

213 -It was questioned if the new text suggests a sane and safe thing to do.

296 +Will merge to "next" to cook for more.

297

298 * jc/request-pull-show-head (2011-09-06) 1 commit

299 - State what commit to expect in request-pull

300

301 +Will merge to "next".

302 +

303 * jn/maint-http-error-message (2011-09-06) 2 commits

304 - http: avoid empty error messages for some curl errors

305 - http: remove extra newline in error message

306

307 +Will merge to "next".

308 +

309 * bk/ancestry-path (2011-08-25) 3 commits

310 (merged to 'next' on 2011-09-02 at d05ba5d)

311 + revision: do not include sibling history in --ancestry-path output

@@ -247,11 +334,6 @@ Not urgent; the topic came up a bit too late in the cycle.

334

335 Not urgent; the topic came up a bit too late in the cycle.

336

250 -* jk/default-attr (2011-08-26) 1 commit

251 - - attr: map builtin userdiff drivers to well-known extensions

252 -

253 -Not urgent; I fixed up the test breakage just for fun.

254 -

337 * hv/submodule-merge-search (2011-08-26) 5 commits

338 - submodule: Search for merges only at end of recursive merge

339 - allow multiple calls to submodule merge search for the same path

@@ -261,8 +343,9 @@ Not urgent; I fixed up the test breakage just for fun.

343 + push: teach --recurse-submodules the on-demand option

344 (this branch is tangled with fg/submodule-auto-push.)

345

264 -Not urgent; the topic came up a bit too late in the cycle.

265 -The bottom one needs to be replaced with a properly written commit log message.

346 +Not urgent; the topic came up a bit too late in the cycle. The second

347 +from the bottom one needs to be replaced with a properly written commit

348 +log message.

349

350 * mm/mediawiki-as-a-remote (2011-09-01) 2 commits

351 - git-remote-mediawiki: allow push to set MediaWiki metadata

@@ -271,14 +354,6 @@ The bottom one needs to be replaced with a properly written commit log message.

354 Fun.

355 Not urgent; the topic came up a bit too late in the cycle.

356

274 -* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits

275 - - Accept tags in HEAD or MERGE_HEAD

276 - - merge: remove global variable head[]

277 - - merge: keep stash[] a local variable

278 -

279 -Probably needs a re-roll to aim a bit higher.

280 -Not urgent; will not be in 1.7.7.

281 -

357 * bc/unstash-clean-crufts (2011-08-27) 4 commits

358 (merged to 'next' on 2011-09-02 at 7bfd66f)

359 + git-stash: remove untracked/ignored directories when stashed

@@ -309,13 +384,6 @@ Not urgent; the topic came up a bit too late in the cycle.

384

385 Will cook for a while.

386

312 -* jn/remote-helpers-doc (2011-09-01) 3 commits

313 - - (short) documentation for the testgit remote helper

314 - - Documentation/git-remote-helpers: explain how import works with multiple refs

315 - - Documentation/remote-helpers: explain capabilities first

316 -

317 -Not urgent.

318 -

387 * nm/grep-object-sha1-lock (2011-08-30) 1 commit

388 (merged to 'next' on 2011-09-02 at 336f57d)

389 + grep: Fix race condition in delta_base_cache

@@ -338,17 +406,6 @@ Not urgent; the topic came up a bit too late in the cycle.

406 What the topic aims to achieve may make sense, but the implementation

407 looked somewhat suboptimal.

408

341 -* jc/fetch-verify (2011-09-01) 3 commits

342 - - fetch: verify we have everything we need before updating our ref

343 - - rev-list --verify-object

344 - - list-objects: pass callback data to show_objects()

345 - (this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify and jc/receive-verify.)

346 -

347 -Make "git fetch" verify what it received a bit more carefully before

348 -updating the refs in the receiving end.

349 -

350 -Not urgent; the topic came up a bit too late in the cycle.

351 -

409 * jc/traverse-commit-list (2011-08-22) 3 commits

410 (merged to 'next' on 2011-08-24 at df50dd7)

411 + revision.c: update show_object_with_name() without using malloc()

What's cooking (2011/09 #04)