5b1049de59 · matheusbsbs/matheus-bagliano

@@ -1,17 +1,15 @@

1 To: git@vger.kernel.org

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

3 -X-master-at: f524129737d9ba3e685c31bacde844ec1db1fea9

4 -X-next-at: 898d27118349f1a83f6d93545cb67dbcb0b8c288

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

3 +X-master-at: c16df57c5a778ef14ede7ad202c74146269d61ac

4 +X-next-at: 1bdf608349ec8c63dd8b91991095c3368a1e8a87

5

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

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

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

12 +The tip of 'master' was tagged as 1.7.10-rc2 today.

13

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

15 repositories listed at

@@ -21,109 +19,69 @@ repositories listed at

19 --------------------------------------------------

20 [Graduated to "master"]

21

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

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

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

22 +* am/completion-zsh-fix (2012-03-21) 1 commit

23 + + contrib/completion: "local var=()" is misinterpreted as func-decl by zsh

24

28 -Attempts to help installations with ancient Perl and/or without

29 -MakeMaker.

25 +* dw/gitweb-doc-grammo (2012-03-23) 1 commit

26 + + Documentation/gitweb: trivial English fixes

27

31 -* jc/maint-verify-objects-remove-pessimism (2012-03-15) 1 commit

32 - (merged to 'next' on 2012-03-15 at f824530)

33 - + fetch/receive: remove over-pessimistic connectivity check

34 -

35 -The code to validate the history connectivity between old refs and new

36 -refs used by fetch and receive-pack, introduced in 1.7.8, was grossly

37 -inefficient and unnecessarily tried to re-validate integrity of individual

38 -objects. This essentially reverts the patch that introduced the

39 -performance regression.

40 -

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

42 - (merged to 'next' on 2012-03-15 at d531079)

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

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

45 -

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

47 -as an error.

48 -

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

50 - (merged to 'next' on 2012-03-15 at a838844)

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

52 -

53 -"configure" script learned to take "--sane-tool-path" from the command

54 -line to record SANE_TOOL_PATH (used to avoid broken platform tools in

55 -/usr/bin) in config.mak-autogen. This may be useful for people on Solaris

56 -who have saner tools outside /usr/xpg[46]/bin.

57 -

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

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

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

61 -

62 -Update "diff --submodule" documentation.

63 -

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

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

66 - + contrib/diffall: fix cleanup trap on Windows

67 - + contrib/diffall: eliminate duplicate while loops

68 - + contrib/diffall: eliminate use of tar

69 - + contrib/diffall: create tmp dirs without mktemp

70 - + contrib/diffall: comment actual reason for 'cdup'

71 -

72 -Update sample "diffall" script.

73 -

74 -* th/mergetools-deltawalker (2012-03-15) 1 commit

75 - (merged to 'next' on 2012-03-15 at 1a62faf)

76 - + Documentation/difftool: add deltawalker to list of valid diff tools

28 +Typofix.

29

30 --------------------------------------------------

31 [New Topics]

32

81 -* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 2 commits

82 - - clean: preserve nested git worktree in subdirectories

83 - - remove_dir_recursively(): Add flag for skipping removal of toplevel dir

84 - (this branch is tangled with jh/notes-merge-in-git-dir-worktree.)

33 +* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits

34 + - t4202: add test for "log --graph --stat -p" separator lines

35 + - log --graph: fix break in graph lines

36 + - log --graph --stat: three-dash separator should come after graph lines

37

86 -"git clean -d -f" (not "-d -f -f") is supposed to protect nested working

87 -trees of independent git repositories that exist in the current project

88 -working tree from getting removed, but the protection applied only to such

89 -working trees that are at the top-level of the current project by mistake.

38 +The combination of two options "log --graph --stat" was an obscure corner

39 +case nobody cared about, and did not correctly show the ancestry graph

40 +lines.

41

91 -Not urgent.

42 +I've split the original patch into three pieces, one for fixes to two

43 +different issues and a test. Also the test is adjusted so that the series

44 +can be back-merged to older codebase that did not have 7f81463 (Use

45 +correct grammar in diffstat summary line, 2012-02-01) that first appeared

46 +in v1.7.9.2

47

93 -* ct/advise-push-default (2012-03-19) 1 commit

94 - - push: Provide situational hints for non-fast-forward errors

48 +* wk/gitweb-snapshot-use-if-modified-since (2012-03-20) 1 commit

49 + - Pull gitweb If-Modified-Since handling out into its own function and use for snapshots.

50

96 -Breaks down the cases in which "git push" fails due to non-ff into three

97 -categories, and gives separate advise messages. I think there should be

98 -three advise confvars, not just two.

51 +Unreviewed; the title looks way too long and does not sit well in the

52 +shortlog output.

53

100 -* nl/rebase-i-cheat-sheet (2012-03-16) 1 commit

101 - - [Do not merge] rebase -i: remind that the lines are top-to-bottom

54 +* jc/maint-merge-autoedit (2012-03-20) 1 commit

55 + - merge: backport GIT_MERGE_AUTOEDIT support

56

103 -Not urgent.

57 +In 1.7.10, we added GIT_MERGE_AUTOEDIT=no environment variable to help

58 +older scripts to let them refuse giving users a chance to explain the

59 +merge, but forgot that 1.7.9 automatically opens an editor when merging an

60 +annotated tag, and there is no equivalent escape hatch. A merge of this

61 +topic to 1.7.10 track becomes a no-op, but we may want to apply this to

62 +the 1.7.9.x series.

63

105 -* da/difftool-test (2012-03-19) 1 commit

106 - - t7800: Test difftool passing arguments to diff

64 +* jk/diff-no-rename-empty (2012-03-23) 4 commits

65 + - merge-recursive: don't detect renames of empty files

66 + - teach diffcore-rename to optionally ignore empty content

67 + - make is_empty_blob_sha1 available everywhere

68 + - drop casts from users EMPTY_TREE_SHA1_BIN

69

108 -Makes sure "difftool" options can be given in any order.

109 -

110 -* th/difftool-diffall (2012-03-19) 9 commits

111 - - difftool: print list of valid tools with '--tool-help'

112 - - difftool: teach dir-diff to copy modified files back to working tree

113 - - difftool: teach difftool to handle directory diffs

114 - - difftool: replace system call with Git::command_noisy

115 - - difftool: eliminate setup_environment function

116 - - difftool: stop appending '.exe' to git

117 - - difftool: remove explicit change of PATH

118 - - difftool: exit(0) when usage is printed

119 - - difftool: parse options using Getopt::Long

120 -

121 -Reworks the "diffall" contrib script into "difftool" framework. Use of

122 -Getopt::Long obviously contradicts with da/difftool-test and breaks 'pu'.

70 +Forbids rename detection logic from matching two empty files as renames

71 +during merge-recursive to prevent mismerges.

72

73 --------------------------------------------------

74 [Stalled]

75

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

77 + . apply: reallocate the postimage buffer when needed

78 +

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

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

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

82 +

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

84 +

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

86 - column: support grouping entries

87 - column: support "denser" mode

@@ -148,6 +106,19 @@ Another reroll after a bugreport on pthread usage discovered by Ramsey,

106 but it seems the topic is cooking between Ramsay and Duy out of tree.

107 Waiting for resolution.

108

109 +* jh/apply-free-patch (2012-03-21) 4 commits

110 + - apply.c: WIP ownership audit

111 + - apply: free patch->result

112 + - apply: free patch->{def,old,new}_name fields

113 + - apply: do not leak patches and fragments

114 +

115 +Valgrind reports quite a lot of discarded memory inside apply. I have a

116 +slight suspicion that we should first clarify the ownership rules of

117 +pieces of memory in this standalone program that was designed to be "run

118 +once and let exit take care of the memory" before proceeding further.

119 +

120 +Will defer til 1.7.10.

121 +

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

123 - Support out-of-tree Valgrind tests

124 - Allow overriding GIT_BUILD_DIR

@@ -158,14 +129,7 @@ directory other than $(pwd)/.., an out of place test script can reach

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

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

131

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

162 - . apply: reallocate the postimage buffer when needed

163 -

164 -Attempts to address an ancient bug that dates back to the addition

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

166 -to have longer lines than the original when fixing things up.

167 -

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

132 +Discussion stalled.

133

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

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

@@ -217,11 +181,58 @@ not working :-(.

181 --------------------------------------------------

182 [Cooking]

183

184 +* th/difftool-diffall (2012-03-23) 9 commits

185 + - difftool: print list of valid tools with '--tool-help'

186 + - difftool: teach difftool to handle directory diffs

187 + - difftool: replace system call with Git::command_noisy

188 + - difftool: eliminate setup_environment function

189 + - difftool: stop appending '.exe' to git

190 + - difftool: remove explicit change of PATH

191 + - difftool: exit(0) when usage is printed

192 + - difftool: add '--no-gui' option

193 + - difftool: parse options using Getopt::Long

194 +

195 +Rolls the two-directory-diff logic from diffall script (in contrib/) into

196 +"git difftool" framework.

197 +

198 +* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 2 commits

199 + (merged to 'next' on 2012-03-20 at fb5485e)

200 + + clean: preserve nested git worktree in subdirectories

201 + + remove_dir_recursively(): Add flag for skipping removal of toplevel dir

202 + (this branch is tangled with jh/notes-merge-in-git-dir-worktree.)

203 +

204 +"git clean -d -f" (not "-d -f -f") is supposed to protect nested working

205 +trees of independent git repositories that exist in the current project

206 +working tree from getting removed, but the protection applied only to such

207 +working trees that are at the top-level of the current project by mistake.

208 +

209 +Not urgent.

210 +

211 +* ct/advise-push-default (2012-03-19) 1 commit

212 + - push: Provide situational hints for non-fast-forward errors

213 +

214 +Breaks down the cases in which "git push" fails due to non-ff into three

215 +categories, and gives separate advise messages. This should be a good

216 +change regardless of mm/push-default-switch-warning topic.

217 +

218 +* nl/rebase-i-cheat-sheet (2012-03-20) 1 commit

219 + (merged to 'next' on 2012-03-20 at 3092a2b)

220 + + rebase -i: remind that the lines are top-to-bottom

221 +

222 +Not urgent.

223 +

224 +* da/difftool-test (2012-03-19) 1 commit

225 + (merged to 'next' on 2012-03-20 at 0ada7d4)

226 + + t7800: Test difftool passing arguments to diff

227 +

228 +Makes sure "difftool" options can be given in any order.

229 +

230 * jh/notes-merge-in-git-dir-worktree (2012-03-15) 4 commits

221 - - notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd

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

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

224 - - remove_dir_recursively(): Add flag for skipping removal of toplevel dir

231 + (merged to 'next' on 2012-03-20 at 0c1b1de)

232 + + notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd

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

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

235 + + remove_dir_recursively(): Add flag for skipping removal of toplevel dir

236 (this branch is tangled with jc/maint-clean-nested-worktree-in-subdir.)

237

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

@@ -232,13 +243,14 @@ to resolve it.

243 Not urgent.

244

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

235 - - diffstat summary line varies by locale: miscellany

236 - - test: use numstat instead of diffstat in binary-diff test

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

238 - - test: test cherry-pick functionality and output separately

239 - - test: modernize funny-names test style

240 - - test: use numstat instead of diffstat in funny-names test

241 - - test: use test_i18ncmp when checking --stat output

246 + (merged to 'next' on 2012-03-20 at 8791b2f)

247 + + diffstat summary line varies by locale: miscellany

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

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

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

251 + + test: modernize funny-names test style

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

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

254

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

256 which unnecessarily made things harder to verify under GETTEXT_POISON.

@@ -246,17 +258,19 @@ which unnecessarily made things harder to verify under GETTEXT_POISON.

258 Not urgent.

259

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

249 - - diff: tweak a _copy_ of diff_options with word-diff

250 - - diff: refactor the word-diff setup from builtin_diff_cmd

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

261 + (merged to 'next' on 2012-03-20 at b3f67cd)

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

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

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

265

266 The regexp configured with wordregex was incorrectly reused across

267 files.

268 Not urgent.

269

270 * zj/test-cred-helper-nicer-prove (2012-03-15) 2 commits

258 - - t0303: resurrect commit message as test documentation

259 - - t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER

271 + (merged to 'next' on 2012-03-20 at b675ec1)

272 + + t0303: resurrect commit message as test documentation

273 + + t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER

274

275 Minor improvement to t0303.

276 Not urgent.

@@ -290,7 +304,6 @@ only be useful if people start doing more interesting things with hooks.

304 (merged to 'next' on 2012-03-15 at cca0032)

305 + xdiff: PATIENCE/HISTOGRAM are not independent option bits

306 + xdiff: remove XDL_PATCH_* macros

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

307

308 Resurrects the preparatory clean-up patches from another topic that was

309 discarded, as this would give a saner foundation to build on diff.algo

@@ -298,24 +311,12 @@ configuration option series.

311

312 Not urgent.

313

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

302 - - apply: do not leak patches and fragments

303 -

304 -Will defer til 1.7.10.

305 -

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

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

316 + unpack-trees: plug minor memory leak

317

318 Will defer til 1.7.10.

319

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

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

314 - + t0204: remove a test that checks undefined behaviour

315 -

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

317 -Will discard.

318 -

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

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

322

@@ -335,11 +336,12 @@ involved in the side topic you are merging.

336 Will defer til 1.7.10.

337

338 * nl/http-proxy-more (2012-03-15) 5 commits

338 - - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

339 - - http: Avoid limit of retrying request only twice

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

341 - - http: handle proxy proactive authentication

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

339 + (merged to 'next' on 2012-03-20 at c004001)

340 + + http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

341 + + http: Avoid limit of retrying request only twice

342 + + http: handle proxy authentication failure (error 407)

343 + + http: handle proxy proactive authentication

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

345

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

347 API used to talk to the final http destinations.

@@ -364,33 +366,8 @@ Will defer til 1.7.10.

366 --------------------------------------------------

367 [Discarded]

368

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

368 - . diff --ignore-mode-change

369 -

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

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

372 - . diff: --ignore-case

373 - . xdiff: introduce XDF_IGNORE_CASE

374 - . xdiff: introduce XDF_INEXACT_MATCH

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

376 - - xdiff: remove XDL_PATCH_* macros

377 -

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

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

380 -

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

382 -

383 -* nd/optim-connected (2012-03-15) 1 commit

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

385 -

386 -jc/maint-verify-objects-remove-pessimism replaces this.

387 -

388 -* jc/advise-push-default (2011-12-18) 1 commit

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

390 -

391 -A rework by Christopher Tiwald replaces this.

392 -

393 -* th/mergetools-tool-help (2012-03-15) 1 commit

394 - . difftool: print list of valid tools with '--tool-help'

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

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

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

372

396 -Reworked as part of th/difftool-diffall topic.

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

What's cooking (2012/03 #08)