d44b9489ef · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: d8779e1e2536bdd024254af14d2c046bba2bbb01

5 -X-next-at: fe24852931172d52dd7fafff92f32bb80ce75764

3 +Subject: What's cooking in git.git (May 2014, #01; Tue, 6)

4 +X-master-at: b4f86a4ce85e4e370a67455de6586a02f158a789

5 +X-next-at: cfa251bb0195ab6f98c8c86125e8419cea21247d

6

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

7 +What's cooking in git.git (May 2014, #01; Tue, 6)

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

9

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

@@ -22,79 +22,113 @@ of the repositories listed at

22

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

24

25 +--------------------------------------------------

26 +[Graduated to "master"]

27 +

28 +* km/git-svn-workaround-older-getopt-long (2014-04-23) 1 commit

29 + (merged to 'next' on 2014-04-23 at 3f35586)

30 + + t9117: use --prefix "" instead of --prefix=""

31 +

32 + Finishing touches to a change that is already in 'master'.

33 +

34 +

35 +* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit

36 + (merged to 'next' on 2014-04-22 at 385d39a)

37 + + Documentation: git-gui: describe gui.displayuntracked

38 +

39 +

40 +* mw/symlinks (2014-04-24) 1 commit

41 + (merged to 'next' on 2014-04-25 at 20b2af6)

42 + + setup: fix windows path buffer over-stepping

43 +

44 + A finishing touch fix to a new change already in 'master'.

45 +

46 +

47 +* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit

48 + (merged to 'next' on 2014-04-22 at 3a1506f)

49 + + git-prompt.sh: don't put unsanitized branch names in $PS1

50 +

51 --------------------------------------------------

52 [New Topics]

53

28 -* cc/replace-edit (2014-04-29) 4 commits

29 - - replace: add --edit option

30 - - replace: factor object resolution out of replace_object

31 - - replace: use OPT_CMDMODE to handle modes

32 - - replace: refactor command-mode determination

54 +* bg/strbuf-trim (2014-04-30) 2 commits

55 + - api-strbuf.txt: Add docs for _trim and _ltrim

56 + - strbuf: Use _rtrim and _ltrim in strbuf_trim

57

58 + Will merge to 'next'.

59

35 -* da/imap-send-use-credential-helper (2014-04-29) 1 commit

36 - - imap-send: use git-credential

60

61 +* cb/byte-order (2014-05-02) 2 commits

62 + - compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN

63 + - compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER

64

39 -* dk/blame-reorg (2014-04-28) 1 commit

40 - - blame: large-scale performance rewrite

65 + Will merge to 'next'.

66

67

43 -* je/pager-do-not-recurse (2014-04-28) 1 commit

44 - - pager: do allow spawning pager recursively

68 +* dt/api-doc-setup-gently (2014-04-30) 1 commit

69 + - docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP

70

71 + Will merge to 'next'.

72

47 -* jk/commit-C-pick-empty (2014-04-28) 1 commit

48 - - commit: do not complain of empty messages from -C

73

74 +* dt/merge-recursive-case-insensitive (2014-05-06) 1 commit

75 + - merge-recursive.c: Fix case-changing merge bug

76

51 -* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit

52 - - t3910: show failure of core.precomposeunicode with decomposed filenames

77

78 +* ew/config-protect-mode (2014-05-06) 1 commit

79 + - config: preserve config file permissions on edits

80

55 -* mt/send-email-cover-to-cc (2014-04-29) 2 commits

56 - - test/send-email: to-cover, cc-cover tests

57 - - git-send-email: two new options: to-cover, cc-cover

81 + Will merge to 'next'.

82

83

60 -* nd/split-index (2014-04-29) 33 commits

61 - - SQUASH???

62 - - t1700: new tests for split-index mode

63 - - t2104: make sure split index mode is off for the version test

64 - - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX

65 - - read-tree: note about dropping split-index mode or index version

66 - - read-tree: force split-index mode off on --index-output

67 - - rev-parse: add --shared-index-path to get shared index path

68 - - update-index --split-index: do not split if $GIT_DIR is read only

69 - - update-index: new options to enable/disable split index mode

70 - - split-index: strip pathname of on-disk replaced entries

71 - - split-index: do not invalidate cache-tree at read time

72 - - split-index: the reading part

73 - - split-index: the writing part

74 - - read-cache: mark updated entries for split index

75 - - read-cache: save deleted entries in split index

76 - - read-cache: mark new entries for split index

77 - - read-cache: split-index mode

78 - - read-cache: save index SHA-1 after reading

79 - - entry.c: update cache_changed if refresh_cache is set in checkout_entry()

80 - - cache-tree: mark istate->cache_changed on prime_cache_tree()

81 - - cache-tree: mark istate->cache_changed on cache tree update

82 - - cache-tree: mark istate->cache_changed on cache tree invalidation

83 - - unpack-trees: be specific what part of the index has changed

84 - - resolve-undo: be specific what part of the index has changed

85 - - update-index: be specific what part of the index has changed

86 - - read-cache: be specific what part of the index has changed

87 - - read-cache: be strict about "changed" in remove_marked_cache_entries()

88 - - read-cache: store in-memory flags in the first 12 bits of ce_flags

89 - - read-cache: relocate and unexport commit_locked_index()

90 - - read-cache: new API write_locked_index instead of write_index/write_cache

91 - - sequencer: do not update/refresh index if the lock cannot be held

92 - - ewah: delete unused ewah_read_mmap_native declaration

93 - - ewah: fix constness of ewah_read_mmap

84 +* fc/rerere-conflict-style (2014-04-30) 1 commit

85 + - rerere: fix for merge.conflictstyle

86

87 + Will merge to 'next'.

88

96 -* tl/relax-in-poll-emulation (2014-04-29) 1 commit

97 - - compat/poll: sleep 1 millisecond to avoid busy wait

89 +

90 +* jc/coding-guidelines (2014-05-02) 8 commits

91 + - CodingGuidelines: on splitting a long line

92 + - CodingGuidelines: on comparison

93 + - CodingGuidelines: do not call the conditional statement "if()"

94 + - CodingGuidelines: give an example for shell function preamble

95 + - CodingGuidelines: give an example for control statements

96 + - CodingGuidelines: give an example for redirection

97 + - CodingGuidelines: give an example for case/esac statement

98 + - CodingGuidelines: once it is in, it is not worth the code churn

99 +

100 + Needs to be rerolled.

101 +

102 +

103 +* jd/subtree (2014-05-06) 5 commits

104 + - contrib/subtree/Makefile: clean rule cleanup

105 + - contrib/subtree/Makefile: Doc-gen rules cleanup

106 + - contrib/subtree/Makefile: s/libexecdir/gitexecdir

107 + - contrib/subtree/Makefile: Use GIT-VERSION-FILE

108 + - contrib/subtree/Makefile: scrap unused $(gitdir)

109 +

110 + Will merge to 'next'.

111 +

112 +

113 +* jk/commit-date-approxidate (2014-05-02) 4 commits

114 + - commit: accept more date formats for "--date"

115 + - commit: print "Date" line when the user has set date

116 + - pretty: make show_ident_date public

117 + - commit: use split_ident_line to compare author/committer

118 +

119 + Will merge to 'next'.

120 +

121 +

122 +* mm/pager-less-sans-S (2014-04-30) 1 commit

123 + - pager: remove 'S' from $LESS by default

124 +

125 + Will merge to 'next'.

126 +

127 +

128 +* sk/msvc-dynlink-crt (2014-05-06) 1 commit

129 + - MSVC: link dynamically to the CRT

130 +

131 + Will merge to 'next'.

132

133 --------------------------------------------------

134 [Stalled]

@@ -141,7 +175,6 @@ of the repositories listed at

175 - Makefile: introduce make-var helper function

176 - Makefile: fix git-instaweb dependency on gitweb

177 - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS

144 - (this branch is used by mm/pager-less-sans-S.)

178

179 Simplify the Makefile rules and macros that exist primarily for

180 quoting purposes, and make it easier to robustly express the

@@ -235,17 +268,6 @@ of the repositories listed at

268 Will hold.

269

270

238 -* jc/format-patch (2013-04-22) 2 commits

239 - - format-patch: --inline-single

240 - - format-patch: rename "no_inline" field

241 -

242 - A new option to send a single patch to the standard output to be

243 - appended at the bottom of a message. I personally have no need for

244 - this, but it was easy enough to cobble together. Tests, docs and

245 - stripping out more MIMEy stuff are left as exercises to interested

246 - parties.

247 -

248 -

271 * jc/show-branch (2014-03-24) 5 commits

272 - show-branch: use commit slab to represent bitflags of arbitrary width

273 - show-branch.c: remove "all_mask"

@@ -258,6 +280,78 @@ of the repositories listed at

280 --------------------------------------------------

281 [Cooking]

282

283 +* cc/replace-edit (2014-04-29) 4 commits

284 + - replace: add --edit option

285 + - replace: factor object resolution out of replace_object

286 + - replace: use OPT_CMDMODE to handle modes

287 + - replace: refactor command-mode determination

288 +

289 +

290 +* da/imap-send-use-credential-helper (2014-04-29) 1 commit

291 + - imap-send: use git-credential

292 +

293 +

294 +* dk/blame-reorg (2014-04-28) 1 commit

295 + - blame: large-scale performance rewrite

296 +

297 +

298 +* je/pager-do-not-recurse (2014-04-28) 1 commit

299 + - pager: do allow spawning pager recursively

300 +

301 +

302 +* jk/commit-C-pick-empty (2014-04-28) 1 commit

303 + - commit: do not complain of empty messages from -C

304 +

305 +

306 +* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit

307 + - t3910: show failure of core.precomposeunicode with decomposed filenames

308 +

309 +

310 +* mt/send-email-cover-to-cc (2014-04-29) 2 commits

311 + - test/send-email: to-cover, cc-cover tests

312 + - git-send-email: two new options: to-cover, cc-cover

313 +

314 +

315 +* nd/split-index (2014-04-29) 33 commits

316 + - SQUASH???

317 + - t1700: new tests for split-index mode

318 + - t2104: make sure split index mode is off for the version test

319 + - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX

320 + - read-tree: note about dropping split-index mode or index version

321 + - read-tree: force split-index mode off on --index-output

322 + - rev-parse: add --shared-index-path to get shared index path

323 + - update-index --split-index: do not split if $GIT_DIR is read only

324 + - update-index: new options to enable/disable split index mode

325 + - split-index: strip pathname of on-disk replaced entries

326 + - split-index: do not invalidate cache-tree at read time

327 + - split-index: the reading part

328 + - split-index: the writing part

329 + - read-cache: mark updated entries for split index

330 + - read-cache: save deleted entries in split index

331 + - read-cache: mark new entries for split index

332 + - read-cache: split-index mode

333 + - read-cache: save index SHA-1 after reading

334 + - entry.c: update cache_changed if refresh_cache is set in checkout_entry()

335 + - cache-tree: mark istate->cache_changed on prime_cache_tree()

336 + - cache-tree: mark istate->cache_changed on cache tree update

337 + - cache-tree: mark istate->cache_changed on cache tree invalidation

338 + - unpack-trees: be specific what part of the index has changed

339 + - resolve-undo: be specific what part of the index has changed

340 + - update-index: be specific what part of the index has changed

341 + - read-cache: be specific what part of the index has changed

342 + - read-cache: be strict about "changed" in remove_marked_cache_entries()

343 + - read-cache: store in-memory flags in the first 12 bits of ce_flags

344 + - read-cache: relocate and unexport commit_locked_index()

345 + - read-cache: new API write_locked_index instead of write_index/write_cache

346 + - sequencer: do not update/refresh index if the lock cannot be held

347 + - ewah: delete unused ewah_read_mmap_native declaration

348 + - ewah: fix constness of ewah_read_mmap

349 +

350 +

351 +* tl/relax-in-poll-emulation (2014-04-29) 1 commit

352 + - compat/poll: sleep 1 millisecond to avoid busy wait

353 +

354 +

355 * bc/blame-crlf-test (2014-04-28) 1 commit

356 - blame: correctly handle files regardless of autocrlf.

357

@@ -298,7 +392,21 @@ of the repositories listed at

392 Expecting a reroll.

393

394

301 -* ep/shell-command-substitution (2014-04-29) 27 commits

395 +* ep/shell-command-substitution (2014-04-30) 41 commits

396 + - t5000-tar-tree.sh: use the $( ... ) construct for command substitution

397 + - t4204-patch-id.sh: use the $( ... ) construct for command substitution

398 + - t4119-apply-config.sh: use the $( ... ) construct for command substitution

399 + - t4116-apply-reverse.sh: use the $( ... ) construct for command substitution

400 + - t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution

401 + - t4038-diff-combined.sh: use the $( ... ) construct for command substitution

402 + - t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution

403 + - t4014-format-patch.sh: use the $( ... ) construct for command substitution

404 + - t4013-diff-various.sh: use the $( ... ) construct for command substitution

405 + - t4012-diff-binary.sh: use the $( ... ) construct for command substitution

406 + - t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution

407 + - t4006-diff-mode.sh: use the $( ... ) construct for command substitution

408 + - t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution

409 + - t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution

410 - t1050-large.sh: use the $( ... ) construct for command substitution

411 - t1020-subdirectory.sh: use the $( ... ) construct for command substitution

412 - t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution

@@ -332,7 +440,7 @@ of the repositories listed at

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

441

442

335 -* ib/test-selectively-run (2014-04-23) 3 commits

443 +* ib/test-selectively-run (2014-05-06) 3 commits

444 - test-lib: '--run' to run only specific tests

445 - test-lib: tests skipped by GIT_SKIP_TESTS say so

446 - test-lib: Document short options in t/README

@@ -342,19 +450,11 @@ of the repositories listed at

450

451

452 * mm/mediawiki-encoding-fix (2014-04-23) 2 commits

345 - - git-remote-mediawiki: fix encoding issue for UTF-8 media files

346 - - git-remote-mediawiki: allow stop/start-ing the test server

347 -

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

453 + (merged to 'next' on 2014-05-02 at 7744361)

454 + + git-remote-mediawiki: fix encoding issue for UTF-8 media files

455 + + git-remote-mediawiki: allow stop/start-ing the test server

456

350 -

351 -* mw/symlinks (2014-04-24) 1 commit

352 - (merged to 'next' on 2014-04-25 at 20b2af6)

353 - + setup: fix windows path buffer over-stepping

354 -

355 - A finishing touch fix to a new change already in 'master'.

356 -

357 - Will merge to 'master' by -rc2.

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

458

459

460 * sk/tag-contains-wo-recursion (2014-04-25) 1 commit

@@ -382,8 +482,11 @@ of the repositories listed at

482 suggestions on the follow-up fix patches still not in 'next', which

483 may result in a reroll.

484

385 - Will merge to 'next' and keep it there for the remainder of the

386 - cycle.

485 + I tend to agree with John Keeping that remote helpers that are

486 + actively maintained can and should aim to graduate from my tree and

487 + given to the user directly.

488 +

489 + Will hold.

490

491

492 * fc/remote-helper-refmap (2014-04-21) 8 commits

@@ -441,7 +544,8 @@ of the repositories listed at

544

545

546 * fc/mergetool-prompt (2014-04-24) 2 commits

444 - - mergetool: document the default for --[no-]prompt

547 + (merged to 'next' on 2014-05-02 at a554691)

548 + + mergetool: document the default for --[no-]prompt

549 (merged to 'next' on 2014-04-22 at dcaec94)

550 + mergetool: run prompt only if guessed tool

551

@@ -459,7 +563,7 @@ of the repositories listed at

563 users need to explicitly set the variable to 'true' if they want to

564 resurrect the now-ignored use case.

565

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

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

567

568

569 * fc/mergetools-vimdiff3 (2014-04-22) 1 commit

@@ -469,13 +573,6 @@ of the repositories listed at

573 Will keep in 'next' for the remainder of the cycle.

574

575

472 -* km/git-svn-workaround-older-getopt-long (2014-04-23) 1 commit

473 - (merged to 'next' on 2014-04-23 at 3f35586)

474 - + t9117: use --prefix "" instead of --prefix=""

475 -

476 - Will merge to 'master' by -rc2.

477 -

478 -

576 * lr/git-run-setup-gently (2014-04-22) 1 commit

577 (merged to 'next' on 2014-04-22 at 5c2523f)

578 + git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive

@@ -483,20 +580,6 @@ of the repositories listed at

580 Will keep in 'next' for the remainder of the cycle.

581

582

486 -* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit

487 - (merged to 'next' on 2014-04-22 at 385d39a)

488 - + Documentation: git-gui: describe gui.displayuntracked

489 -

490 - Will merge to 'master' by -rc2.

491 -

492 -

493 -* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit

494 - (merged to 'next' on 2014-04-22 at 3a1506f)

495 - + git-prompt.sh: don't put unsanitized branch names in $PS1

496 -

497 - Will merge to 'master' by -rc2.

498 -

499 -

583 * fc/publish-vs-upstream (2014-04-21) 8 commits

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

585 - sha1_name: simplify track finding

@@ -640,12 +723,15 @@ of the repositories listed at

723 Expecting a reroll.

724

725

643 -* mt/patch-id-stable (2014-04-29) 5 commits

644 - - t4204-patch-id.sh: default is now stable

645 - - patch-id: change default to stable

646 - - patch-id-test: test stable and unstable behaviour

647 - - test: add test_write_lines helper

648 - - patch-id: make it stable against hunk reordering

726 +* mt/patch-id-stable (2014-05-06) 6 commits

727 + - test doc: test_write_lines does not split its arguments

728 + (merged to 'next' on 2014-05-02 at cfa251b)

729 + + t4204-patch-id.sh: default is now stable

730 + + patch-id: change default to stable

731 + (merged to 'next' on 2014-05-02 at b69326a)

732 + + patch-id-test: test stable and unstable behaviour

733 + + test: add test_write_lines helper

734 + + patch-id: make it stable against hunk reordering

735

736 Introduce a new way to compute patch-id for a patch that is not

737 affected by the order of the paths that appear in the input.

@@ -804,3 +890,19 @@ of the repositories listed at

890

891 A new filter to programatically edit the tail end of the commit log

892 messages.

893 +

894 +

895 +--------------------------------------------------

896 +[Discarded]

897 +

898 +* jc/format-patch (2013-04-22) 2 commits

899 + . format-patch: --inline-single

900 + . format-patch: rename "no_inline" field

901 +

902 + A new option to send a single patch to the standard output to be

903 + appended at the bottom of a message. I personally have no need for

904 + this, but it was easy enough to cobble together. Tests, docs and

905 + stripping out more MIMEy stuff are left as exercises to interested

906 + parties.

907 +

908 +

What's cooking (2014/05 #01)