55ef5f0740 · matheusbsbs/matheus-bagliano

@@ -1,28 +1,35 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2014, #07; Tue, 28)

4 -X-master-at: fbecd99861ea5795aeba46faf2ac7a8c1b70d485

5 -X-next-at: fc743598c8bf35b48ad5cdbe5748e497b5f9c1a4

3 +Subject: What's cooking in git.git (Oct 2014, #08; Fri, 31)

4 +X-master-at: 4ace7ff4557350b7e0b57d024a2ea311b332e01d

5 +X-next-at: 35ae3ef5b2d45986e7e641c2f39b5c87b24ead08

6

7 -What's cooking in git.git (Oct 2014, #07; Tue, 28)

7 +What's cooking in git.git (Oct 2014, #08; Fri, 31)

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 -According to tinyurl.com/gitCal, the feature freeze for this cycle

15 -is scheduled for the end of this month. What's in the 'master'

16 -branch as of today looks more or less complete picture, I would

17 -think.

18 -

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

15 of the repositories listed at

16

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

18

19 --------------------------------------------------

25 -[New Topics]

20 +[Graduated to "master"]

21 +

22 +* bc/asciidoctor (2014-10-27) 4 commits

23 + (merged to 'next' on 2014-10-28 at a5b6349)

24 + + Documentation: remove Asciidoctor linkgit macro

25 + + Documentation: refactor common operations into variables

26 + (merged to 'next' on 2014-10-17 at 12ce2e2)

27 + + Documentation: implement linkgit macro for Asciidoctor

28 + + Documentation: move some AsciiDoc parameters into variables

29 +

30 + Add machinery to alternatively use AsciiDoctor to format our

31 + documentation.

32 +

33

34 * da/difftool (2014-10-28) 2 commits

35 (merged to 'next' on 2014-10-28 at 19da3f6)

@@ -32,8 +39,6 @@ of the repositories listed at

39 Allow diff tool backend to stop early by exiting with a non-zero

40 status.

41

35 - Will merge to 'master'.

36 -

42

43 * dm/port2zos (2014-10-27) 3 commits

44 (merged to 'next' on 2014-10-28 at d03d3ae)

@@ -41,19 +46,51 @@ of the repositories listed at

46 + Makefile: reorder linker flags in the git executable rule

47 + git-compat-util.h: support variadic macros with the XL C compiler

48

44 - z/OS port

49 + z/OS port.

50

46 - Will merge to 'master'.

51

52 +* jc/push-cert (2014-10-28) 1 commit

53 + (merged to 'next' on 2014-10-29 at d3ae2e4)

54 + + receive-pack: avoid minor leak in case start_async() fails

55

49 -* jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit

50 - - strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

56 + Leakfix for a topic that is already in 'master'.

57

52 - The commented output used to blindly add a SP before the payload

53 - line, resulting in "# \t<indented text>\n" when the payload began

54 - with a HT. Instead, produce "#\t<indented text>\n".

58

56 - Will merge to 'next' and cook throughout the remainder of the cycle.

59 +* jk/prune-mtime (2014-10-19) 28 commits

60 + (merged to 'next' on 2014-10-20 at fdd7ff6)

61 + + drop add_object_array_with_mode

62 + + revision: remove definition of unused 'add_object' function

63 + + pack-objects: double-check options before discarding objects

64 + + repack: pack objects mentioned by the index

65 + + pack-objects: use argv_array

66 + + reachable: use revision machinery's --indexed-objects code

67 + + rev-list: add --indexed-objects option

68 + + rev-list: document --reflog option

69 + + t5516: test pushing a tag of an otherwise unreferenced blob

70 + + traverse_commit_list: support pending blobs/trees with paths

71 + + make add_object_array_with_context interface more sane

72 + + write_sha1_file: freshen existing objects

73 + + pack-objects: match prune logic for discarding objects

74 + + pack-objects: refactor unpack-unreachable expiration check

75 + + prune: keep objects reachable from recent objects

76 + + sha1_file: add for_each iterators for loose and packed objects

77 + + count-objects: use for_each_loose_file_in_objdir

78 + + count-objects: do not use xsize_t when counting object size

79 + + prune-packed: use for_each_loose_file_in_objdir

80 + + reachable: mark index blobs as SEEN

81 + + prune: factor out loose-object directory traversal

82 + + reachable: reuse revision.c "add all reflogs" code

83 + + reachable: use traverse_commit_list instead of custom walk

84 + + clean up name allocation in prepare_revision_walk

85 + + object_array: add a "clear" function

86 + + object_array: factor out slopbuf-freeing logic

87 + + isxdigit: cast input to unsigned char

88 + + foreach_alt_odb: propagate return value from callback

89 +

90 + Tighten the logic to decide that an unreachable cruft is

91 + sufficiently old by covering corner cases such as an ancient object

92 + becoming reachable and then going unreachable again, in which case

93 + its retention period should be prolonged.

94

95

96 * mg/lib-gpg-ro-safety (2014-10-27) 1 commit

@@ -63,58 +100,41 @@ of the repositories listed at

100 In a tarball extract whose files are all read-only, running GPG

101 tests would have failed due to unwritable files.

102

66 - Will merge to 'master'.

67 -

68 -

69 -* rs/grep-color-words (2014-10-28) 1 commit

70 - (merged to 'next' on 2014-10-28 at 4e6659d)

71 - + grep: add color.grep.matchcontext and color.grep.matchselected

72 -

73 - Allow painting or not painting (partial) matches in context lines

74 - when showing "grep -C<num>" output in color.

75 -

76 - Will merge to 'master'.

103

104 +* oc/mergetools-beyondcompare (2014-10-21) 1 commit

105 + (merged to 'next' on 2014-10-24 at e9278e8)

106 + + mergetool: rename bc3 to bc

107

79 -* nd/untracked-cache (2014-10-27) 19 commits

80 - - t7063: tests for untracked cache

81 - - update-index: test the system before enabling untracked cache

82 - - update-index: manually enable or disable untracked cache

83 - - status: enable untracked cache

84 - - untracked cache: mark index dirty if untracked cache is updated

85 - - untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS

86 - - untracked cache: avoid racy timestamps

87 - - read-cache.c: split racy stat test to a separate function

88 - - untracked cache: invalidate at index addition or removal

89 - - untracked cache: load from UNTR index extension

90 - - untracked cache: save to an index extension

91 - - untracked cache: don't open non-existent .gitignore

92 - - untracked cache: mark what dirs should be recursed/saved

93 - - untracked cache: record/validate dir mtime and reuse cached output

94 - - untracked cache: make a wrapper around {open,read,close}dir()

95 - - untracked cache: invalidate dirs recursively if .gitignore changes

96 - - untracked cache: initial untracked cache validation

97 - - untracked cache: record .gitignore information and dir hierarchy

98 - - dir.c: optionally compute sha-1 of a .gitignore file

108 + Take --tool=bc for both BeyondCompare version 3 and 4.

109

110

111 * rb/pack-window-memory-config-doc (2014-10-28) 1 commit

112 (merged to 'next' on 2014-10-28 at fc74359)

113 + config.txt: pack.windowmemory limit applies per-thread

114

105 - Will merge to 'master'.

115

116 +* rs/child-process-init (2014-10-28) 1 commit

117 + (merged to 'next' on 2014-10-29 at 21a76a2)

118 + + api-run-command: add missing list item marker

119

108 -* jc/push-cert (2014-10-28) 1 commit

109 - - receive-pack: avoid minor leak in case start_async() fails

120

111 - Will merge to 'next'.

121 +* rs/grep-color-words (2014-10-28) 1 commit

122 + (merged to 'next' on 2014-10-28 at 4e6659d)

123 + + grep: add color.grep.matchcontext and color.grep.matchselected

124

125 + Allow painting or not painting (partial) matches in context lines

126 + when showing "grep -C<num>" output in color.

127

114 -* rs/use-child-process-init-more (2014-10-28) 1 commit

115 - - use child_process_init() to initialize struct child_process variables

128 +--------------------------------------------------

129 +[New Topics]

130 +

131 +* jc/merge-bases (2014-10-30) 2 commits

132 + - get_merge_bases(): always clean-up object flags

133 + - bisect: clean flags after checking merge bases

134

117 - Will merge to 'next'.

135 +

136 +* jk/cache-tree-protect-from-broken-libgit2 (2014-10-30) 1 commit

137 + - cache-tree: avoid infinite loop on zero-entry tree

138

139 --------------------------------------------------

140 [Stalled]

@@ -316,6 +336,48 @@ of the repositories listed at

336 --------------------------------------------------

337 [Cooking]

338

339 +* jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit

340 + (merged to 'next' on 2014-10-29 at 9167582)

341 + + strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

342 +

343 + The commented output used to blindly add a SP before the payload

344 + line, resulting in "# \t<indented text>\n" when the payload began

345 + with a HT. Instead, produce "#\t<indented text>\n".

346 +

347 + Will cook in 'next' throughout the remainder of the cycle.

348 +

349 +

350 +* nd/untracked-cache (2014-10-27) 19 commits

351 + - t7063: tests for untracked cache

352 + - update-index: test the system before enabling untracked cache

353 + - update-index: manually enable or disable untracked cache

354 + - status: enable untracked cache

355 + - untracked cache: mark index dirty if untracked cache is updated

356 + - untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS

357 + - untracked cache: avoid racy timestamps

358 + - read-cache.c: split racy stat test to a separate function

359 + - untracked cache: invalidate at index addition or removal

360 + - untracked cache: load from UNTR index extension

361 + - untracked cache: save to an index extension

362 + - untracked cache: don't open non-existent .gitignore

363 + - untracked cache: mark what dirs should be recursed/saved

364 + - untracked cache: record/validate dir mtime and reuse cached output

365 + - untracked cache: make a wrapper around {open,read,close}dir()

366 + - untracked cache: invalidate dirs recursively if .gitignore changes

367 + - untracked cache: initial untracked cache validation

368 + - untracked cache: record .gitignore information and dir hierarchy

369 + - dir.c: optionally compute sha-1 of a .gitignore file

370 +

371 +

372 +* rs/use-child-process-init-more (2014-10-30) 4 commits

373 + - bundle: split out ref writing from bundle_create

374 + - bundle: split out a helper function to compute and write prerequisites

375 + - bundle: split out a helper function to create pack data

376 + - use child_process_init() to initialize struct child_process variables

377 +

378 + Will merge to 'next'.

379 +

380 +

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

382 (merged to 'next' on 2014-10-28 at 4d0457c)

383 + Revert "grep: fix match highlighting for combined patterns with context lines"

@@ -328,15 +390,16 @@ of the repositories listed at

390

391

392 * jc/conflict-hint (2014-10-28) 4 commits

331 - - merge & sequencer: turn "Conflicts:" hint into a comment

332 - - builtin/commit.c: extract ignore_non_trailer() helper function

333 - - merge & sequencer: unify codepaths that write "Conflicts:" hint

334 - - builtin/merge.c: drop a parameter that is never used

393 + (merged to 'next' on 2014-10-29 at 693250f)

394 + + merge & sequencer: turn "Conflicts:" hint into a comment

395 + + builtin/commit.c: extract ignore_non_trailer() helper function

396 + + merge & sequencer: unify codepaths that write "Conflicts:" hint

397 + + builtin/merge.c: drop a parameter that is never used

398

399 Unlike all the other hints given in the commit log editor, the list

400 of conflicted paths were appended at the end without commented out.

401

339 - Will merge to 'next' and cook throughout the remainder of the cycle.

402 + Will cook in 'next' throughout the remainder of the cycle.

403

404

405 * jc/diff-b-m (2014-10-23) 1 commit

@@ -348,13 +411,6 @@ of the repositories listed at

411 Will cook in 'next' throughout the remainder of the cycle.

412

413

351 -* oc/mergetools-beyondcompare (2014-10-21) 1 commit

352 - (merged to 'next' on 2014-10-24 at e9278e8)

353 - + mergetool: rename bc3 to bc

354 -

355 - Will merge to 'master'.

356 -

357 -

414 * rs/ref-transaction-reflog (2014-10-22) 15 commits

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

416 - refs.c: remove lock_any_ref_for_update

@@ -411,59 +467,6 @@ of the repositories listed at

467 Reviews and comments?

468

469

414 -* bc/asciidoctor (2014-10-27) 4 commits

415 - (merged to 'next' on 2014-10-28 at a5b6349)

416 - + Documentation: remove Asciidoctor linkgit macro

417 - + Documentation: refactor common operations into variables

418 - (merged to 'next' on 2014-10-17 at 12ce2e2)

419 - + Documentation: implement linkgit macro for Asciidoctor

420 - + Documentation: move some AsciiDoc parameters into variables

421 -

422 - Add machinery to alternatively use AsciiDoctor to format our

423 - documentation.

424 -

425 - Will merge to 'master'

426 -

427 -

428 -* jk/prune-mtime (2014-10-19) 28 commits

429 - (merged to 'next' on 2014-10-20 at fdd7ff6)

430 - + drop add_object_array_with_mode

431 - + revision: remove definition of unused 'add_object' function

432 - + pack-objects: double-check options before discarding objects

433 - + repack: pack objects mentioned by the index

434 - + pack-objects: use argv_array

435 - + reachable: use revision machinery's --indexed-objects code

436 - + rev-list: add --indexed-objects option

437 - + rev-list: document --reflog option

438 - + t5516: test pushing a tag of an otherwise unreferenced blob

439 - + traverse_commit_list: support pending blobs/trees with paths

440 - + make add_object_array_with_context interface more sane

441 - + write_sha1_file: freshen existing objects

442 - + pack-objects: match prune logic for discarding objects

443 - + pack-objects: refactor unpack-unreachable expiration check

444 - + prune: keep objects reachable from recent objects

445 - + sha1_file: add for_each iterators for loose and packed objects

446 - + count-objects: use for_each_loose_file_in_objdir

447 - + count-objects: do not use xsize_t when counting object size

448 - + prune-packed: use for_each_loose_file_in_objdir

449 - + reachable: mark index blobs as SEEN

450 - + prune: factor out loose-object directory traversal

451 - + reachable: reuse revision.c "add all reflogs" code

452 - + reachable: use traverse_commit_list instead of custom walk

453 - + clean up name allocation in prepare_revision_walk

454 - + object_array: add a "clear" function

455 - + object_array: factor out slopbuf-freeing logic

456 - + isxdigit: cast input to unsigned char

457 - + foreach_alt_odb: propagate return value from callback

458 -

459 - Tighten the logic to decide that an unreachable cruft is

460 - sufficiently old by covering corner cases such as an ancient object

461 - becoming reachable and then going unreachable again, in which case

462 - its retention period should be prolonged.

463 -

464 - Will merge to 'master'.

465 -

466 -

470 * jc/checkout-local-track-report (2014-10-14) 1 commit

471 (merged to 'next' on 2014-10-21 at f636a00)

472 + checkout: report upstream correctly even with loosely defined branch.*.merge

What's cooking (2014/10 #08)