894e5064a5 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: 745950ce0e7e984158a00cd52c5811918d1f3495

4 -X-next-at: d9e556f99f2727d7117df36b37a2b6c7907f9d2f

2 +Subject: What's cooking in git.git (Mar 2012, #06; Wed, 14)

3 +X-master-at: 0e2d57fd50f61e668be3180bc8f25991ea88aa8c

4 +X-next-at: 38e1251a4abf75d6f2ce839f27cea2f57690fd15

5

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

6 +What's cooking in git.git (Mar 2012, #06; Wed, 14)

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

12 +As of tonight, the tip of master is 1.7.10-rc1 and I'll start ignoring new

13 +feature patches out of blue and low impact fix patches that are not very

14 +well cooked, expecting for them to be rerolled after 1.7.10 final.

15

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

17 repositories listed at

@@ -20,68 +19,121 @@ repositories listed at

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

20

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

23 -[New Topics]

22 +[Graduated to "master"]

23

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

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

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

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

27

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.

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

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

30

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

31 +This is a fairly low impact fix.

32

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.

33 +* jc/i18n-shell-script-gettext (2012-03-12) 1 commit

34 + (merged to 'next' on 2012-03-12 at 1326b5e)

35 + + i18n: fix auto detection of gettext scheme for shell scripts

36

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

37 +The auto detection was testing if a fixed string that is known to be

38 +non-empty is empty by mistake.

39

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.

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

41 + (merged to 'next' on 2012-03-12 at 42aaabe)

42 + + t0204: clarify the "observe undefined behaviour" test

43

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

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

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

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

47

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

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

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

49

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

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

51 + (merged to 'next' on 2012-03-12 at ba17441)

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

53

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

71 -that was discarded.

54 +When "git config" diagnoses an error in a configuration file and

55 +shows the line number for the offending line, it miscounted if the

56 +error was at the end of line.

57

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

74 - . apply: reallocate the postimage buffer when needed

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

59 + (merged to 'next' on 2012-03-12 at 2456f65)

60 + + rerere: Document 'rerere remaining'

61

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.

62 +--------------------------------------------------

63 +[New Topics]

64

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

65 +* jh/notes-merge-in-git-dir-worktree (2012-03-12) 2 commits

66 + - notes-merge: use opendir/readdir instead of using read_directory()

67 + - t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/

68 +

69 +Running "notes merge --commit" failed to perform correctly when run

70 +from any directory inside $GIT_DIR/. When "notes merge" stops with

71 +conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits

72 +to resolve it.

73 +

74 +Not urgent.

75 +

76 +* jn/diffstat-tests (2012-03-13) 7 commits

77 + - diffstat summary line varies by locale: miscellany

78 + - test: use numstat instead of diffstat in binary-diff test

79 + - test: use --numstat instead of --stat in "git stash show" tests

80 + - test: test cherry-pick functionality and output separately

81 + - test: modernize funny-names test style

82 + - test: use numstat instead of diffstat in funny-names test

83 + - test: use test_i18ncmp when checking --stat output

84 +

85 +Some tests checked the "diff --stat" output when they do not have to,

86 +which unnecessarily made things harder to verify under GETTEXT_POISON.

87 +Not urgent.

88 +

89 +* th/doc-diff-submodule-option (2012-03-14) 1 commit

90 + (merged to 'next' on 2012-03-14 at 0e1d755)

91 + + Documentation/diff-options: reword description of --submodule option

92 +

93 +Update "diff --submodule" documentation.

94 +May want to ship with 1.7.10.

95 +

96 +* th/git-diffall (2012-03-14) 5 commits

97 + (merged to 'next' on 2012-03-14 at 38e1251)

98 + + contrib/diffall: fix cleanup trap on Windows

99 + + contrib/diffall: eliminate duplicate while loops

100 + + contrib/diffall: eliminate use of tar

101 + + contrib/diffall: create tmp dirs without mktemp

102 + + contrib/diffall: comment actual reason for 'cdup'

103 +

104 +Update sample "diffall" script.

105 +May want to ship with 1.7.10.

106 +

107 +* tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits

108 + - diff: tweak a _copy_ of diff_options with word-diff

109 + - diff: refactor the word-diff setup from builtin_diff_cmd

110 + - t4034: diff.*.wordregex should not be "sticky" in --word-diff

111 +

112 +The regexp configured with wordregex was incorrectly reused across

113 +files.

114 +Not urgent.

115 +

116 +* zj/test-cred-helper-nicer-prove (2012-03-14) 3 commits

117 + - t0303: resurrect commit message as test documentation

118 + - fixup?

119 + - t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER

120 +

121 +Minor improvement to t0303.

122 +Not urgent.

123

124 --------------------------------------------------

125 [Stalled]

126

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

128 + - fixup! de1e4ae

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

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

131 +

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

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

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

135 +is squashed into Ævar's patches.

136 +

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

138 - Support out-of-tree Valgrind tests

139 - Allow overriding GIT_BUILD_DIR

@@ -92,26 +144,14 @@ directory other than $(pwd)/.., an out of place test script can reach

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

145 a mere short-hand for $TEST_DIRECTORY/..).

146

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

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

97 -

98 -Cheats the local connectivity check performed by "git fetch"

99 -slightly to gain some performance. This is a bit iffy.

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

148 + . apply: reallocate the postimage buffer when needed

149

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

102 - - tag: add --column

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

104 - - status: add --column

105 - - branch: add --column

106 - - help: reuse print_columns() for help -a

107 - - column: add column.ui for default column output settings

108 - - column: add dense layout support

109 - - column: add columnar layout

110 - - Stop starting pager recursively

111 - - Add git-column for columnar display

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

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

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

153

113 -Rerolled; the configuration handling looked iffy, but otherwise well

114 -explained.

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

155

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

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

@@ -125,12 +165,8 @@ The bottom one was not clearly explained and needs a reroll.

165

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

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

128 -Any takers?

168

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

131 - - Use startup_info->prefix rather than prefix.

132 -

133 -I tend to agree with the doubt of the author of this patch expressed.

169 +A rework is being attempted by Christopher Tiwald.

170

171 * ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits

172 - fixup! 15eaaf4

@@ -176,24 +212,79 @@ not working :-(.

212 --------------------------------------------------

213 [Cooking]

214

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

215 +* nd/columns (2012-03-13) 12 commits

216 + - column: support grouping entries

217 + - column: support "denser" mode

218 + - ls-files: support --column

219 + - tag: add --column

220 + - column: support piping stdout to external git-column process

221 + - status: add --column

222 + - branch: add --column

223 + - help: reuse print_columns() for help -a

224 + - column: add dense layout support

225 + - column: add columnar layout

226 + - Stop starting pager recursively

227 + - Add column layout skeleton and git-column

228 +

229 +Rerolled again. Modulo minor nits, looked nicer than the previous round.

230 +

231 +* nd/optim-connected (2012-03-14) 1 commit

232 + - {fetch,receive}-pack: skip sha-1 integrity test on objects from new pack

233 +

234 +Optimizes the local connectivity check performed by "git fetch" and "git

235 +receive-pack" that is run in response to "git push".

236 +

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

238 + (merged to 'next' on 2012-03-12 at 05ca7f8)

239 + + commit: pass author/committer info to hooks

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

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

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

243 +

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

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

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

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

248

249 Will defer til 1.7.10.

250

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

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

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

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

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

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

257 +

258 +Addresses the same issue as jc/commit-hook-authorship, sharing the first

259 +two changes with the previous one, but uses a more complex approach, which

260 +may not be worth the complexity. The third patch is a prerequiste for the

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

262 +

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

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

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

266 +

267 +fast-import did not diagnose "ls ''" that asks an empty path

268 +as an error.

269 +

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

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

272 + - xdiff: remove XDL_PATCH_* macros

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

274 +

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

276 +that was discarded.

277 +

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

279 - apply: do not leak patches and fragments

280

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.

281 +Will defer til 1.7.10.

282

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

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

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

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

285 + + unpack-trees: plug minor memory leak

286

195 -This is a fairly low impact fix.

196 -Will merge to 'master'.

287 +Will defer til 1.7.10.

288

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

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

@@ -202,17 +293,6 @@ Will merge to 'master'.

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

294 Will discard.

295

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 -

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

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

298

@@ -223,38 +303,33 @@ similar issue. The latter is a lower impact patch that uses a more

303 focused approach to limit the scope to the target audience that

304 actually needs help.

305

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

227 - - rerere: Document 'rerere remaining'

228 -

229 -Ping?

230 -

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

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

308

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

310 on Solaris or other platforms.

311

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"

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

241 - + fmt-merge-msg: finishing touches

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

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

312 +* jc/fmt-merge-msg-people (2012-03-13) 1 commit

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

314 +

315 +Rerolled.

316

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

318 involved in the side topic you are merging.

319

320 Will defer til 1.7.10.

321

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

322 +* nl/http-proxy-more (2012-03-14) 5 commits

323 + - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

324 + - http: Avoid limit of retrying request only twice

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

326 - http: handle proxy proactive authentication

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

328

329 The code to talk to http proxies learn to use the same credential

256 -API used to talk to the final http destinations. It seems the

257 -re-rolling has stalled since the last review?

330 +API used to talk to the final http destinations.

331 +

332 +Will defer til 1.7.10.

333

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

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

@@ -291,3 +366,8 @@ Ramsey.

366 . xdiff: introduce XDF_INEXACT_MATCH

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

368 - xdiff: remove XDL_PATCH_* macros

369 +

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

371 + . Use startup_info->prefix rather than prefix.

372 +

373 +I tend to agree with the doubt of the author of this patch expressed.

What's cooking (2012/03 #06)