45b40c809a · matheusbsbs/matheus-bagliano

@@ -1,23 +1,17 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Mar 2012, #03; Mon, 5)

3 -X-master-at: 2980b0de1b387e4f9a63c50ca741271990c849d5

4 -X-next-at: 38de349d595af3563cafab5297cbad2f3e920499

2 +Subject: What's cooking in git.git (Mar 2012, #04; Fri, 9)

3 +X-master-at: 745950ce0e7e984158a00cd52c5811918d1f3495

4 +X-next-at: d9e556f99f2727d7117df36b37a2b6c7907f9d2f

5

6 -What's cooking in git.git (Mar 2012, #03; Mon, 5)

6 +What's cooking in git.git (Mar 2012, #04; Fri, 9)

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

8

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

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -The tip of 'next' as of tonight is more or less how 1.7.10-rc0 will

13 -look like in a few days. I do not have enough confidence on other

14 -large-ish topics that are not yet in 'next'.

15 -

16 -Small, trivially correct topics that have high value/damage ratio

17 -however may have enough time to go in 1.7.10 final even if they are

18 -still in 'pu', if the owners put enough effort in them. Otherwise

19 -let's throw them into Stalled category and leave them to the next

20 -cycle.

12 +Trivially correct fixes to old bugs may still graduate to 'master',

13 +but otherwise we are mostly in "regression fixes only" mode until

14 +1.7.10 final (see http://tinyurl.com/gitCal for schedule).

15

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

17 repositories listed at

@@ -27,54 +21,184 @@ repositories listed at

21 --------------------------------------------------

22 [New Topics]

23

30 -* jc/fmt-merge-msg-people (2012-03-05) 1 commit

31 - (merged to 'next' on 2012-03-05 at 38de349)

32 - + fmt-merge-msg: show those involved in a merged series

24 +* rs/unpack-trees-leakfix (2012-03-06) 1 commit

25 + (merged to 'next' on 2012-03-07 at 69a69cd)

26 + + unpack-trees: plug minor memory leak

27

34 -The "fmt-merge-msg" command learns to list the primary contributors

35 -involved in the side topic you are merging.

28 +* jh/apply-free-patch (2012-03-07) 1 commit

29 + - apply: do not leak patches and fragments

30

37 -* nl/http-proxy-more (2012-03-05) 3 commits

38 - - http: handle proxy authentication failure (error 407)

39 - - http: handle proxy proactive authentication

40 - - http: try http_proxy env var when http.proxy config option is not set

41 - (this branch uses nl/http-proxy-auth.)

31 +* az/verify-tag-use-gpg-config (2012-03-08) 1 commit

32 + (merged to 'next' on 2012-03-09 at d9e556f)

33 + + verify-tag: Parse GPG configuration options.

34

43 -The code to talk to http proxies learn to use the same credential

44 -API used to talk to the final http destinations.

35 +"git tag -s" honored "gpg.program" configuration variable since

36 +1.7.9, but "git tag -v" and "git verify-tag" didn't.

37 +

38 +This is a fairly low impact fix, and we may want to have it in

39 +1.7.10.

40 +

41 +* tb/maint-remove-irrelevant-i18n-test (2012-03-06) 1 commit

42 + (merged to 'next' on 2012-03-07 at 23f2dd1)

43 + + t0204: remove a test that checks undefined behaviour

44 +

45 +I tentatively parked this in 'next' but later reverted the merge.

46 +

47 +* jc/maint-undefined-i18n-observation-test (2012-03-09) 1 commit

48 + - t0204: clarify the "observe undefined behaviour" test

49

46 -* nd/stream-more (2012-03-05) 6 commits

47 - - fsck: use streaming API for writing lost-found blobs

48 - - show: use streaming API for showing blobs

49 - - parse_object: avoid putting whole blob in core

50 - - cat-file: use streaming API to print blobs

51 - - Add more large blob test cases

52 - - streaming: make streaming-write-entry to be more reusable

50 +It was unclear what a test in t0204 wanted to check; it turns out

51 +that it was only to observe an undefined behaviour of the system,

52 +and did not anticipate one kind of reasonable error behaviour.

53

54 -As I do not think changes in the original larger series that touch

55 -index-pack and unpack-objects will be ready for the upcoming 1.7.10,

56 -I've picked up only bits that deal with "use streaming API instead

57 -of reading things in core" and minimally fixed them up. These we

58 -should be able to polish in time.

54 +Replaces the tb/maint-remove-irrelevant-i18n-test topic.

55

60 -The "test cases" patch needs to be trimmed to cover only these, I

61 -would think.

56 +* mm/push-default-switch-warning (2012-03-09) 1 commit

57 + - push: start warning upcoming default change for push.default

58 +

59 +This resurrects an ancient patch I wrote during a discussion we had

60 +in the 1.6.3-1.6.4 era. It also conflicts with the long-stalled

61 +jc/advise-push-default topic and for a good reason. The latter is a

62 +lower impact patch that uses a more focused approach to limit the

63 +scope to the target audience that actually needs help.

64 +

65 +* ph/rerere-doc (2012-03-08) 1 commit

66 + - rerere: Document 'rerere remaining'

67 +

68 +* sl/customize-sane-tool-path (2012-03-09) 1 commit

69 + - configure: allow user to prevent $PATH "sanitization" on Solaris

70 +

71 +Would be nice to hear from people who actually use autoconf, either

72 +on Solaris or other platforms.

73 +

74 +--------------------------------------------------

75 +[Graduated to "master"]

76 +

77 +* cn/pull-rebase-message (2012-03-04) 1 commit

78 + (merged to 'next' on 2012-03-04 at 5a6cd58)

79 + + Make git-{pull,rebase} message without tracking information friendlier

80 +

81 +The advise message given when the user didn't give enough clue on what

82 +to merge was overly long.

83 +

84 +* jc/maint-diff-patch-header (2012-03-01) 3 commits

85 + (merged to 'next' on 2012-03-02 at 2cd2059)

86 + + diff -p: squelch "diff --git" header for stat-dirty paths

87 + + t4011: illustrate "diff-index -p" on stat-dirty paths

88 + + t4011: modernise style

89 + (this branch is used by jc/diff-ignore-mode.)

90 +

91 +"diff-index" and friends showed "diff --git" header and nothing else

92 +for a path that is only stat-dirty.

93 +

94 +* jc/pickaxe-ignore-case (2012-03-04) 3 commits

95 + (merged to 'next' on 2012-03-04 at 1ad3a39)

96 + + ctype.c: Fix a sparse warning

97 + (merged to 'next' on 2012-03-02 at 73a632b)

98 + + pickaxe: allow -i to search in patch case-insensitively

99 + + grep: use static trans-case table

100 +

101 +"git log -G/-S" pays attention to the "-i" option.

102 +

103 +* jh/threadable-symlink-check (2012-03-02) 1 commit

104 + (merged to 'next' on 2012-03-05 at fdd667c)

105 + + Add threaded versions of functions in symlinks.c.

106 +

107 +It probably is "threadble" not "threaded" but in any case this

108 +should not regress the current callers.

109 +

110 +* jl/maint-submodule-relative (2012-03-04) 4 commits

111 + (merged to 'next' on 2012-03-07 at e020e5c)

112 + + submodules: fix ambiguous absolute paths under Windows

113 + + submodules: refactor computation of relative gitdir path

114 + + submodules: always use a relative path from gitdir to work tree

115 + + submodules: always use a relative path to gitdir

116 +

117 +The whole directory that houses a top-level superproject managed by

118 +"git submodule" can be moved to another place.

119 +

120 +* jn/maint-do-not-match-with-unsanitized-searchtext (2012-03-06) 1 commit

121 + (merged to 'next' on 2012-03-06 at 768ce21)

122 + + gitweb: Fix fixed string (non-regexp) project search

123 +

124 +"gitweb" did use quotemeta() to prepare search string when asked to

125 +do a fixed-string project search, but did not use it by mistake and

126 +used the user-supplied string instead.

127 +

128 +* kb/maint-prune-rmdir-closedir (2012-03-07) 1 commit

129 + (merged to 'next' on 2012-03-07 at 2438c9a)

130 + + fix deletion of .git/objects sub-directories in git-prune/repack

131 +

132 +Call closedir() that iterates over a directory before rmdir() it.

133 +

134 +* nl/http-proxy-auth (2012-03-02) 1 commit

135 + (merged to 'next' on 2012-03-04 at f368669)

136 + + http: support proxies that require authentication

137 + (this branch is used by nl/http-proxy-more.)

138 +

139 +Allow curl-based transport to use proxies that require authentication.

140 +

141 +* sl/modern-t0000 (2012-03-02) 1 commit

142 + (merged to 'next' on 2012-03-04 at 2cd1508)

143 + + t0000: modernise style

144 +

145 +* th/mergetools-deltawalker (2012-03-05) 1 commit

146 + (merged to 'next' on 2012-03-05 at 167c74f)

147 + + mergetools: add a plug-in to support DeltaWalker

148 +

149 +Add plug-in to support DeltaWalker in difftool/mergetool.

150 +

151 +* tr/maint-bundle-boundary (2012-03-01) 3 commits

152 + (merged to 'next' on 2012-03-02 at c25692f)

153 + + bundle: keep around names passed to add_pending_object()

154 + + t5510: ensure we stay in the toplevel test dir

155 + + t5510: refactor bundle->pack conversion

156 +

157 +"git bundle" did not record boundary commits correctly when there

158 +are many of them.

159 +

160 +* vr/branch-doc (2012-03-06) 3 commits

161 + (merged to 'next' on 2012-03-06 at 6be3587)

162 + + Documentation/git-branch: add default for --contains

163 + + Documentation/git-branch: fix a typo

164 + + Documentation/git-branch: cleanups

165 +

166 +Documentation update.

167 +

168 +* zj/diff-stat-dyncol (2012-03-01) 10 commits

169 + (merged to 'next' on 2012-03-01 at 79b4152)

170 + + diff --stat: add config option to limit graph width

171 + + diff --stat: enable limiting of the graph part

172 + + diff --stat: add a test for output with COLUMNS=40

173 + + diff --stat: use a maximum of 5/8 for the filename part

174 + + merge --stat: use the full terminal width

175 + + log --stat: use the full terminal width

176 + + show --stat: use the full terminal width

177 + + diff --stat: use the full terminal width

178 + + diff --stat: tests for long filenames and big change counts

179 + + Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler

180 +

181 +Rerolled again and looking good.

182

183 --------------------------------------------------

184 [Stalled]

185

186 +* dg/test-from-elsewhere (2012-03-04) 2 commits

187 + - Support out-of-tree Valgrind tests

188 + - Allow overriding GIT_BUILD_DIR

189 +

190 +Better support for out-of-tree test scripts, but it appears that the

191 +approach needs to be rethought. By repointing TEST_DIRECTORY to a

192 +directory other than $(pwd)/.., an out of place test script can reach

193 +test helpers and freshly built Git relative to it (GIT_BUILD_DIR is

194 +a mere short-hand for $TEST_DIRECTORY/..).

195 +

196 * nd/optim-connected (2012-02-29) 1 commit

197 - Perform cheaper connectivity check when pack is used as medium

198

199 Cheats the local connectivity check performed by "git fetch"

200 slightly to gain some performance. This is a bit iffy.

201

72 -* jc/diff-ignore-mode (2012-03-01) 1 commit

73 - - diff --ignore-mode-change

74 - (this branch uses jc/maint-diff-patch-header.)

75 -

76 -Will discard.

77 -

202 * nd/columns (2012-02-28) 10 commits

203 - tag: add --column

204 - column: support piping stdout to external git-column process

@@ -90,17 +214,6 @@ Will discard.

214 Rerolled; the configuration handling looked iffy, but otherwise well

215 explained.

216

93 -* jc/diff-ignore-case (2012-02-28) 6 commits

94 - - diff: -i is "--ignore-case" but means a bit more in "log"

95 - - diff: --ignore-case

96 - - xdiff: introduce XDF_IGNORE_CASE

97 - - xdiff: introduce XDF_INEXACT_MATCH

98 - - xdiff: PATIENCE/HISTOGRAM are not independent option bits

99 - - xdiff: remove XDL_PATCH_* macros

100 -

101 -"git diff" learns "--ignore-case" option.

102 -Will discard, as nobody seems to need this.

103 -

217 * hv/submodule-recurse-push (2012-02-13) 3 commits

218 - push: teach --recurse-submodules the on-demand option

219 - Refactor submodule push check to use string list instead of integer

@@ -112,8 +225,8 @@ The bottom one was not clearly explained and needs a reroll.

225 - push: hint to use push.default=upstream when appropriate

226

227 Peff had a good suggestion outlining an updated code structure so

115 -that somebody new can try to dip his or her toes in the

116 -development. Any takers?

228 +that somebody new can try to dip his or her toes in the development.

229 +Any takers?

230

231 * jh/trace-use-startup-info (2012-03-02) 1 commit

232 - Use startup_info->prefix rather than prefix.

@@ -164,70 +277,41 @@ not working :-(.

277 --------------------------------------------------

278 [Cooking]

279

167 -* cn/pull-rebase-message (2012-03-04) 1 commit

168 - (merged to 'next' on 2012-03-04 at 5a6cd58)

169 - + Make git-{pull,rebase} message without tracking information friendlier

170 -

171 -The advise message given when the user didn't give enough clue on what

172 -to merge was overly long.

173 -Will merge to 'master'.

174 -

175 -* dg/test-from-elsewhere (2012-03-04) 2 commits

176 - - Support out-of-tree Valgrind tests

177 - - Allow overriding GIT_BUILD_DIR

178 -

179 -Better support for out-of-tree test scripts.

180 -

181 -* jh/threadable-symlink-check (2012-03-02) 1 commit

182 - (merged to 'next' on 2012-03-05 at fdd667c)

183 - + Add threaded versions of functions in symlinks.c.

184 -

185 -It probably is "threadble" not "threaded" but in any case this

186 -should not regress the current callers.

187 -

188 -* jn/maint-do-not-match-with-unsanitized-searchtext (2012-03-04) 1 commit

189 - - gitweb: Fix fixed string (non-regexp) project search

190 -

191 -"gitweb" did use quotemeta() to prepare search string when asked to

192 -do a fixed-string project search, but did not use it by mistake and

193 -used the user-supplied string instead.

194 -

195 -I would love to see this in 1.7.10; what I queued for 'maint' (that

196 -does not have the lazy fill-info stuff), and my conflict resolution

197 -into 'pu' to adjust for lazy fill-info, are both correct, I think,

198 -but please double check.

199 -

200 -* nl/http-proxy-auth (2012-03-02) 1 commit

201 - (merged to 'next' on 2012-03-04 at f368669)

202 - + http: support proxies that require authentication

203 - (this branch is used by nl/http-proxy-more.)

204 -

205 -Allow curl-based transport to use proxies that require authentication.

206 -Will merge to 'master'.

207 -

208 -* sl/modern-t0000 (2012-03-02) 1 commit

209 - (merged to 'next' on 2012-03-04 at 2cd1508)

210 - + t0000: modernise style

211 -

212 -Will merge to 'master'.

213 -

214 -* th/mergetools-deltawalker (2012-03-05) 1 commit

215 - (merged to 'next' on 2012-03-05 at 167c74f)

216 - + mergetools: add a plug-in to support DeltaWalker

280 +* jc/fmt-merge-msg-people (2012-03-08) 3 commits

281 + (merged to 'next' on 2012-03-08 at be31aa9)

282 + + fmt-merge-msg.c: make util_as_int() return "int"

283 + (merged to 'next' on 2012-03-07 at 76fbac3)

284 + + fmt-merge-msg: finishing touches

285 + (merged to 'next' on 2012-03-05 at 38de349)

286 + + fmt-merge-msg: show those involved in a merged series

287

218 -Add plug-in to support DeltaWalker in difftool/mergetool.

219 -Will merge to 'master'.

288 +The "fmt-merge-msg" command learns to list the primary contributors

289 +involved in the side topic you are merging.

290

221 -* jl/maint-submodule-relative (2012-03-04) 4 commits

222 - - submodules: fix ambiguous absolute paths under Windows

223 - - submodules: refactor computation of relative gitdir path

224 - - submodules: always use a relative path from gitdir to work tree

225 - - submodules: always use a relative path to gitdir

291 +Judging by the rate of "oops, this is better" fix-ups, it was good

292 +that I decided to postpone this topic til the next cycle ;-)

293

227 -Rerolled and resurrected from Stalled category.

294 +* nl/http-proxy-more (2012-03-05) 3 commits

295 + - http: handle proxy authentication failure (error 407)

296 + - http: handle proxy proactive authentication

297 + - http: try http_proxy env var when http.proxy config option is not set

298

229 -I would love to have this in 1.7.10; a couple of Acks from different

230 -platforms and success reports would be very helpful.

299 +The code to talk to http proxies learn to use the same credential

300 +API used to talk to the final http destinations. It seems the

301 +re-rolling has stalled since the last review?

302 +

303 +* nd/stream-more (2012-03-07) 7 commits

304 + (merged to 'next' on 2012-03-07 at 7325922)

305 + + update-server-info: respect core.bigfilethreshold

306 + + fsck: use streaming API for writing lost-found blobs

307 + + show: use streaming API for showing blobs

308 + + parse_object: avoid putting whole blob in core

309 + + cat-file: use streaming API to print blobs

310 + + Add more large blob test cases

311 + + streaming: make streaming-write-entry to be more reusable

312 +

313 +Use API to read blob data in smaller chunks in more places to

314 +reduce the memory footprint.

315

316 * nd/threaded-index-pack (2012-03-02) 2 commits

317 - index-pack: support multithreaded delta resolving

@@ -238,52 +322,19 @@ resurrected from Stalled category, but I am reluctant to advance a

322 topic that can easily break many people's repositories at this late

323 in the cycle.

324

241 -* jc/maint-diff-patch-header (2012-03-01) 3 commits

242 - (merged to 'next' on 2012-03-02 at 2cd2059)

243 - + diff -p: squelch "diff --git" header for stat-dirty paths

244 - + t4011: illustrate "diff-index -p" on stat-dirty paths

245 - + t4011: modernise style

246 - (this branch is used by jc/diff-ignore-mode.)

247 -

248 -"diff-index" and friends showed "diff --git" header and nothing else

249 -for a path that is only stat-dirty.

250 -

251 -Should be safe, but is not urgent.

252 -

253 -* tr/maint-bundle-boundary (2012-03-01) 3 commits

254 - (merged to 'next' on 2012-03-02 at c25692f)

255 - + bundle: keep around names passed to add_pending_object()

256 - + t5510: ensure we stay in the toplevel test dir

257 - + t5510: refactor bundle->pack conversion

258 -

259 -"git bundle" did not record boundary commits correctly when there

260 -are many of them.

325 +What is queued here is a couple of review cycles old; will discard

326 +and replace with a re-roll when it comes.

327

262 -Will merge to 'master'.

263 -

264 -* jc/pickaxe-ignore-case (2012-03-04) 3 commits

265 - (merged to 'next' on 2012-03-04 at 1ad3a39)

266 - + ctype.c: Fix a sparse warning

267 - (merged to 'next' on 2012-03-02 at 73a632b)

268 - + pickaxe: allow -i to search in patch case-insensitively

269 - + grep: use static trans-case table

270 -

271 -"git log -G/-S" pays attention to the "-i" option.

272 -

273 -Will merge to 'master'.

328 +--------------------------------------------------

329 +[Discarded]

330

275 -* zj/diff-stat-dyncol (2012-03-01) 10 commits

276 - (merged to 'next' on 2012-03-01 at 79b4152)

277 - + diff --stat: add config option to limit graph width

278 - + diff --stat: enable limiting of the graph part

279 - + diff --stat: add a test for output with COLUMNS=40

280 - + diff --stat: use a maximum of 5/8 for the filename part

281 - + merge --stat: use the full terminal width

282 - + log --stat: use the full terminal width

283 - + show --stat: use the full terminal width

284 - + diff --stat: use the full terminal width

285 - + diff --stat: tests for long filenames and big change counts

286 - + Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler

331 +* jc/diff-ignore-case (2012-02-28) 6 commits

332 + . diff: -i is "--ignore-case" but means a bit more in "log"

333 + . diff: --ignore-case

334 + . xdiff: introduce XDF_IGNORE_CASE

335 + . xdiff: introduce XDF_INEXACT_MATCH

336 + . xdiff: PATIENCE/HISTOGRAM are not independent option bits

337 + . xdiff: remove XDL_PATCH_* macros

338

288 -Rerolled again and looking good.

289 -Will merge to 'master'.

339 +* jc/diff-ignore-mode (2012-03-01) 1 commit

340 + . diff --ignore-mode-change

What's cooking (2012/03 #04)