293a98b768 · matheusbsbs/matheus-bagliano

@@ -1,19 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Dec 2014, #05; Mon, 29)

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

4 X-master-at: c5b9256360b06efb9453c1627b78b14598e288b8

5 X-next-at: cc831f245cfe79ce0a9b574baf3c07960f338270

6

7 -What's cooking in git.git (Dec 2014, #05; Mon, 29)

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

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 -It has been understandably somewhat a slow week, and this will be

15 -the last issue of "What's cooking" report for this year. See you

16 -all in the new year.

14 +A (somewhat belated) happy new year, everybody. Sorry for being

15 +silent for a few more days than I intended to. I'll try to get sick

16 +and recover before a long holiday ends the next time.

17

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

19 of the repositories listed at

@@ -21,97 +21,107 @@ of the repositories listed at

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

22

23 --------------------------------------------------

24 -[Graduated to "master"]

24 +[New Topics]

25

26 -* jc/t9001-modernise (2014-11-25) 5 commits

27 - (merged to 'next' on 2014-12-23 at 3a2ec87)

28 - + t9001: style modernisation phase #5

29 - + t9001: style modernisation phase #4

30 - + t9001: style modernisation phase #3

31 - + t9001: style modernisation phase #2

32 - + t9001: style modernisation phase #1

26 +* cj/grep-none-match (2015-01-06) 1 commit

27 + - git-log: added --none-match option

28

29 + "git log --none-match --grep=WIP" will show only commits that are

30 + not marked as WIP.

31

35 -* mh/update-ref-verify (2014-12-11) 2 commits

36 - (merged to 'next' on 2014-12-23 at 3aa9a62)

37 - + update-ref: fix "verify" command with missing <oldvalue>

38 - + t1400: add some more tests of "update-ref --stdin"'s verify command

32 + I think "git grep -l --none-match -e foo -e bar" ought to work with

33 + the same change but the patch does not seem to go far enough to do

34 + so.

35

40 - "git update-ref --stdin"'s verify command did not work well when

41 - <oldvalue>, which is documented as optional, was missing.

36

43 ---------------------------------------------------

44 -[New Topics]

37 +* jk/prune-packed-server-info (2015-01-06) 2 commits

38 + - update-server-info: create info/* with mode 0666

39 + - t1301: set umask in reflog sharedrepository=group test

40

46 -* bw/maint-0090-awk-tweak (2014-12-23) 1 commit

47 - (merged to 'next' on 2014-12-29 at 9301c36)

48 - + t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk

41 + Fix recent breakage in Git 2.2 that started creating info/refs and

42 + objects/info/packs files with permission bits tighter than user's

43 + umask.

44

50 - Will merge to 'master'.

45

46 +* km/imap-send-libcurl-options (2015-01-06) 2 commits

47 + - imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

48 + - imap-send.c: support GIT_CURL_VERBOSE

49 + (this branch uses br/imap-send-verbosity and br/imap-send-via-libcurl.)

50

53 -* cc/bisect-rev-parsing (2014-12-29) 2 commits

54 - - bisect: add test to check that revs are properly parsed

55 - - bisect: parse revs before passing them to check_expected_revs()

51 + Now imap-send learned to talk to the server using cURL library,

52 + allow the same GIT_CURL_VERBOSE environment variable to control the

53 + verbosity of the chattering.

54 +

55 + Will merge to 'next'.

56

57 - The logic in "git bisect bad HEAD" etc. to avoid forcing the test

58 - of the common ancestor of bad and good commits was broken.

57 +

58 +* km/log-usage-string-i18n (2015-01-06) 1 commit

59 + - log.c: fix translation markings

60

61 Will merge to 'next'.

62

63

63 -* es/checkout-index-temp (2014-12-29) 5 commits

64 - - checkout-index: fix --temp relative path mangling

65 - - t2004: demonstrate broken relative path printing

66 - - t2004: standardize file naming in symlink test

67 - - t2004: drop unnecessary write-tree/read-tree

68 - - t2004: modernize style

64 +* rc/for-each-ref-tracking (2015-01-06) 2 commits

65 + - SQUASH???

66 + - for-each-ref: always check stat_tracking_info()'s return value

67 +

68 + Will merge to 'next', probably after squashing the fixup.

69

70 - "git checkout-index --temp=$target $path" did not work correctly

71 - for paths outside the current subdirectory in the project.

70 +

71 +* rh/test-color-avoid-terminfo-in-original-home (2015-01-06) 1 commit

72 + - test-lib.sh: do tests for color support after changing HOME

73 +

74 + We try to see if "tput" gives a useful result before switching TERM

75 + to dumb and moving HOME to point to our fake location for stability

76 + of the tests, and then use the command when coloring the output

77 + from the tests, but there is no guarantee "tput" works after

78 + switching HOME.

79

80 Will merge to 'next'.

81

82 +* sp/subtree-doc (2015-01-06) 1 commit

83 + - subtree: fix AsciiDoc list item continuation

84

76 -* js/remote-add-with-insteadof (2014-12-23) 2 commits

77 - - Add a regression test for 'git remote add <existing> <same-url>'

78 - - git remote: allow adding remotes agreeing with url.<...>.insteadOf

85 + Will merge to 'next'.

86

80 - "git remote add $name $URL" is now allowed when "url.$URL.insteadOf"

81 - is already defined.

87 +--------------------------------------------------

88 +[Stalled]

89

90 +* jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits

91 + - SQUASH???

92 + - rerere: error out on autoupdate failure

93

84 -* rs/plug-strbuf-leak-in-lock-ref (2014-12-29) 1 commit

85 - - refs: plug strbuf leak in lock_ref_sha1_basic()

94 + Will be rerolled as a part of a larger series.

95

87 - Will merge to 'next'.

96

97 +* jn/doc-api-errors (2014-12-04) 1 commit

98 + - doc: document error handling functions and conventions

99

90 -* rs/plug-strbuf-leak-in-merge (2014-12-29) 1 commit

91 - - merge: release strbuf after use in suggest_conflicts()

100 + For discussion.

101

93 - Will merge to 'next'.

102

103 +* sb/copy-fd-errno (2014-11-17) 1 commit

104 + - copy.c: make copy_fd preserve meaningful errno

105

96 -* rs/simplify-parsing-commit-tree-S (2014-12-29) 1 commit

97 - - commit-tree: simplify parsing of option -S using skip_prefix()

106 + Will be rerolled as a part of a larger series.

107

99 - Will merge to 'next'.

108

109 +* ye/http-accept-language (2014-12-22) 1 commit

110 + - http: Add Accept-Language header if possible

111

102 -* rs/simplify-transport-get (2014-12-29) 1 commit

103 - - transport: simplify duplicating a substring in transport_get() using xmemdupz()

112 + Expecting a reroll ($gmane/261810).

113

105 - Will merge to 'next'.

114

115 +* jk/strbuf-doc-to-header (2014-12-12) 4 commits

116 + - strbuf.h: reorganize api function grouping headers

117 + - strbuf.h: format asciidoc code blocks as 4-space indent

118 + - strbuf.h: drop asciidoc list formatting from API docs

119 + - strbuf: migrate api-strbuf.txt documentation to strbuf.h

120

108 -* sb/doc-submitting-patches-keep-notes (2014-12-29) 1 commit

109 - - Documentation/SubmittingPatches: Explain the rationale of git notes

121 + Resolve the "doc vs header" to favor the latter.

122

111 - Will merge to 'next'.

123 + Expecting to be rerolled.

124

113 ---------------------------------------------------

114 -[Stalled]

125

126 * pw/remote-set-url-fetch (2014-11-26) 1 commit

127 - remote: add --fetch and --both options to set-url

@@ -263,6 +273,74 @@ of the repositories listed at

273 --------------------------------------------------

274 [Cooking]

275

276 +* bw/maint-0090-awk-tweak (2014-12-23) 1 commit

277 + (merged to 'next' on 2014-12-29 at 9301c36)

278 + + t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk

279 +

280 + Will merge to 'master'.

281 +

282 +

283 +* cc/bisect-rev-parsing (2014-12-29) 2 commits

284 + - bisect: add test to check that revs are properly parsed

285 + - bisect: parse revs before passing them to check_expected_revs()

286 +

287 + The logic in "git bisect bad HEAD" etc. to avoid forcing the test

288 + of the common ancestor of bad and good commits was broken.

289 +

290 + Will merge to 'next'.

291 +

292 +

293 +* es/checkout-index-temp (2014-12-29) 5 commits

294 + - checkout-index: fix --temp relative path mangling

295 + - t2004: demonstrate broken relative path printing

296 + - t2004: standardize file naming in symlink test

297 + - t2004: drop unnecessary write-tree/read-tree

298 + - t2004: modernize style

299 +

300 + "git checkout-index --temp=$target $path" did not work correctly

301 + for paths outside the current subdirectory in the project.

302 +

303 + Will merge to 'next'.

304 +

305 +

306 +* js/remote-add-with-insteadof (2014-12-23) 2 commits

307 + - Add a regression test for 'git remote add <existing> <same-url>'

308 + - git remote: allow adding remotes agreeing with url.<...>.insteadOf

309 +

310 + "git remote add $name $URL" is now allowed when "url.$URL.insteadOf"

311 + is already defined.

312 +

313 +

314 +* rs/plug-strbuf-leak-in-lock-ref (2014-12-29) 1 commit

315 + - refs: plug strbuf leak in lock_ref_sha1_basic()

316 +

317 + Will merge to 'next'.

318 +

319 +

320 +* rs/plug-strbuf-leak-in-merge (2014-12-29) 1 commit

321 + - merge: release strbuf after use in suggest_conflicts()

322 +

323 + Will merge to 'next'.

324 +

325 +

326 +* rs/simplify-parsing-commit-tree-S (2014-12-29) 1 commit

327 + - commit-tree: simplify parsing of option -S using skip_prefix()

328 +

329 + Will merge to 'next'.

330 +

331 +

332 +* rs/simplify-transport-get (2014-12-29) 1 commit

333 + - transport: simplify duplicating a substring in transport_get() using xmemdupz()

334 +

335 + Will merge to 'next'.

336 +

337 +

338 +* sb/doc-submitting-patches-keep-notes (2014-12-29) 1 commit

339 + - Documentation/SubmittingPatches: Explain the rationale of git notes

340 +

341 + Will merge to 'next'.

342 +

343 +

344 * bb/update-unicode-table (2014-12-22) 5 commits

345 (merged to 'next' on 2014-12-23 at b4ce669)

346 + update_unicode.sh: delete the command group

@@ -324,6 +402,9 @@ of the repositories listed at

402 "git push" has been taught a "--atomic" option that makes push to

403 update more than one ref an "all-or-none" affair.

404

405 + What is queued here is a few iterations old; need to pick a new one

406 + up when the dust settles.

407 +

408

409 * sb/dco-indentation-fix (2014-12-22) 1 commit

410 (merged to 'next' on 2014-12-23 at c865690)

@@ -350,23 +431,6 @@ of the repositories listed at

431 Will merge to 'master'.

432

433

353 -* ye/http-accept-language (2014-12-22) 1 commit

354 - - http: Add Accept-Language header if possible

355 -

356 - Expecting a reroll ($gmane/261810).

357 -

358 -

359 -* jk/strbuf-doc-to-header (2014-12-12) 4 commits

360 - - strbuf.h: reorganize api function grouping headers

361 - - strbuf.h: format asciidoc code blocks as 4-space indent

362 - - strbuf.h: drop asciidoc list formatting from API docs

363 - - strbuf: migrate api-strbuf.txt documentation to strbuf.h

364 -

365 - Resolve the "doc vs header" to favor the latter.

366 -

367 - Expecting to be rerolled.

368 -

369 -

434 * mh/reflog-expire (2014-12-22) 24 commits

435 - refs.c: let fprintf handle the formatting

436 - refs.c: don't expose the internal struct ref_lock in the header file

@@ -401,11 +465,13 @@ of the repositories listed at

465 a sore thumb).

466

467

404 -* po/doc-core-ignorestat (2014-12-12) 1 commit

468 +* po/doc-core-ignorestat (2015-01-06) 3 commits

469 + - SQUASH???

470 + - doc: core.ignoreStat update, and clarify the --assume-unchanged effect

471 (merged to 'next' on 2014-12-23 at d2b3e84)

472 + doc: core.ignoreStat clarify the --assume-unchanged effect

473

408 - Will merge to 'master'.

474 + Will merge to 'next' after squashing in the fixup.

475

476

477 * jk/add-i-read-error (2014-12-15) 1 commit

@@ -439,19 +505,6 @@ of the repositories listed at

505 Will merge to 'master'.

506

507

442 -* jn/doc-api-errors (2014-12-04) 1 commit

443 - - doc: document error handling functions and conventions

444 -

445 - For discussion.

446 -

447 -

448 -* jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits

449 - - SQUASH???

450 - - rerere: error out on autoupdate failure

451 -

452 - Will be rerolled as a part of a larger series.

453 -

454 -

508 * jc/push-to-checkout (2014-12-01) 2 commits

509 - receive-pack: support push-to-checkout hook

510 - receive-pack: refactor updateInstead codepath

@@ -499,6 +552,8 @@ of the repositories listed at

552 A new "git list-files" Porcelain command, "ls-files" with bells and

553 whistles.

554

555 + Comments?

556 +

557

558 * nd/multiple-work-trees (2014-12-01) 34 commits

559 - git-common-dir: make "modules/" per-working-directory directory

@@ -541,12 +596,6 @@ of the repositories listed at

596 by making the borrowee and borrowers aware of each other.

597

598

544 -* sb/copy-fd-errno (2014-11-17) 1 commit

545 - - copy.c: make copy_fd preserve meaningful errno

546 -

547 - Will be rerolled as a part of a larger series.

548 -

549 -

599 * jk/approxidate-avoid-y-d-m-over-future-dates (2014-11-13) 2 commits

600 (merged to 'next' on 2014-12-15 at 397e986)

601 + approxidate: allow ISO-like dates far in the future

@@ -568,7 +617,7 @@ of the repositories listed at

617 * br/imap-send-verbosity (2014-11-05) 1 commit

618 (merged to 'next' on 2014-12-15 at 504af0b)

619 + imap-send: use parse options API to determine verbosity

571 - (this branch is used by br/imap-send-via-libcurl.)

620 + (this branch is used by br/imap-send-via-libcurl and km/imap-send-libcurl-options.)

621

622 Will merge to 'master'.

623

@@ -576,7 +625,7 @@ of the repositories listed at

625 * br/imap-send-via-libcurl (2014-11-10) 1 commit

626 (merged to 'next' on 2014-12-15 at 90db637)

627 + git-imap-send: use libcurl for implementation

579 - (this branch uses br/imap-send-verbosity.)

628 + (this branch is used by km/imap-send-libcurl-options; uses br/imap-send-verbosity.)

629

630 Newer libCurl knows how to talk IMAP; "git imap-send" has been

631 updated to use this instead of a hand-rolled OpenSSL calls.

@@ -617,8 +666,8 @@ of the repositories listed at

666 Will merge to 'master'.

667

668

620 -* nd/untracked-cache (2014-12-15) 24 commits

621 - - SQUASH???

669 +* nd/untracked-cache (2015-01-06) 24 commits

670 + - fixup! untracked cache: load from UNTR index extension

671 - untracked cache: guard and disable on system changes

672 - mingw32: add uname()

673 - t7063: tests for untracked cache

@@ -676,136 +725,3 @@ of the repositories listed at

725

726 --------------------------------------------------

727 [Discarded]

679 -

680 -* mb/enable-lib-terminal-test-on-newer-darwin (2014-11-14) 1 commit

681 - . t/lib-terminal: allow TTY tests to run under recent Mac OS

682 -

683 - We probably should drop this ($gmane/259609).

684 -

685 -

686 -* zk/grep-color-words (2014-10-27) 2 commits

687 - . Revert "grep: fix match highlighting for combined patterns with context lines"

688 - . grep: fix match highlighting for combined patterns with context lines

689 -

690 - rs/grep-color-words topic solves it in a different way.

691 -

692 - Will discard.

693 -

694 -

695 -* jn/dedup-doc-header (2014-12-10) 2 commits

696 - . put string-list API documentation in one place

697 - . put strbuf API documentation in one place

698 -

699 - We would want to have an easy way for developers to learn about

700 - APIs, and also a way to encourage them to keep the API

701 - documentation up to date when they make changes. Having header

702 - comments and API documentation duplicated in two different places

703 - risked them going out of sync.

704 -

705 - The approach taken by jk/strbuf-doc-to-header is the other way

706 - around, which people seem to prefer, so this is discarded.

707 -

708 -

709 -* jt/timer-settime (2014-08-29) 6 commits

710 - . use timer_settime() for new platforms

711 - . autoconf: check for timer_settime()

712 - . autoconf: check for struct itimerspec

713 - . autoconf: check for struct sigevent

714 - . autoconf: check for struct timespec

715 - . autoconf: check for timer_t

716 -

717 - Was wanting for a reroll.

718 -

719 -

720 -* rs/ref-transaction-reflog (2014-11-03) 15 commits

721 - . refs.c: allow deleting refs with a broken sha1

722 - . refs.c: remove lock_any_ref_for_update

723 - . refs.c: make unlock_ref/close_ref/commit_ref static

724 - . refs.c: rename log_ref_setup to create_reflog

725 - . reflog.c: use a reflog transaction when writing during expire

726 - . refs.c: allow multiple reflog updates during a single transaction

727 - . refs.c: only write reflog update if msg is non-NULL

728 - . refs.c: add a flag to allow reflog updates to truncate the log

729 - . refs.c: add a transaction function to append a reflog entry

730 - . copy.c: make copy_fd preserve meaningful errno

731 - . refs.c: add a function to append a reflog entry to a fd

732 - . refs.c: add a new update_type field to ref_update

733 - . refs.c: rename the transaction functions

734 - . refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

735 - . refs.c make ref_transaction_create a wrapper to ref_transaction_update

736 - (this branch is used by rs/ref-transaction-rename and rs/ref-transaction-send-pack.)

737 -

738 - Stefan Beller started working on reorganizing these three series,

739 - which unfortunately did not see much reviews.

740 -

741 -

742 -* rs/ref-transaction-rename (2014-11-07) 16 commits

743 - . refs.c: add an err argument to pack_refs

744 - . refs.c: make lock_packed_refs take an err argument

745 - . refs.c: make add_packed_ref return an error instead of calling die

746 - . refs.c: replace the onerr argument in update_ref with a strbuf err

747 - . refs.c: make the *_packed_refs functions static

748 - . refs.c: make repack_without_refs static

749 - . remote.c: use a transaction for deleting refs

750 - . refs.c: write updates to packed refs when a transaction has more than one ref

751 - . refs.c: move reflog updates into its own function

752 - . refs.c: rollback the lockfile before we die() in repack_without_refs

753 - . refs.c: update rename_ref to use a transaction

754 - . refs.c: add transaction support for renaming a reflog

755 - . refs.c: use a stringlist for repack_without_refs

756 - . refs.c: use packed refs when deleting refs during a transaction

757 - . refs.c: return error instead of dying when locking fails during transaction

758 - . refs.c: allow passing raw git_committer_info as email to _update_reflog

759 - (this branch is used by rs/ref-transaction-send-pack; uses rs/ref-transaction-reflog.)

760 -

761 - Stefan Beller started working on reorganizing these three series,

762 - which unfortunately did not see much reviews.

763 -

764 -

765 -* rs/ref-transaction-send-pack (2014-11-07) 7 commits

766 - . refs.c: add an err argument to create_symref

767 - . refs.c: add an err argument to create_reflog

768 - . t5543-atomic-push.sh: add basic tests for atomic pushes

769 - . push.c: add an --atomic-push argument

770 - . receive-pack.c: use a single transaction when atomic-push is negotiated

771 - . send-pack.c: add an --atomic-push command line argument

772 - . receive-pack.c: add protocol support to negotiate atomic-push

773 - (this branch uses rs/ref-transaction-reflog and rs/ref-transaction-rename.)

774 -

775 - Stefan Beller started working on reorganizing these three series,

776 - which unfortunately did not see much reviews.

777 -

778 -

779 -* sb/simplify-repack-without-refs (2014-11-20) 1 commit

780 - . refs.c: use a string_list for repack_without_refs

781 -

782 -

783 -* sb/log-ref-write-fd (2014-11-20) 1 commit

784 - . refs.c: add a function to append a reflog entry to a fd

785 -

786 - Will be rerolled as a part of a larger series.

787 -

788 -

789 -* sb/ref-transaction-unify-to-update (2014-11-20) 2 commits

790 - . refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

791 - . refs.c: make ref_transaction_create a wrapper for ref_transaction_update

792 - (this branch is used by sb/ref-transaction-reflog.)

793 -

794 - Code simplification.

795 -

796 - Will be rerolled as a part of a larger series.

797 -

798 -

799 -* sb/write-sha1-update-reflog (2014-11-24) 1 commit

800 - . refs.c: move reflog updates into its own function

801 -

802 - Moves a part of function around to add a helper that still only has

803 - one caller. Need to see how this helps in a bigger picture.

804 -

805 -

806 -* sb/ref-transaction-reflog (2014-12-03) 2 commits

807 - . refs.c: rename transaction.updates to transaction.ref_updates

808 - . refs.c: rename the transaction functions

809 - (this branch uses sb/ref-transaction-unify-to-update.)

810 -

811 - Will be rerolled as a part of a larger series.

What's cooking (2015/01 #01)