781f47d1bc · 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 (Aug 2016, #04; Thu, 11)

4 -X-master-at: a42d7b6a5b5addcce01f483547ad96825c7a96e0

5 -X-next-at: 6810c6f841759a3ef9550927d6a884fffbc88cda

3 +Subject: What's cooking in git.git (Aug 2016, #05; Fri, 12)

4 +X-master-at: 2376d31787760af598db23bb3982a57419854e5c

5 +X-next-at: 4aa545fa7b5b325b00b863a1c813d5cd62d60123

6

7 -What's cooking in git.git (Aug 2016, #04; Thu, 11)

7 +What's cooking in git.git (Aug 2016, #05; Fri, 12)

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

9

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

@@ -12,9 +12,13 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -The 'maint' branch has been accumulating enough material to make it

16 -the next maintenance release v2.9.3, which hopefully happen very

17 -soon.

15 +v2.9.3 has been tagged as the third maintenance release for 2.9

16 +series. I am planning to tag v2.10-rc0 preview this weekend. As

17 +the topics that are still in-flight (either in 'pu' or still

18 +outside) are mostly multi-patch series that can have large impact,

19 +I think it is safe to say that they are not likely to be in the

20 +upcoming 2.10 but some of them may hit 'next' during the pre-release

21 +feature freeze. We'll see.

22

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

24 of the repositories listed at

@@ -24,169 +28,132 @@ of the repositories listed at

28 --------------------------------------------------

29 [Graduated to "master"]

30

27 -* cc/mailmap-tuxfamily (2016-08-08) 1 commit

28 - (merged to 'next' on 2016-08-10 at 5905fbf)

29 - + .mailmap: use Christian Couder's Tuxfamily address

30 -

31 -

32 -* jk/completion-diff-submodule (2016-08-09) 1 commit

33 - (merged to 'next' on 2016-08-10 at 146ca11)

34 - + completion: add completion for --submodule=* diff option

35 -

36 -

37 -* jk/push-force-with-lease-creation (2016-08-04) 4 commits

38 - (merged to 'next' on 2016-08-04 at e42ce85)

39 - + t5533: make it pass on case-sensitive filesystems

40 - (merged to 'next' on 2016-08-03 at 475c080)

41 - + push: allow pushing new branches with --force-with-lease

42 - + push: add shorthand for --force-with-lease branch creation

43 - + Documentation/git-push: fix placeholder formatting

44 -

45 - "git push --force-with-lease" already had enough logic to allow

46 - ensuring that such a push results in creation of a ref (i.e. the

47 - receiving end did not have another push from sideways that would be

48 - discarded by our force-pushing), but didn't expose this possibility

49 - to the users. It does so now.

50 -

51 -

52 -* jk/reset-ident-time-per-commit (2016-08-01) 1 commit

53 - (merged to 'next' on 2016-08-03 at 76d569c)

54 - + am: reset cached ident date for each patch

55 -

56 - Not-so-recent rewrite of "git am" that started making internal

57 - calls into the commit machinery had an unintended regression, in

58 - that no matter how many seconds it took to apply many patches, the

59 - resulting committer timestamp for the resulting commits were all

60 - the same.

61 -

62 -

63 -* js/am-3-merge-recursive-direct (2016-08-01) 16 commits

64 - (merged to 'next' on 2016-08-05 at dc1c9bb)

65 - + merge-recursive: flush output buffer even when erroring out

66 - + merge_trees(): ensure that the callers release output buffer

67 - + merge-recursive: offer an option to retain the output in 'obuf'

68 - + merge-recursive: write the commit title in one go

69 - + merge-recursive: flush output buffer before printing error messages

70 - + am -3: use merge_recursive() directly again

71 - + merge-recursive: switch to returning errors instead of dying

72 - + merge-recursive: handle return values indicating errors

73 - + merge-recursive: allow write_tree_from_memory() to error out

74 - + merge-recursive: avoid returning a wholesale struct

75 - + merge_recursive: abort properly upon errors

76 - + prepare the builtins for a libified merge_recursive()

77 - + merge-recursive: clarify code in was_tracked()

78 - + die(_("BUG")): avoid translating bug messages

79 - + die("bug"): report bugs consistently

80 - + t5520: verify that `pull --rebase` shows the helpful advice when failing

81 -

82 - "git am -3" calls "git merge-recursive" when it needs to fall back

83 - to a three-way merge; this call has been turned into an internal

84 - subroutine call instead of spawning a separate subprocess.

85 -

86 -

87 -* js/commit-slab-decl-fix (2016-08-09) 2 commits

88 - (merged to 'next' on 2016-08-10 at 6675402)

89 - + commit-slab.h: avoid duplicated global static variables

90 - + config.c: avoid duplicated global static variables

91 -

92 -

93 -* jt/format-patch-from-config (2016-08-01) 1 commit

94 - (merged to 'next' on 2016-08-05 at 897e986)

95 - + format-patch: format.from gives the default for --from

96 -

97 - "git format-patch" learned format.from configuration variable to

98 - specify the default settings for its "--from" option.

99 -

100 -

101 -* sb/submodule-update-dot-branch (2016-08-10) 8 commits

102 - (merged to 'next' on 2016-08-10 at 40ba945)

103 - + t7406: fix breakage on OSX

104 - (merged to 'next' on 2016-08-04 at 47bff41)

105 - + submodule update: allow '.' for branch value

106 - + submodule--helper: add remote-branch helper

107 - + submodule-config: keep configured branch around

108 - + submodule--helper: fix usage string for relative-path

109 - + submodule update: narrow scope of local variable

110 - + submodule update: respect depth in subsequent fetches

111 - + t7406: future proof tests with hard coded depth

112 -

113 - A few updates to "git submodule update".

114 -

115 ---------------------------------------------------

116 -[New Topics]

31 +* ew/http-backend-batch-headers (2016-08-10) 1 commit

32 + (merged to 'next' on 2016-08-11 at 93476b4)

33 + + http-backend: buffer headers before sending

34

118 -* sb/submodule-clone-retry (2016-08-09) 1 commit

119 - (merged to 'next' on 2016-08-11 at 4600b20)

120 - + submodule--helper: use parallel processor correctly

35 + The http-backend (the server-side component of smart-http

36 + transport) used to trickle the HTTP header one at a time. Now

37 + these write(2)s are batched.

38

122 - Fix-up to an error codepath in a topic already in 'master'.

39

124 - Will merge to 'master'.

40 +* jk/big-and-future-archive-tar (2016-08-06) 1 commit

41 + (merged to 'next' on 2016-08-11 at 0abbd07)

42 + + archive-tar: make write_extended_header() void

43

44 + A small code clean-up.

45

127 -* vs/completion-branch-fully-spelled-d-m-r (2016-08-09) 1 commit

128 - (merged to 'next' on 2016-08-11 at a6f189c)

129 - + completion: complete --delete, --move, and --remotes for git branch

46

131 - Will merge to 'master'.

47 +* jk/trace-fixup (2016-08-05) 8 commits

48 + (merged to 'next' on 2016-08-11 at 56f7621)

49 + + trace: do not fall back to stderr

50 + + write_or_die: drop write_or_whine_pipe()

51 + + trace: disable key after write error

52 + + trace: correct variable name in write() error message

53 + + trace: cosmetic fixes for error messages

54 + + trace: use warning() for printing trace errors

55 + + trace: stop using write_or_whine_pipe()

56 + + trace: handle NULL argument in trace_disable()

57

58 + Various small fixups to the "GIT_TRACE" facility.

59

134 -* vs/typofix (2016-08-11) 1 commit

135 - (merged to 'next' on 2016-08-11 at 435c418)

136 - + Spelling fixes

60

138 - Will merge to 'master'.

61 +* js/import-tars-hardlinks (2016-08-03) 1 commit

62 + (merged to 'next' on 2016-08-11 at 034230e)

63 + + import-tars: support hard links

64

65 + "import-tars" fast-import script (in contrib/) used to ignore a

66 + hardlink target and replaced it with an empty file, which has been

67 + corrected to record the same blob as the other file the hardlink is

68 + shared with.

69

141 -* va/i18n (2016-08-10) 3 commits

142 - (merged to 'next' on 2016-08-11 at d6e1422)

143 - + i18n: git-stash: mark messages for translation

144 - + i18n: archive: mark errors for translation

145 - + i18n: setup: mark error messages for translation

70

147 - Will merge to 'master'.

71 +* js/mv-dir-to-new-directory (2016-08-08) 1 commit

72 + (merged to 'next' on 2016-08-11 at c806ba2)

73 + + git mv: do not keep slash in `git mv dir non-existing-dir/`

74

75 + "git mv dir non-existing-dir/" did not work in some environments

76 + the same way as existing mainstream platforms. The code now moves

77 + "dir" to "non-existing-dir", without relying on rename("A", "B/")

78 + that strips the trailing slash of '/'.

79

150 -* ew/http-backend-batch-headers (2016-08-10) 1 commit

151 - (merged to 'next' on 2016-08-11 at 93476b4)

152 - + http-backend: buffer headers before sending

80

154 - The http-backend (the server-side component of smart-http

155 - transport) used to trickle the HTTP header one at a time. Now

156 - these write(2)s are batched.

81 +* kw/patch-ids-optim (2016-08-11) 4 commits

82 + (merged to 'next' on 2016-08-11 at f3ba3d0)

83 + + rebase: avoid computing unnecessary patch IDs

84 + + patch-ids: add flag to create the diff patch id using header only data

85 + + patch-ids: replace the seen indicator with a commit pointer

86 + + patch-ids: stop using a hand-rolled hashmap implementation

87

158 - Will merge to 'master'.

88 + When "git rebase" tries to compare set of changes on the updated

89 + upstream and our own branch, it computes patch-id for all of these

90 + changes and attempts to find matches. This has been optimized by

91 + lazily computing the full patch-id (which is expensive) to be

92 + compared only for changes that touch the same set of paths.

93

94

95 * ms/document-pack-window-memory-is-per-thread (2016-08-10) 1 commit

96 (merged to 'next' on 2016-08-11 at 228e96d)

97 + document git-repack interaction of pack.threads and pack.windowMemory

98

165 - Will merge to 'master'.

99

100 +* rs/child-process-init (2016-08-05) 1 commit

101 + (merged to 'next' on 2016-08-11 at 860857b)

102 + + use CHILD_PROCESS_INIT to initialize automatic variables

103

168 -* jk/diff-submodule-diff-inline (2016-08-11) 5 commits

169 - - SQUASH??? clarify the if/{if/else} nesting

170 - - SQUASH???

171 - - diff: add SUBMODULE_DIFF format to display submodule diff

172 - - diff: add --line-prefix option for passing in a prefix

173 - - diff.c: remove output_prefix_length field

104 + A small code clean-up.

105

175 - The "git diff --submodule={short,log}" mechanism has been enhanced

176 - to allow "--submodule=diff" to show the patch between the submodule

177 - commits bound to the superproject.

106

107 +* rs/merge-add-strategies-simplification (2016-08-05) 1 commit

108 + (merged to 'next' on 2016-08-11 at 6b8dfc1)

109 + + merge: use string_list_split() in add_strategies()

110

180 -* jk/reduce-gc-aggressive-depth (2016-08-11) 1 commit

181 - (merged to 'next' on 2016-08-11 at 6810c6f)

182 - + gc: default aggressive depth to 50

111 + A small code clean-up.

112

184 - "git gc --aggressive" used to limit the delta-chain length to 250,

185 - which is way too deep for gaining additional space savings and is

186 - detrimental for runtime performance. The limit has been reduced to

187 - 50.

113

189 - Will hold to see if people scream.

114 +* rs/merge-recursive-string-list-init (2016-08-05) 1 commit

115 + (merged to 'next' on 2016-08-11 at 37e62ba)

116 + + merge-recursive: use STRING_LIST_INIT_NODUP

117 +

118 + A small code clean-up.

119 +

120 +

121 +* rs/use-strbuf-add-unique-abbrev (2016-08-06) 1 commit

122 + (merged to 'next' on 2016-08-11 at 81ac5ff)

123 + + use strbuf_add_unique_abbrev() for adding short hashes

124 +

125 + A small code clean-up.

126 +

127 +

128 +* sb/submodule-clone-retry (2016-08-09) 1 commit

129 + (merged to 'next' on 2016-08-11 at 4600b20)

130 + + submodule--helper: use parallel processor correctly

131 +

132 + Fix-up to an error codepath in a topic already in 'master'.

133 +

134 +

135 +* va/i18n (2016-08-10) 3 commits

136 + (merged to 'next' on 2016-08-11 at d6e1422)

137 + + i18n: git-stash: mark messages for translation

138 + + i18n: archive: mark errors for translation

139 + + i18n: setup: mark error messages for translation

140 +

141 +

142 +* vs/completion-branch-fully-spelled-d-m-r (2016-08-09) 1 commit

143 + (merged to 'next' on 2016-08-11 at a6f189c)

144 + + completion: complete --delete, --move, and --remotes for git branch

145 +

146 +

147 +* vs/typofix (2016-08-11) 1 commit

148 + (merged to 'next' on 2016-08-11 at 435c418)

149 + + Spelling fixes

150 +

151 +--------------------------------------------------

152 +[New Topics]

153 +

154 +* tb/t0027-raciness-fix (2016-08-12) 2 commits

155 + - convert: missing `LF will be replaced by CRLF

156 + - t0027: Correct raciness in NNO test

157

158 --------------------------------------------------

159 [Stalled]

@@ -491,25 +458,28 @@ of the repositories listed at

458 --------------------------------------------------

459 [Cooking]

460

494 -* jk/big-and-future-archive-tar (2016-08-06) 1 commit

495 - (merged to 'next' on 2016-08-11 at 0abbd07)

496 - + archive-tar: make write_extended_header() void

497 -

498 - A small code clean-up.

461 +* jk/diff-submodule-diff-inline (2016-08-11) 5 commits

462 + - SQUASH??? clarify the if/{if/else} nesting

463 + - SQUASH???

464 + - diff: add SUBMODULE_DIFF format to display submodule diff

465 + - diff: add --line-prefix option for passing in a prefix

466 + - diff.c: remove output_prefix_length field

467

500 - Will merge to 'master'.

468 + The "git diff --submodule={short,log}" mechanism has been enhanced

469 + to allow "--submodule=diff" to show the patch between the submodule

470 + commits bound to the superproject.

471

472

503 -* js/mv-dir-to-new-directory (2016-08-08) 1 commit

504 - (merged to 'next' on 2016-08-11 at c806ba2)

505 - + git mv: do not keep slash in `git mv dir non-existing-dir/`

473 +* jk/reduce-gc-aggressive-depth (2016-08-11) 1 commit

474 + (merged to 'next' on 2016-08-11 at 6810c6f)

475 + + gc: default aggressive depth to 50

476

507 - "git mv dir non-existing-dir/" did not work in some environments

508 - the same way as existing mainstream platforms. The code now moves

509 - "dir" to "non-existing-dir", without relying on rename("A", "B/")

510 - that strips the trailing slash of '/'.

477 + "git gc --aggressive" used to limit the delta-chain length to 250,

478 + which is way too deep for gaining additional space savings and is

479 + detrimental for runtime performance. The limit has been reduced to

480 + 50.

481

512 - Will merge to 'master'.

482 + Will hold to see if people scream.

483

484

485 * ks/pack-objects-bitmap (2016-08-09) 2 commits

@@ -521,42 +491,6 @@ of the repositories listed at

491 cf. <20160808181942.GD3995@teco.navytux.spb.ru>

492

493

524 -* rs/child-process-init (2016-08-05) 1 commit

525 - (merged to 'next' on 2016-08-11 at 860857b)

526 - + use CHILD_PROCESS_INIT to initialize automatic variables

527 -

528 - A small code clean-up.

529 -

530 - Will merge to 'master'.

531 -

532 -

533 -* rs/merge-add-strategies-simplification (2016-08-05) 1 commit

534 - (merged to 'next' on 2016-08-11 at 6b8dfc1)

535 - + merge: use string_list_split() in add_strategies()

536 -

537 - A small code clean-up.

538 -

539 - Will merge to 'master'.

540 -

541 -

542 -* rs/merge-recursive-string-list-init (2016-08-05) 1 commit

543 - (merged to 'next' on 2016-08-11 at 37e62ba)

544 - + merge-recursive: use STRING_LIST_INIT_NODUP

545 -

546 - A small code clean-up.

547 -

548 - Will merge to 'master'.

549 -

550 -

551 -* rs/use-strbuf-add-unique-abbrev (2016-08-06) 1 commit

552 - (merged to 'next' on 2016-08-11 at 81ac5ff)

553 - + use strbuf_add_unique_abbrev() for adding short hashes

554 -

555 - A small code clean-up.

556 -

557 - Will merge to 'master'.

558 -

559 -

494 * sb/submodule-clone-rr (2016-08-09) 9 commits

495 - submodule: try alternates when superproject has an alternate

496 - submodule helper: pass through --reference-if-able

@@ -591,34 +525,6 @@ of the repositories listed at

525 Waiting for review discussion to settle.

526

527

594 -* js/import-tars-hardlinks (2016-08-03) 1 commit

595 - (merged to 'next' on 2016-08-11 at 034230e)

596 - + import-tars: support hard links

597 -

598 - "import-tars" fast-import script (in contrib/) used to ignore a

599 - hardlink target and replaced it with an empty file, which has been

600 - corrected to record the same blob as the other file the hardlink is

601 - shared with.

602 -

603 - Will merge to 'master'.

604 -

605 -

606 -* jk/trace-fixup (2016-08-05) 8 commits

607 - (merged to 'next' on 2016-08-11 at 56f7621)

608 - + trace: do not fall back to stderr

609 - + write_or_die: drop write_or_whine_pipe()

610 - + trace: disable key after write error

611 - + trace: correct variable name in write() error message

612 - + trace: cosmetic fixes for error messages

613 - + trace: use warning() for printing trace errors

614 - + trace: stop using write_or_whine_pipe()

615 - + trace: handle NULL argument in trace_disable()

616 -

617 - Various small fixups to the "GIT_TRACE" facility.

618 -

619 - Will merge to 'master'.

620 -

621 -

528 * mh/diff-indent-heuristic (2016-08-04) 8 commits

529 - diff: improve positioning of add/delete blocks in diffs

530 - is_blank_line: take a single xrecord_t as argument

@@ -703,22 +609,6 @@ of the repositories listed at

609 Will hold to see if people scream.

610

611

706 -* kw/patch-ids-optim (2016-08-11) 4 commits

707 - (merged to 'next' on 2016-08-11 at f3ba3d0)

708 - + rebase: avoid computing unnecessary patch IDs

709 - + patch-ids: add flag to create the diff patch id using header only data

710 - + patch-ids: replace the seen indicator with a commit pointer

711 - + patch-ids: stop using a hand-rolled hashmap implementation

712 -

713 - When "git rebase" tries to compare set of changes on the updated

714 - upstream and our own branch, it computes patch-id for all of these

715 - changes and attempts to find matches. This has been optimized by

716 - lazily computing the full patch-id (which is expensive) to be

717 - compared only for changes that touch the same set of paths.

718 -

719 - Will merge to 'master'.

720 -

721 -

612 * jk/rebase-i-drop-ident-check (2016-07-29) 1 commit

613 - rebase-interactive: drop early check for valid ident

614

@@ -861,10 +751,10 @@ of the repositories listed at

751 would think.

752

753

864 -* pb/bisect (2016-08-02) 13 commits

754 +* pb/bisect (2016-08-12) 13 commits

755 . bisect--helper: `bisect_start` shell function partially in C

756 . bisect--helper: `get_terms` & `bisect_terms` shell function in C

867 - . bisect--helper: `bisect_next_check` shell function in C

757 + . bisect--helper: `bisect_next_check` & bisect_voc shell function in C

758 . bisect--helper: `check_and_set_terms` shell function in C

759 . bisect--helper: `bisect_write` shell function in C

760 . bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

What's cooking (2016/08 #05)