740806ded2 · matheusbsbs/matheus-bagliano

@@ -1,23 +1,78 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Apr 2012, #03; Fri, 6)

3 -X-master-at: e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d

4 -X-next-at: 554fe20f43cb5d69d3fd745ccacd93776a4c101d

2 +Subject: What's cooking in git.git (Apr 2012, #04; Tue, 10)

3 +X-master-at: 7945c7fad05da2ac7f6f1f89202799993a591eac

4 +X-next-at: ed64435ffdef61ad35e045a9d6fc46a098169618

5

6 -What's cooking in git.git (Apr 2012, #03; Fri, 6)

6 +What's cooking in git.git (Apr 2012, #04; Tue, 10)

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 -After slipping for about a week, 1.7.10 final has been tagged. Let's wait

13 -for a few days to give time for the dust to settle and then open the new

14 -development cycle sometime next week.

12 +This issue describes the state of my tree in preparation for opening the

13 +post 1.7.10 cycle. The 'next' branch has not been rewound yet, but it

14 +soon will be. The Stalled topics will be discarded by default.

15 +

16 +"git subtree" is in contrib/ now.

17

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

19 repositories listed at

20

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

22

23 +--------------------------------------------------

24 +[New Topics]

25 +

26 +* bw/submodule-sed-solaris (2012-04-09) 1 commit

27 + - Avoid bug in Solaris xpg4/sed as used in submodule

28 +

29 +Sensible.

30 +Will merge to 'next'.

31 +

32 +* cb/http-multi-curl-auth (2012-04-10) 2 commits

33 + - fix http auth with multiple curl handles

34 + - http auth fails with multiple curl handles

35 +

36 +Fixes http authentication breakage when we keep multiple HTTP requests in

37 +flight using curl-multi.

38 +

39 +Peff may want to sign this off, but otherwise looked sensible.

40 +

41 +* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit

42 + - rebase -i continue: don't skip commits that only change submodules

43 +

44 +Giving "--continue" to a conflicted "rebase -i" session skipped a commit

45 +that only results in changes to submodules.

46 +

47 +Sensible.

48 +Will merge to 'next'.

49 +

50 +* ms/remote-usage-string (2012-04-09) 1 commit

51 + - remote: update builtin usage

52 +

53 +As an independent follow-up, we may want to rethink how the overall usage

54 +string and subcommand usage strings are maintained.

55 +

56 +Will merge to 'next'.

57 +

58 +* pw/fast-import-dataref-parsing (2012-04-10) 1 commit

59 + - fast-import: tighten parsing of datarefs

60 +

61 +* pw/git-p4 (2012-04-09) 3 commits

62 + - git p4: use "git p4" directly in tests

63 + - git p4: update name in script

64 + - git-p4: move to toplevel

65 +

66 +Will merge to 'next'.

67 +

68 +* rl/show-empty-prefix (2012-04-10) 1 commit

69 + - rev-parse --show-prefix: add in trailing newline

70 +

71 +Will merge to 'next'.

72 +

73 +* tr/xdiff-fast-hash (2012-04-09) 1 commit

74 + - xdiff: load full words in the inner loop of xdl_hash_record

75 +

76 --------------------------------------------------

77 [Stalled]

78

@@ -26,27 +81,20 @@ repositories listed at

81 - log --graph: fix break in graph lines

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

83

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

30 -case nobody cared about, and did not correctly show the ancestry graph

31 -lines.

32 -

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

34 -different issues and a test. Also the test is adjusted so that the series

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

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

37 -in v1.7.9.2

84 +With a review from Zbigniew, I have been expecting that this would be

85 +rerolled, but that didn't happen.

86

39 -With a review from Zbigniew, I would expect that this would be rerolled

40 -again.

87 +Will discard shortly unless nothing happens.

88

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

90 . apply: reallocate the postimage buffer when needed

91

92 Attempts to address an ancient bug that dates back to the addition

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

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

94 +to have longer lines than the original when fixing things up; broken

95 +and results in double-frees.

96

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

97 +Will discard shortly unless nothing happens.

98

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

100 - column: support grouping entries

@@ -62,7 +110,10 @@ Needs more work; results in double-frees.

110 - Stop starting pager recursively

111 - Add column layout skeleton and git-column

112

65 -Rerolled again. Modulo minor nits, looked nicer than the previous round.

113 +Modulo minor nits, looked nicer than the previous round and getting closer

114 +to completion but nothing has happened recently.

115 +

116 +Will discard shortly unless nothing happens.

117

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

119 - index-pack: support multithreaded delta resolving

@@ -70,7 +121,8 @@ Rerolled again. Modulo minor nits, looked nicer than the previous round.

121

122 Another reroll after a bugreport on pthread usage discovered by Ramsey,

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

73 -Waiting for resolution.

124 +

125 +Will discard shortly unless nothing happens.

126

127 * jh/apply-free-patch (2012-03-28) 7 commits

128 - apply.c: WIP ownership audit

@@ -84,8 +136,6 @@ Waiting for resolution.

136 Valgrind reports quite a lot of discarded memory inside apply. I started

137 auditing the memory ownership rules in the command, and am almost done.

138

87 -Will defer til 1.7.10.

88 -

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

140 - fixup! 15eaaf4

141 - git-svn, perl/Git.pm: extend Git::prompt helper for querying users

@@ -96,6 +146,8 @@ from Ævar. The second one needs more work, both in perl/Git.pm and

146 prompt.c, to give precedence to tty over SSH_ASKPASS when terminal

147 is available.

148

149 +Will discard shortly unless nothing happens.

150 +

151 * jc/split-blob (2012-04-03) 7 commits

152 - chunked-object: streaming checkout

153 - chunked-object: fallback checkout codepaths

@@ -156,12 +208,16 @@ student-hopefuls.

208 Excludes conflicted paths from "add -p" processing, as it is not prepared

209 to handle them.

210

211 +Will merge to 'next'.

212 +

213 * bw/spawn-via-shell-path (2012-04-03) 1 commit

214 - Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd

215

216 "sh" on the user's PATH may be utterly broken on some systems;

217 consistently use SHELL_PATH even from inside run-command API.

218

219 +Will merge to 'next'.

220 +

221 * jc/commit-unedited-template (2012-04-03) 5 commits

222 - Documentation/git-commit: rephrase the "initial-ness" of templates

223 - git-commit.txt: clarify -t requires editing message

@@ -173,6 +229,8 @@ When "git commit --template F" errors out because the user did not touch

229 the message, it claimed that it aborts due to "empty message", which was

230 utterly wrong.

231

232 +Will merge to 'next'.

233 +

234 * jc/push-upstream-sanity (2012-04-05) 1 commit

235 - push: error out when the "upstream" semantics does not make sense

236

@@ -181,12 +239,16 @@ refspec, when the current branch is set to push to a remote different from

239 $there, used to push to $there using the upstream information to a remote

240 unreleated to $there.

241

242 +Will merge to 'next'.

243 +

244 * jk/http-backend-keep-committer-ident-env (2012-03-30) 1 commit

245 - http-backend: respect existing GIT_COMMITTER_* variables

246

247 The smart-http backend used to always override GIT_COMMITTER_* variables

248 with REMOTE_USER and REMOTE_ADDR.

249

250 +Will merge to 'next'.

251 +

252 * mk/gitweb-diff-hl (2012-04-05) 8 commits

253 - gitweb: Refinement highlightning in combined diffs

254 - gitweb: Highlight interesting parts of diff

@@ -199,24 +261,21 @@ with REMOTE_USER and REMOTE_ADDR.

261

262 Rerolled.

263

202 -* it/fetch-pack-many-refs (2012-04-02) 5 commits

264 +* it/fetch-pack-many-refs (2012-04-10) 4 commits

265 - remote-curl: main test case for the OS command line overflow

266 - fetch-pack: test cases for the new --stdin option

205 - - fixup? no longer need flex argv[]

267 - remote-curl: send the refs to fetch-pack on stdin

268 - fetch-pack: new --stdin option to read refs from stdin

269

209 -Will squash the fix-up one and then requeue.

270 +Will merge to 'next'.

271

211 -* jn/debian-customizes-default-editor (2012-03-31) 3 commits

212 - - fixup? do not hide the "usual" default from readers

272 +* jn/debian-customizes-default-editor (2012-04-10) 2 commits

273 - var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings

274 - var doc: default editor and pager are configurable at build time

275

216 -Haven't heard anything back for the fix-up suggestion, but otherwise

217 -looked sane.

276 +Will merge to 'next'.

277

219 -* rs/commit-list-sort-in-batch (2012-04-02) 3 commits

278 +* rs/commit-list-sort-in-batch (2012-04-09) 3 commits

279 - revision: insert unsorted, then sort in prepare_revision_walk()

280 - commit: use mergesort() in commit_list_sort_by_date()

281 - add mergesort() for linked lists

@@ -226,17 +285,6 @@ looked sane.

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

286 - Teach revision walking machinery to walk multiple times sequencially

287

229 -* dg/subtree (2012-03-25) 112 commits

230 - - Add 'contrib/subtree/' from commit '2e63f75b8f49abe220ef55ec4e978e7a3b8dc351'

231 - - Add Subtree Test Makefile

232 - - Build Subtree

233 - - Use Project Config Files

234 - - Remove Unneeded Files

235 - - ...

236 -

237 -A test merge of the 'subtree'.

238 -Waiting for an updated pull request.

239 -

288 * jk/branch-quiet (2012-03-26) 2 commits

289 - teach "git branch" a --quiet option

290 - checkout: suppress tracking message with "-q"

@@ -244,6 +292,8 @@ Waiting for an updated pull request.

292 Even with "-q"uiet option, "checkout" used to report setting up tracking.

293 Also "branch" learns "-q"uiet option to squelch informational message.

294

295 +Will merge to 'next'.

296 +

297 * jk/run-command-eacces (2012-04-05) 2 commits

298 - run-command: treat inaccessible directories as ENOENT

299 - compat/mingw.[ch]: Change return type of exec functions to int

@@ -251,18 +301,26 @@ Also "branch" learns "-q"uiet option to squelch informational message.

301 When PATH contains an unreadable directory, alias expansion code did not

302 kick in, and failed with an error that said "git-subcmd" was not found.

303

304 +Will merge to 'next'.

305 +

306 * jb/am-include (2012-03-28) 1 commit

307 - am: support --include option

308

309 +Will merge to 'next'.

310 +

311 * jc/am-report-3way (2012-03-28) 1 commit

312 - am -3: list the paths that needed 3-way fallback

313

314 +Will merge to 'next'.

315 +

316 * rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit

317 - combine-diff: fix loop index underflow

318

319 Fixes an age old corner case bug in combine diff (only triggered with -U0

320 and the hunk at the beginning of the file needs to be shown).

321

322 +Will merge to 'next'.

323 +

324 * sl/autoconf (2012-03-26) 3 commits

325 - configure: be more idiomatic

326 - configure: avoid some code repetitions thanks to m4_{push,pop}def

@@ -270,6 +328,8 @@ and the hunk at the beginning of the file needs to be shown).

328

329 Updates our configure.ac to follow a better "autoconf" style.

330

331 +Will merge to 'next'.

332 +

333 * wk/gitweb-snapshot-use-if-modified-since (2012-03-30) 3 commits

334 - gitweb: add If-Modified-Since handling to git_snapshot().

335 - gitweb: refactor If-Modified-Since handling

@@ -278,6 +338,8 @@ Updates our configure.ac to follow a better "autoconf" style.

338 Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,

339 based on the commit date.

340

341 +Will merge to 'next'.

342 +

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

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

345 - teach diffcore-rename to optionally ignore empty content

@@ -287,6 +349,8 @@ based on the commit date.

349 Forbids rename detection logic from matching two empty files as renames

350 during merge-recursive to prevent mismerges.

351

352 +Will merge to 'next'.

353 +

354 * th/difftool-diffall (2012-04-04) 8 commits

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

356 - difftool: teach difftool to handle directory diffs

@@ -311,7 +375,7 @@ trees of independent git repositories that exist in the current project

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

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

377

314 -Not urgent.

378 +Will merge to 'next'.

379

380 * ct/advise-push-default (2012-03-26) 2 commits

381 (merged to 'next' on 2012-03-28 at 62764ae)

@@ -322,11 +386,13 @@ Breaks down the cases in which "git push" fails due to non-ff into three

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

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

388

389 +Will merge to 'next'.

390 +

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

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

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

394

329 -Not urgent.

395 +Will merge to 'next'.

396

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

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

@@ -334,6 +400,8 @@ Not urgent.

400

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

402

403 +Will merge to 'master'.

404 +

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

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

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

@@ -347,7 +415,7 @@ from any directory inside $GIT_DIR/. When "notes merge" stops with

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

416 to resolve it.

417

350 -Not urgent.

418 +Will merge to 'master'.

419

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

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

@@ -362,7 +430,7 @@ Not urgent.

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

431 which unnecessarily made things harder to verify under GETTEXT_POISON.

432

365 -Not urgent.

433 +Will merge to 'master'.

434

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

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

@@ -372,7 +440,8 @@ Not urgent.

440

441 The regexp configured with wordregex was incorrectly reused across

442 files.

375 -Not urgent.

443 +

444 +Will merge to 'master'.

445

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

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

@@ -380,7 +449,7 @@ Not urgent.

449 + t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER

450

451 Minor improvement to t0303.

383 -Not urgent.

452 +Will merge to 'master'.

453

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

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

@@ -392,9 +461,9 @@ Not urgent.

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

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

463 when the end user overrode the authorship via the "GIT_AUTHOR_NAME"

395 -environment variable. This is a simpler of the two approaches.

464 +environment variable.

465

397 -Will defer til 1.7.10.

466 +Will merge to 'master'.

467

468 * jc/run-hook-env-1 (2012-03-11) 3 commits

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

@@ -416,34 +485,35 @@ Resurrects the preparatory clean-up patches from another topic that was

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

486 configuration option series.

487

419 -Not urgent.

488 +Will merge to 'master'.

489

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

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

492 + unpack-trees: plug minor memory leak

493

425 -Will defer til 1.7.10.

494 +Will sneak a fix-up under this one when I rebuild 'next' tomorrow.

495

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

497 (merged to 'next' on 2012-03-28 at 074b16b)

498 + push: start warning upcoming default change for push.default

499

431 -Not urgent.

432 -

500 This resurrects an ancient patch I wrote during a discussion we had in the

501 1.6.3-1.6.4 era. This should probably come after ct/advise-push-default

502 topic and at that point the advise messages need to be rephrased, taking

503 the future default change into account.

504

505 +Will kick back to 'pu'.

506 +

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

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

509

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

511 involved in the side topic you are merging.

512

444 -Will defer til 1.7.10.

513 +Will merge to 'next'.

514

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

515 +* nl/http-proxy-more (2012-04-10) 6 commits

516 + - fixup? 6e17b8c

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

518 + http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

519 + http: Avoid limit of retrying request only twice

@@ -454,7 +524,7 @@ Will defer til 1.7.10.

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

525 API used to talk to the final http destinations.

526

457 -Will defer til 1.7.10.

527 +Will kick back to 'pu'.

528

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

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

@@ -469,19 +539,4 @@ Will defer til 1.7.10.

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

540 reduce the memory footprint. In general, looked fairly good.

541

472 -Will defer til 1.7.10.

473 -

474 ---------------------------------------------------

475 -[Discarded]

476 -

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

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

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

480 -

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

482 -

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

484 - . Support out-of-tree Valgrind tests

485 - . Allow overriding GIT_BUILD_DIR

486 -

487 -No immediate need; dropped.

542 +Will merge to 'master'.

What's cooking (2012/04 #04)