94753d2817 · matheusbsbs/matheus-bagliano

@@ -1,81 +1,163 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Apr 2014, #04; Tue, 15)

4 -X-master-at: 68773ac915580e88016c34ce1269730382b501d4

5 -X-next-at: eaba9156adf2b84a54a025dcd2c3fecdea5dc8a0

3 +Subject: What's cooking in git.git (Apr 2014, #05; Thu, 17)

4 +X-master-at: 3f0c02a1c018ddaced5c97b58f550b2ad17dd0a9

5 +X-next-at: fab3363ed5bd07db28d6fcb0637f15275ad77226

6

7 -What's cooking in git.git (Apr 2014, #04; Tue, 15)

7 +What's cooking in git.git (Apr 2014, #05; Thu, 17)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -The number of topics cooking in 'next' has been shrinking, and the

15 -cycle is getting long. Hopefully we will have -rc0 late this week to

16 -close the 'master' branch and a few rounds of -rc iterations until

17 -2.0 final. Other topics under discussion may continue to flow to

18 -'next', as usual, during that time, to be pushed out early in the

19 -next cycle.

14 +Hopefully we can merge a few more topics slated for 'master' before

15 +cutting an early preview release -rc0 tomorrow. Many of the topics

16 +that are in 'next' have sizable impact on the codebase and I'd feel

17 +safer to keep them cooking for the remainder of the cycle.

18 +

19 +Also I am still waiting for acks for a few topics before merging

20 +them to 'next'. I would feel it would be good if we can merge them

21 +early to 'next' for wider and longer exposure and some of them may

22 +even deserve to be in -rc1, but as none of them is a regression fix,

23 +it is also OK to wait until 2.0 final.

24

25 You can find the changes described here in the integration branches

26 of the repositories listed at

27

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

29

30 +--------------------------------------------------

31 +[Graduated to "master"]

32 +

33 +* km/avoid-bs-in-shell-glob (2014-04-11) 1 commit

34 + (merged to 'next' on 2014-04-14 at a3d9a58)

35 + + test: fix t5560 on FreeBSD

36 +

37 + Portability fix.

38 + May want to merge to 'maint' later.

39 +

40 +

41 +* km/avoid-cp-a (2014-04-11) 1 commit

42 + (merged to 'next' on 2014-04-14 at be661c4)

43 + + test: fix t7001 cp to use POSIX options

44 +

45 + Portability fix.

46 + May want to merge to 'maint' later.

47 +

48 +

49 +* mh/multimail (2014-04-07) 1 commit

50 + (merged to 'next' on 2014-04-15 at eaba915)

51 + + git-multimail: update to version 1.0.0

52 +

53 +

54 +* tb/unicode-6.3-zero-width (2014-04-09) 1 commit

55 + (merged to 'next' on 2014-04-14 at 72ce72a)

56 + + utf8.c: partially update to version 6.3

57 +

58 + Teach our display-column-counting logic about decomposed umlauts

59 + and friends.

60 +

61 --------------------------------------------------

62 [New Topics]

63

29 -* fc/prompt-zsh-read-from-file (2014-04-14) 1 commit

30 - - prompt: fix missing file errors in zsh

64 +* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit

65 + - git-gui: show staged submodules regardless of ignore config

66

32 - Will merge to 'next' and to 'master'.

67 + Tentatively queued what I expect to receive via Pat Thoyts.

68

69

35 -* fc/transport-helper-sync-error-fix (2014-04-14) 5 commits

36 - - transport-helper: fix sync issue on crashes

37 - - transport-helper: trivial cleanup

38 - - transport-helper: propagate recvline() error pushing

39 - - remote-helpers: make recvline return an error

40 - - transport-helper: remove barely used xchgline()

70 +* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits

71 + - gitk: show staged submodules regardless of ignore config

72 + - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk

73 + - l10n: Init Vietnamese translation

74

42 - Make sure the marks are not written out when the transport helper

43 - did not finish happily, to avoid marks file that is out of sync

44 - with the reality.

75 + Tentatively queued what I expect to receive via Paul Mackerras.

76

46 - As I had to resolve some conflicts with the recent code, will wait

47 - until getting an OK from Felipe on the conflict resolution and then

48 - hopefully can be merged to 'next' and then later to 'master'.

77

78 +* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit

79 + - git-rebase: print name of rev when using shorthand

80

51 -* km/avoid-non-function-return-in-rebase (2014-04-14) 2 commits

52 - - Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"

53 - - rebase: avoid non-function use of "return" on FreeBSD

81 + Teach "git rebase -" to report the concrete name of the branch

82 + (i.e. the previous one).

83

55 - Work around /bin/sh that does not like "return" at the top-level

56 - of a file that is dot-sourced from inside a function definition.

84 + But it stops short and does not do the same for "git rebase @{-1}".

85

58 - Will merge to 'next'.

86

60 - We may want to merge it to 'master' by -rc1 if no regressions are

61 - reported.

87 +* ef/send-email-absolute-path-to-the-command (2014-04-16) 1 commit

88 + - send-email: recognize absolute path on Windows

89

90

64 -* db/make-with-curl (2014-04-15) 2 commits

65 - - Makefile: allow static linking against libcurl

66 - - Makefile: use curl-config to determine curl flags

91 +* jk/config-die-bad-number-noreturn (2014-04-16) 1 commit

92 + (merged to 'next' on 2014-04-16 at 4d49036)

93 + + config.c: mark die_bad_number as NORETURN

94

68 - Ask curl-config how to link with the curl library, instead of

69 - having only a limited configurability knobs in the Makefile.

95 + Squelch a false compiler warning from older gcc.

96

71 - Will merge to 'next'.

97 + Will merge to 'master'.

98

73 - We may want to merge it to 'master' by -rc1 if no regressions are

74 - reported.

99 +

100 +* ep/shell-command-substitution (2014-04-17) 14 commits

101 + - t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution

102 + - t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution

103 + - git-tag.sh: use the $( ... ) construct for command substitution

104 + - git-revert.sh: use the $( ... ) construct for command substitution

105 + - git-resolve.sh: use the $( ... ) construct for command substitution

106 + - git-repack.sh: use the $( ... ) construct for command substitution

107 + - git-merge.sh: use the $( ... ) construct for command substitution

108 + - git-ls-remote.sh: use the $( ... ) construct for command substitution

109 + - git-fetch.sh: use the $( ... ) construct for command substitution

110 + - git-commit.sh: use the $( ... ) construct for command substitution

111 + - git-clone.sh: use the $( ... ) construct for command substitution

112 + - git-checkout.sh: use the $( ... ) construct for command substitution

113 + - install-webdoc.sh: use the $( ... ) construct for command substitution

114 + - howto-index.sh: use the $( ... ) construct for command substitution

115 +

116 + Will merge to 'next' and perhaps to 'master'.

117 +

118 +

119 +* jh/submodule-tests (2014-04-17) 1 commit

120 + - t7410: 210 tests for various 'git submodule update' scenarios

121 +

122 +

123 +* jx/i18n (2014-04-17) 3 commits

124 + - i18n: only extract comments marked with "TRANSLATORS:"

125 + - i18n: remove obsolete comments for translators in diffstat generation

126 + - i18n: fix uncatchable comments for translators in date.c

127 +

128 + The tip one is somewhat unfortunate to force us deviate from our

129 + multi-line comment formatting convention when writing comments for

130 + translators.

131 +

132 +

133 +* rs/ref-update-check-errors-early (2014-04-17) 2 commits

134 + - commit.c: check for lock error and return early

135 + - sequencer.c: check for lock failure and bail early in fast_forward_to

136 +

137 +

138 +* sk/svn-parse-datestamp (2014-04-17) 1 commit

139 + - SVN.pm::parse_svn_date: allow timestamps with a single-digit hour

140

141 --------------------------------------------------

142 [Stalled]

143

144 +* fc/publish-vs-upstream (2014-04-11) 8 commits

145 + - sha1_name: add support for @{publish} marks

146 + - sha1_name: simplify track finding

147 + - sha1_name: cleanup interpret_branch_name()

148 + - branch: display publish branch

149 + - push: add --set-publish option

150 + - branch: add --set-publish-to option

151 + - Add concept of 'publish' branch

152 + - t5516 (fetch-push): fix test restoration

153 +

154 + Add branch@{publish}; it seems that this is somewhat different from

155 + Ram and Peff started working on. There are still many discussion

156 + messages going back and forth but not updates to the patches.

157 +

158 + Seems to have some interactions to break t5516 when merged to 'pu'.

159 +

160 +

161 * tr/merge-recursive-index-only (2014-02-05) 3 commits

162 - merge-recursive: -Xindex-only to leave worktree unchanged

163 - merge-recursive: internal flag to avoid touching the worktree

@@ -184,6 +266,7 @@ of the repositories listed at

266 - submodule: teach unpack_trees() to remove submodule contents

267 - submodule: prepare for recursive checkout of submodules

268

269 + An RFCv2 exists ($gmane/241455) with sizable review comments.

270 Expecting a reroll.

271

272

@@ -242,60 +325,91 @@ of the repositories listed at

325 --------------------------------------------------

326 [Cooking]

327

245 -* nd/index-pack-one-fd-per-thread (2014-04-09) 1 commit

246 - - index-pack: work around thread-unsafe pread()

328 +* fc/prompt-zsh-read-from-file (2014-04-14) 1 commit

329 + (merged to 'next' on 2014-04-16 at 0e5fec0)

330 + + prompt: fix missing file errors in zsh

331

248 - Enable threaded index-pack on platforms without thread-unsafe

249 - pread() emulation.

332 + Will merge to 'master'.

333 +

334 +

335 +* fc/transport-helper-sync-error-fix (2014-04-14) 5 commits

336 + - transport-helper: fix sync issue on crashes

337 + - transport-helper: trivial cleanup

338 + - transport-helper: propagate recvline() error pushing

339 + - remote-helpers: make recvline return an error

340 + - transport-helper: remove barely used xchgline()

341

251 - The log message may need to be replaced ($gmane/246176).

342 + Make sure the marks are not written out when the transport helper

343 + did not finish happily, to avoid marks file that is out of sync

344 + with the reality.

345

346 + As I had to resolve some conflicts with the recent code, will wait

347 + until getting an OK from Felipe on the conflict resolution and then

348 + hopefully can be merged to 'next' and then later to 'master'.

349

254 -* tb/unicode-6.3-zero-width (2014-04-09) 1 commit

255 - (merged to 'next' on 2014-04-14 at 72ce72a)

256 - + utf8.c: partially update to version 6.3

350

258 - Teach our display-column-counting logic about decomposed umlauts

259 - and friends.

351 +* km/avoid-non-function-return-in-rebase (2014-04-17) 2 commits

352 + - Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"

353 + - rebase: avoid non-function use of "return" on FreeBSD

354

261 - Will merge to 'master'.

355 + Work around /bin/sh that does not like "return" at the top-level

356 + of a file that is dot-sourced from inside a function definition.

357

358 + Will merge to 'next' after the discussion on in-code comment settles.

359

264 -* fc/complete-aliased-push (2014-04-09) 1 commit

265 - - completion: fix completing args of aliased "push", "fetch", etc.

360 + We may want to merge it to 'master' by -rc1 if no regressions are

361 + reported.

362

267 - Will merge to 'next'.

363

364 +* db/make-with-curl (2014-04-15) 2 commits

365 + (merged to 'next' on 2014-04-16 at b9c8527)

366 + + Makefile: allow static linking against libcurl

367 + + Makefile: use curl-config to determine curl flags

368

270 -* fc/remote-helper-fixes (2014-04-14) 5 commits

271 - - remote-bzr: trivial test fix

272 - - remote-bzr: include authors field in pushed commits

273 - - remote-bzr: add support for older versions

274 - - remote-hg: always normalize paths

275 - - remote-helpers: allow all tests running from any dir

369 + Ask curl-config how to link with the curl library, instead of

370 + having only a limited configurability knobs in the Makefile.

371

277 - Will merge to 'next'.

372 + Will merge to 'master' by -rc1 if no regressions are reported.

373

374

280 -* fc/publish-vs-upstream (2014-04-11) 8 commits

281 - - sha1_name: add support for @{publish} marks

282 - - sha1_name: simplify track finding

283 - - sha1_name: cleanup interpret_branch_name()

284 - - branch: display publish branch

285 - - push: add --set-publish option

286 - - branch: add --set-publish-to option

287 - - Add concept of 'publish' branch

288 - - t5516 (fetch-push): fix test restoration

375 +* nd/index-pack-one-fd-per-thread (2014-04-16) 1 commit

376 + (merged to 'next' on 2014-04-16 at b38d5a9)

377 + + index-pack: work around thread-unsafe pread()

378 +

379 + Enable threaded index-pack on platforms without thread-unsafe

380 + pread() emulation.

381

290 - Add branch@{publish}; this round v3 hasn't yet seen much reviews

291 - yet.

382 + Will keep in 'next' for the remainder of the cycle.

383

293 - Seems to have some interactions to break t5516 when merged to 'pu'.

384 +

385 +* fc/complete-aliased-push (2014-04-09) 1 commit

386 + (merged to 'next' on 2014-04-16 at ab798d1)

387 + + completion: fix completing args of aliased "push", "fetch", etc.

388 +

389 + Will merge to 'master'.

390 +

391 +

392 +* fc/remote-helper-fixes (2014-04-14) 5 commits

393 + (merged to 'next' on 2014-04-16 at 180482e)

394 + + remote-bzr: trivial test fix

395 + + remote-bzr: include authors field in pushed commits

396 + + remote-bzr: add support for older versions

397 + + remote-hg: always normalize paths

398 + + remote-helpers: allow all tests running from any dir

399 +

400 + Will merge to 'master'.

401

402

403 * ym/fix-opportunistic-index-update-race (2014-04-10) 2 commits

297 - - read-cache.c: verify index file before we opportunistically update it

298 - - wrapper.c: add xpread() similar to xread()

404 + (merged to 'next' on 2014-04-16 at cb92f4f)

405 + + read-cache.c: verify index file before we opportunistically update it

406 + + wrapper.c: add xpread() similar to xread()

407 +

408 + Read-only operations such as "git status" that internally refreshes

409 + the index write out the refreshed index to the disk to optimize

410 + future accesses to the working tree, but this could race with a

411 + "read-write" operation that modify the index while it is running.

412 + Detect such a race and avoid overwriting the index.

413

414 Duy raised a good point that we may need to do the same for the

415 normal writeout codepath, not just the "opportunistic" update

@@ -304,23 +418,7 @@ of the repositories listed at

418 with each other against the same index file. So in that sense that

419 can be done as a less urgent follow-up for this topic.

420

307 - Will merge to 'next' and keep it there for the remainder of the cycle.

308 -

309 -

310 -* km/avoid-bs-in-shell-glob (2014-04-11) 1 commit

311 - (merged to 'next' on 2014-04-14 at a3d9a58)

312 - + test: fix t5560 on FreeBSD

313 -

314 - Portability fix.

315 - Will merge to 'master'.

316 -

317 -

318 -* km/avoid-cp-a (2014-04-11) 1 commit

319 - (merged to 'next' on 2014-04-14 at be661c4)

320 - + test: fix t7001 cp to use POSIX options

321 -

322 - Portability fix.

323 - Will merge to 'master'.

421 + Will keep in 'next' for the remainder of the cycle.

422

423

424 * jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits

@@ -334,13 +432,6 @@ of the repositories listed at

432 Waiting for the dust to settle until picking them up all.

433

434

337 -* mh/multimail (2014-04-07) 1 commit

338 - (merged to 'next' on 2014-04-15 at eaba915)

339 - + git-multimail: update to version 1.0.0

340 -

341 - Will merge to 'master'.

342 -

343 -

435 * mh/lockfile (2014-04-15) 25 commits

436 - trim_last_path_elm(): replace last_path_elm()

437 - resolve_symlink(): take a strbuf parameter

@@ -371,7 +462,7 @@ of the repositories listed at

462 Refactor and fix corner-case bugs in the lockfile API, all looked

463 sensible.

464

374 - Still being commented on.

465 + Expecting a reroll.

466

467

468 * mt/patch-id-stable (2014-03-31) 3 commits

@@ -393,39 +484,39 @@ of the repositories listed at

484

485

486 * mh/ref-transaction (2014-04-07) 27 commits

396 - - ref_transaction_commit(): work with transaction->updates in place

397 - - struct ref_update: add a type field

398 - - struct ref_update: add a lock field

399 - - ref_transaction_commit(): simplify code using temporary variables

400 - - struct ref_update: store refname as a FLEX_ARRAY

401 - - struct ref_update: rename field "ref_name" to "refname"

402 - - refs: remove API function update_refs()

403 - - update-ref --stdin: reimplement using reference transactions

404 - - refs: add a concept of a reference transaction

405 - - update-ref --stdin: harmonize error messages

406 - - update-ref --stdin: improve the error message for unexpected EOF

407 - - t1400: test one mistake at a time

408 - - update-ref --stdin -z: deprecate interpreting the empty string as zeros

409 - - update-ref.c: extract a new function, parse_next_sha1()

410 - - t1400: test that stdin -z update treats empty <newvalue> as zeros

411 - - update-ref --stdin: simplify error messages for missing oldvalues

412 - - update-ref --stdin: make error messages more consistent

413 - - update-ref --stdin: improve error messages for invalid values

414 - - update-ref.c: extract a new function, parse_refname()

415 - - parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice

416 - - update-ref --stdin: read the whole input at once

417 - - update_refs(): fix constness

418 - - refs.h: rename the action_on_err constants

419 - - t1400: add some more tests involving quoted arguments

420 - - parse_arg(): really test that argument is properly terminated

421 - - t1400: provide more usual input to the command

422 - - t1400: fix name and expected result of one test

423 - (this branch is used by rs/ref-closer-to-atomic.)

487 + (merged to 'next' on 2014-04-16 at a99f84d)

488 + + ref_transaction_commit(): work with transaction->updates in place

489 + + struct ref_update: add a type field

490 + + struct ref_update: add a lock field

491 + + ref_transaction_commit(): simplify code using temporary variables

492 + + struct ref_update: store refname as a FLEX_ARRAY

493 + + struct ref_update: rename field "ref_name" to "refname"

494 + + refs: remove API function update_refs()

495 + + update-ref --stdin: reimplement using reference transactions

496 + + refs: add a concept of a reference transaction

497 + + update-ref --stdin: harmonize error messages

498 + + update-ref --stdin: improve the error message for unexpected EOF

499 + + t1400: test one mistake at a time

500 + + update-ref --stdin -z: deprecate interpreting the empty string as zeros

501 + + update-ref.c: extract a new function, parse_next_sha1()

502 + + t1400: test that stdin -z update treats empty <newvalue> as zeros

503 + + update-ref --stdin: simplify error messages for missing oldvalues

504 + + update-ref --stdin: make error messages more consistent

505 + + update-ref --stdin: improve error messages for invalid values

506 + + update-ref.c: extract a new function, parse_refname()

507 + + parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice

508 + + update-ref --stdin: read the whole input at once

509 + + update_refs(): fix constness

510 + + refs.h: rename the action_on_err constants

511 + + t1400: add some more tests involving quoted arguments

512 + + parse_arg(): really test that argument is properly terminated

513 + + t1400: provide more usual input to the command

514 + + t1400: fix name and expected result of one test

515

516 Update "update-ref --stdin [-z]" and then introduce a transactional

517 support for (multi-)reference updates.

518

428 - Will merge to 'next' and keep it there for the remainder of the cycle.

519 + Will keep in 'next' for the remainder of the cycle.

520

521

522 * jc/apply-ignore-whitespace (2014-03-26) 1 commit

@@ -547,23 +638,3 @@ of the repositories listed at

638 I was planning to merge it to 'next' and keep it there for the

639 remainder of the cycle, but it appears that there still will be

640 another round of reroll, at least for the documentation?

550 -

551 ---------------------------------------------------

552 -[Discarded]

553 -

554 -* sz/mingw-index-pack-threaded (2014-03-19) 1 commit

555 - . Enable index-pack threading in msysgit.

556 -

557 - Queued a different attempt by Duy on nd/index-pack-one-fd-per-thread

558 -

559 -

560 -* rs/ref-closer-to-atomic (2014-04-14) 3 commits

561 - . refs.c: change ref_transaction_commit to run the commit loops once all work is finished

562 - . refs.c: split delete_ref_loose() into a separate flag-for-deletion and commit phase

563 - . refs.c: split writing and commiting a ref into two separate functions

564 - (this branch uses mh/ref-transaction.)

565 -

566 - Builds on top of Michael's ref-transaction series to shrink the

567 - race window during multiple ref updates.

568 -

569 - Deferred to be rerolled ($gmane/246289).

What's cooking (2014/04 #05)