a0ecc542b6 · matheusbsbs/matheus-bagliano

@@ -1,17 +1,18 @@

1 To: git@vger.kernel.org

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

2 +Subject: What's cooking in git.git (Mar 2012, #05; Sun, 11)

3 X-master-at: 745950ce0e7e984158a00cd52c5811918d1f3495

4 X-next-at: d9e556f99f2727d7117df36b37a2b6c7907f9d2f

5

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

6 +What's cooking in git.git (Mar 2012, #05; Sun, 11)

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

12 +I think the tip of 'master' is more or less complete for -rc1; I'll

13 +start ignoring new feature patches out of blue and low impact fix

14 +patches that are not very well cooked, expecting for them to be

15 +rerolled after 1.7.10 final.

16

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

18 repositories listed at

@@ -21,164 +22,62 @@ repositories listed at

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

23 [New Topics]

24

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 -

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

29 - - apply: do not leak patches and fragments

25 +* ab/perl-i18n (2012-03-10) 3 commits

26 + - fixup! de1e4ae

27 + - perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER

28 + - Git::I18N: compatibility with perl <5.8.3

29

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.

30 +Attempts to help installations with ancient Perl and/or without

31 +MakeMaker. Didn't quite work for me, so I tried to queue a fix-up

32 +commit, but an independent confirmation report is needed before it

33 +is squashed into Ævar's patches.

34

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

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

35 +* jc/commit-hook-authorship (2012-03-11) 3 commits

36 + - commit: pass author/committer info to hooks

37 + - t7503: does pre-commit-hook learn authorship?

38 + - ident.c: add split_ident_line() to parse formatted ident line

39 + (this branch is tangled with jc/run-hook-env-1.)

40

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

39 -1.7.10.

41 +"git commit --author=$name" did not tell the name that was being

42 +recorded in the resulting commit to hooks, even though it does do so

43 +when the end user overrode the authorship via the "GIT_AUTHOR_NAME"

44 +environment variable. This is a simpler of the two approaches.

45

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 -

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.

46 +* jc/run-hook-env-1 (2012-03-11) 4 commits

47 + . commit: pass author/committer info to hooks

48 + - run_hook(): enhance the interface to pass arbitrary environment

49 + - t7503: does pre-commit-hook learn authorship?

50 + - ident.c: add split_ident_line() to parse formatted ident line

51 + (this branch is tangled with jc/commit-hook-authorship.)

52

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

53 +Addresses the same issue, sharing the first two changes with the

54 +previous one, but uses a more complex approach, which may not be

55 +worth the complexity. The third patch is a prerequiste for the

56 +fourth one (not used), but is independently useful.

57

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

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

58 +* jn/maint-fast-import-empty-ls (2012-03-09) 2 commits

59 + - fast-import: don't allow 'ls' of path with empty components

60 + - fast-import: leakfix for 'ls' of dirty trees

61

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.

62 +* ms/maint-config-error-at-eol-linecount (2012-03-11) 1 commit

63 + - config: report errors at the EOL with correct line number

64

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

66 - - rerere: Document 'rerere remaining'

65 +* jc/diff-algo-cleanup (2012-02-19) 2 commits

66 + - xdiff: PATIENCE/HISTOGRAM are not independent option bits

67 + - xdiff: remove XDL_PATCH_* macros

68 + (this branch is used by jc/diff-ignore-case.)

69

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

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

70 +Resurrects the preparatory clean-up patches from another topic

71 +that was discarded.

72

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

72 -on Solaris or other platforms.

73 +* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit

74 + . apply: reallocate the postimage buffer when needed

75

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

76 +Attempts to address an ancient bug that dates back to the addition

77 +of an oddball "tab-in-indent" whitespace breakage class that wants

78 +to have longer lines than the original when fixing things up.

79

181 -Rerolled again and looking good.

80 +Needs more work; results in double-frees.

81

82 --------------------------------------------------

83 [Stalled]

@@ -277,6 +176,64 @@ not working :-(.

176 --------------------------------------------------

177 [Cooking]

178

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

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

181 + + unpack-trees: plug minor memory leak

182 +

183 +Will defer til 1.7.10.

184 +

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

186 + - apply: do not leak patches and fragments

187 +

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

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

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

191 +

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

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

194 +

195 +This is a fairly low impact fix.

196 +Will merge to 'master'.

197 +

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

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

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

201 +

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

203 +Will discard.

204 +

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

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

207 +

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

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

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

211 +

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

213 +

214 +We may want merge this before 1.7.10 to help Mac OS X builders.

215 +

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

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

218 +

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

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

221 +jc/advise-push-default topic and for a good reason---they address a

222 +similar issue. The latter is a lower impact patch that uses a more

223 +focused approach to limit the scope to the target audience that

224 +actually needs help.

225 +

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

227 + - rerere: Document 'rerere remaining'

228 +

229 +Ping?

230 +

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

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

233 +

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

235 +on Solaris or other platforms.

236 +

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

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

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

@@ -288,8 +245,7 @@ not working :-(.

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

246 involved in the side topic you are merging.

247

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 ;-)

248 +Will defer til 1.7.10.

249

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

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

@@ -311,30 +267,27 @@ re-rolling has stalled since the last review?

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

268

269 Use API to read blob data in smaller chunks in more places to

314 -reduce the memory footprint.

270 +reduce the memory footprint. In general, looked fairly good.

271

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

272 +Will defer til 1.7.10.

273 +

274 +* nd/threaded-index-pack (2012-03-11) 2 commits

275 - index-pack: support multithreaded delta resolving

276 - index-pack: split second pass obj handling into own function

277

320 -Rerolled to fix a bug that was discovered with a trivial test, and

321 -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 -

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

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

278 +Another reroll after a bugreport on pthread usage discovered by

279 +Ramsey.

280

281 --------------------------------------------------

282 [Discarded]

283

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

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

285 + . diff --ignore-mode-change

286 +

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

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

289 . diff: --ignore-case

290 . xdiff: introduce XDF_IGNORE_CASE

291 . xdiff: introduce XDF_INEXACT_MATCH

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

337 - . xdiff: remove XDL_PATCH_* macros

338 -

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

340 - . diff --ignore-mode-change

292 + - xdiff: PATIENCE/HISTOGRAM are not independent option bits

293 + - xdiff: remove XDL_PATCH_* macros

What's cooking (2012/03 #05)