1fdbc5b426 · 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 (Sep 2014, #06; Wed, 24)

4 -X-master-at: 97b8860c071898d9e162678ea1035a8ced2f8b1f

5 -X-next-at: b8dfbefaa44d81ef4d724788e2b9e387ee7a8bf8

3 +Subject: What's cooking in git.git (Sep 2014, #07; Fri, 26)

4 +X-master-at: d29e9c89dbbf0876145dc88615b99308cab5f187

5 +X-next-at: 85a663a958ab88a0f5f6e875ec30a4bd3f14a9ad

6

7 -What's cooking in git.git (Sep 2014, #06; Wed, 24)

7 +What's cooking in git.git (Sep 2014, #07; Fri, 26)

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

9

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

@@ -17,77 +17,131 @@ of the repositories listed at

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

18

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

20 -[New Topics]

20 +[Graduated to "master"]

21

22 -* nd/archive-pathspec (2014-09-22) 1 commit

23 - - archive: support filtering paths with glob

22 +* jc/hash-object (2014-09-11) 3 commits

23 + (merged to 'next' on 2014-09-19 at ea6ac62)

24 + + hash-object: add --literally option

25 + + hash-object: pass 'write_object' as a flag

26 + + hash-object: reduce file-scope statics

27 + (this branch is used by jc/hash-object-fsck-tag.)

28

25 - "git archive" learned to filter what gets archived with pathspec.

29 + "hash-object" learned a new "--literally" option to hash any random

30 + garbage into a loose object, to allow us to create a test data for

31 + mechanisms to catch corrupt objects.

32

27 - Will merge to 'next'.

33

34 +* jc/hash-object-fsck-tag (2014-09-12) 2 commits

35 + (merged to 'next' on 2014-09-19 at f14a7fe)

36 + + t1450: make sure fsck detects a malformed tagger line

37 + + Merge branch 'js/fsck-tag-validation' into HEAD

38 + (this branch uses jc/hash-object and js/fsck-tag-validation.)

39

30 -* rs/graph-simplify (2014-09-22) 1 commit

31 - (merged to 'next' on 2014-09-23 at 72969e2)

32 - + graph: simplify graph_padding_line()

40 + Using "hash-object --literally", test one of the new breakages

41 + js/fsck-tag-validation topic teaches "fsck" to catch is caught.

42

34 - Will merge to 'master'.

43

44 +* jc/ignore-sigpipe-while-running-hooks (2014-09-16) 1 commit

45 + (merged to 'next' on 2014-09-19 at 7abf293)

46 + + receive-pack: allow hooks to ignore its standard input stream

47

37 -* rs/remote-simplify (2014-09-22) 1 commit

38 - (merged to 'next' on 2014-09-23 at 176e316)

39 - + remote: simplify match_name_with_pattern() using strbuf

48 + pre- and post-receive hooks are no longer required to read all

49 + their inputs.

50

41 - Will merge to 'master'.

51

52 +* jk/branch-verbose-merged (2014-09-18) 1 commit

53 + (merged to 'next' on 2014-09-23 at d940d15)

54 + + branch: clean up commit flags after merge-filter walk

55

44 -* sb/merge-recursive-copy-paste-fix (2014-09-23) 2 commits

45 - (merged to 'next' on 2014-09-24 at b8dfbef)

46 - + merge-recursive: remove stale commented debugging code

47 - + merge-recursive: fix copy-paste mistake

56 + The "--verbose" option no longer breaks "git branch --merged $it".

57

49 - "git merge-recursive" had a small bug that could have made it

50 - mishandle "one side deleted, the other side did not touch it" in a

51 - rare corner case, where the other side actually did touch to cause

52 - the blob object names to be different but both blobs before and

53 - after the change normalize to the same (e.g. correcting mistake to

54 - check in a blob with CRLF line endings by replacing it with another

55 - blob that records the same contents with LF line endings).

58

57 - Will merge to 'master'.

59 +* jk/close-stderr-of-credential-cache-deamon (2014-09-16) 1 commit

60 + (merged to 'next' on 2014-09-19 at 51ba3be)

61 + + credential-cache: close stderr in daemon process

62

63 + Plug fd leaks.

64

60 -* sb/t6031-typofix (2014-09-22) 1 commit

61 - (merged to 'next' on 2014-09-23 at aec57a9)

62 - + t6031-test-merge-recursive: do not forget to add file to be committed

65

64 - Will merge to 'master'.

66 +* jk/faster-name-conflicts (2014-09-12) 1 commit

67 + (merged to 'next' on 2014-09-19 at 34d2840)

68 + + refs: speed up is_refname_available

69

70 + Optimize the check to see if a ref $F can be created by making sure

71 + no existing ref has $F/ as its prefix, which especially matters in

72 + a repository with a large number of existing refs.

73

67 -* sb/t9300-typofix (2014-09-22) 1 commit

68 - (merged to 'next' on 2014-09-23 at aa519bd)

69 - + t9300-fast-import: fix typo in test description

74

71 - Will merge to 'master'.

75 +* jk/prune-packed-server-info (2014-09-15) 4 commits

76 + (merged to 'next' on 2014-09-19 at 5e6c398)

77 + + repack: call prune_packed_objects() and update_server_info() directly

78 + + server-info: clean up after writing info/packs

79 + + make update-server-info more robust

80 + + prune-packed: fix minor memory leak

81

82 + Code cleanup.

83

74 -* so/rebase-doc-fork-point (2014-09-22) 1 commit

75 - - Documentation/git-rebase.txt: document when --fork-point is auto-enabled

84

85 +* jk/write-packed-refs-via-stdio (2014-09-10) 1 commit

86 + (merged to 'next' on 2014-09-19 at f1e94fb)

87 + + refs: write packed_refs file using stdio

88

78 -* sk/tag-contains-wo-recursion (2014-09-23) 1 commit

79 - - t7004: give the test a bit more stack space

89 + Optimize the code path to write out the packed-refs file, which

90 + especially matters in a repository with a large number of refs.

91

92

82 -* jt/itimer-autoconf (2014-08-29) 3 commits

83 - - autoconf: check for setitimer()

84 - - autoconf: check for struct itimerval

85 - - git-compat-util.h: add missing semicolon after struct itimerval

86 - (this branch is used by jt/timer-settime.)

93 +* js/fsck-tag-validation (2014-09-12) 6 commits

94 + (merged to 'next' on 2014-09-19 at 4a62182)

95 + + Make sure that index-pack --strict checks tag objects

96 + + Add regression tests for stricter tag fsck'ing

97 + + fsck: check tag objects' headers

98 + + Make sure fsck_commit_buffer() does not run out of the buffer

99 + + fsck_object(): allow passing object data separately from the object itself

100 + + Refactor type_from_string() to allow continuing after detecting an error

101 + (this branch is used by jc/hash-object-fsck-tag.)

102

88 - Split the early part of jt/timer-settime topic out into a topic.

103 + Teach "git fsck" to inspect the contents of annotated tag objects.

104 +

105 +

106 +* rs/realloc-array (2014-09-18) 2 commits

107 + (merged to 'next' on 2014-09-23 at a5bb3a6)

108 + + use REALLOC_ARRAY for changing the allocation size of arrays

109 + + add macro REALLOC_ARRAY

110 +

111 + Code cleanup.

112

90 - Will merge to 'next'.

113 +

114 +* sb/help-unknown-command-sort-fix (2014-09-18) 1 commit

115 + (merged to 'next' on 2014-09-23 at 6ab29ed)

116 + + help: fix the size passed to qsort

117 +

118 + Code cleanup.

119 +

120 +--------------------------------------------------

121 +[New Topics]

122 +

123 +* jc/push-cert-hmac-optim (2014-09-25) 2 commits

124 + - receive-pack: truncate hmac early and convert only necessary bytes

125 + - sha1_to_hex: split out "hex-format n bytes" helper and use it

126 + (this branch uses jc/push-cert.)

127 +

128 + This is "we could do this if we wanted to", not "we measured and it

129 + improves performance critical codepath".

130 +

131 + Will perhaps drop.

132 +

133 +

134 +* je/quiltimport-no-fuzz (2014-09-26) 2 commits

135 + - git-quiltimport: flip the default not to allow fuzz

136 + - git-quiltimport.sh: allow declining fuzz with --exact option

137 +

138 + "quiltimport" drove "git apply" always with -C1 option to reduce

139 + context of the patch in order to give more chance to somewhat stale

140 + patches to apply. Add an "--exact" option to disable, and also

141 + "-C$n" option to customize this behaviour. The top patch

142 + optionally flips the default to "--exact".

143 +

144 + Waiting for an Ack.

145

146 --------------------------------------------------

147 [Stalled]

@@ -135,7 +189,7 @@ of the repositories listed at

189 with conflicts the person who recorded the merge would have seen

190 and the final conflict resolution that was recorded in the merge.

191

138 - Review comments sent.

192 + Waiting for a reroll ($gmane/256591).

193

194

195 * hv/submodule-config (2014-06-30) 4 commits

@@ -322,23 +376,80 @@ of the repositories listed at

376 --------------------------------------------------

377 [Cooking]

378

325 -* jk/faster-name-conflicts (2014-09-12) 1 commit

326 - (merged to 'next' on 2014-09-19 at 34d2840)

327 - + refs: speed up is_refname_available

379 +* nd/archive-pathspec (2014-09-22) 1 commit

380 + (merged to 'next' on 2014-09-25 at 8806f93)

381 + + archive: support filtering paths with glob

382

329 - Optimize the check to see if a ref $F can be created by making sure

330 - no existing ref has $F/ as its prefix, which especially matters in

331 - a repository with a large number of existing refs.

383 + "git archive" learned to filter what gets archived with pathspec.

384

385 Will merge to 'master'.

386

387

336 -* jk/write-packed-refs-via-stdio (2014-09-10) 1 commit

337 - (merged to 'next' on 2014-09-19 at f1e94fb)

338 - + refs: write packed_refs file using stdio

388 +* rs/graph-simplify (2014-09-22) 1 commit

389 + (merged to 'next' on 2014-09-23 at 72969e2)

390 + + graph: simplify graph_padding_line()

391

340 - Optimize the code path to write out the packed-refs file, which

341 - especially matters in a repository with a large number of refs.

392 + Will merge to 'master'.

393 +

394 +

395 +* rs/remote-simplify (2014-09-22) 1 commit

396 + (merged to 'next' on 2014-09-23 at 176e316)

397 + + remote: simplify match_name_with_pattern() using strbuf

398 +

399 + Will merge to 'master'.

400 +

401 +

402 +* sb/merge-recursive-copy-paste-fix (2014-09-23) 2 commits

403 + (merged to 'next' on 2014-09-24 at b8dfbef)

404 + + merge-recursive: remove stale commented debugging code

405 + + merge-recursive: fix copy-paste mistake

406 +

407 + "git merge-recursive" had a small bug that could have made it

408 + mishandle "one side deleted, the other side did not touch it" in a

409 + rare corner case, where the other side actually did touch to cause

410 + the blob object names to be different but both blobs before and

411 + after the change normalize to the same (e.g. correcting mistake to

412 + check in a blob with CRLF line endings by replacing it with another

413 + blob that records the same contents with LF line endings).

414 +

415 + Will merge to 'master'.

416 +

417 +

418 +* sb/t6031-typofix (2014-09-22) 1 commit

419 + (merged to 'next' on 2014-09-23 at aec57a9)

420 + + t6031-test-merge-recursive: do not forget to add file to be committed

421 +

422 + Will merge to 'master'.

423 +

424 +

425 +* sb/t9300-typofix (2014-09-22) 1 commit

426 + (merged to 'next' on 2014-09-23 at aa519bd)

427 + + t9300-fast-import: fix typo in test description

428 +

429 + Will merge to 'master'.

430 +

431 +

432 +* so/rebase-doc-fork-point (2014-09-22) 1 commit

433 + - Documentation/git-rebase.txt: document when --fork-point is auto-enabled

434 +

435 + Expecting a reroll ($gmane/257378).

436 +

437 +

438 +* sk/tag-contains-wo-recursion (2014-09-23) 1 commit

439 + - t7004: give the test a bit more stack space

440 +

441 + Waiting for an Ack ($gmane/257448).

442 +

443 +

444 +* jt/itimer-autoconf (2014-08-29) 3 commits

445 + (merged to 'next' on 2014-09-25 at efd65ba)

446 + + autoconf: check for setitimer()

447 + + autoconf: check for struct itimerval

448 + + git-compat-util.h: add missing semicolon after struct itimerval

449 + (this branch is used by jt/timer-settime.)

450 +

451 + setitmer(2) and related API elements can be configured from

452 + Makefile but autoconf did not know about it.

453

454 Will merge to 'master'.

455

@@ -349,6 +460,10 @@ of the repositories listed at

460 - Makefile: add check-headers target

461 - cleanups: ensure that git-compat-util.h is included first

462

463 + So... what is happening to this topic? I think the bottom one is a

464 + reasonable clean-up without too much churn, but I am not sure about

465 + the rest.

466 +

467

468 * da/rev-parse-verify-quiet (2014-09-19) 4 commits

469 (merged to 'next' on 2014-09-23 at 5ed184a)

@@ -375,25 +490,6 @@ of the repositories listed at

490 Will merge to 'master'.

491

492

378 -* jc/ignore-sigpipe-while-running-hooks (2014-09-16) 1 commit

379 - (merged to 'next' on 2014-09-19 at 7abf293)

380 - + receive-pack: allow hooks to ignore its standard input stream

381 -

382 - pre- and post-receive hooks are no longer required to read all

383 - their inputs.

384 -

385 - Will merge to 'master'.

386 -

387 -

388 -* jk/close-stderr-of-credential-cache-deamon (2014-09-16) 1 commit

389 - (merged to 'next' on 2014-09-19 at 51ba3be)

390 - + credential-cache: close stderr in daemon process

391 -

392 - Plug fd leaks.

393 -

394 - Will merge to 'master'.

395 -

396 -

493 * jk/mbox-from-line (2014-09-22) 2 commits

494 (merged to 'next' on 2014-09-23 at 506b89b)

495 + mailinfo: work around -Wstring-plus-int warning

@@ -407,18 +503,6 @@ of the repositories listed at

503 Will merge to 'master'.

504

505

410 -* jk/prune-packed-server-info (2014-09-15) 4 commits

411 - (merged to 'next' on 2014-09-19 at 5e6c398)

412 - + repack: call prune_packed_objects() and update_server_info() directly

413 - + server-info: clean up after writing info/packs

414 - + make update-server-info more robust

415 - + prune-packed: fix minor memory leak

416 -

417 - Code cleanup.

418 -

419 - Will merge to 'master'.

420 -

421 -

506 * pr/use-default-sigpipe-setting (2014-09-22) 2 commits

507 (merged to 'next' on 2014-09-24 at 2d678ed)

508 + mingw.h: add dummy functions for sigset_t operations

@@ -431,84 +515,17 @@ of the repositories listed at

515 Will merge to 'master'.

516

517

434 -* rs/realloc-array (2014-09-18) 2 commits

435 - (merged to 'next' on 2014-09-23 at a5bb3a6)

436 - + use REALLOC_ARRAY for changing the allocation size of arrays

437 - + add macro REALLOC_ARRAY

438 -

439 - Code cleanup.

440 -

441 - Will merge to 'master'.

442 -

443 -

444 -* jk/branch-verbose-merged (2014-09-18) 1 commit

445 - (merged to 'next' on 2014-09-23 at d940d15)

446 - + branch: clean up commit flags after merge-filter walk

447 -

448 - The "--verbose" option no longer breaks "git branch --merged $it".

449 -

450 - Will merge to 'master'.

451 -

452 -

453 -* sb/help-unknown-command-sort-fix (2014-09-18) 1 commit

454 - (merged to 'next' on 2014-09-23 at 6ab29ed)

455 - + help: fix the size passed to qsort

456 -

457 - Code cleanup.

458 -

459 - Will merge to 'master'.

460 -

461 -

462 -* jc/hash-object (2014-09-11) 3 commits

463 - (merged to 'next' on 2014-09-19 at ea6ac62)

464 - + hash-object: add --literally option

465 - + hash-object: pass 'write_object' as a flag

466 - + hash-object: reduce file-scope statics

467 - (this branch is used by jc/hash-object-fsck-tag.)

468 -

469 - "hash-object" learned a new "--literally" option to hash any random

470 - garbage into a loose object, to allow us to create a test data for

471 - mechanisms to catch corrupt objects.

472 -

473 - Will merge to 'master'.

474 -

475 -

476 -* jc/hash-object-fsck-tag (2014-09-12) 2 commits

477 - (merged to 'next' on 2014-09-19 at f14a7fe)

478 - + t1450: make sure fsck detects a malformed tagger line

479 - + Merge branch 'js/fsck-tag-validation' into HEAD

480 - (this branch uses jc/hash-object and js/fsck-tag-validation.)

481 -

482 - Using "hash-object --literally", test one of the new breakages

483 - js/fsck-tag-validation topic teaches "fsck" to catch is caught.

484 -

485 - Will merge to 'master'.

486 -

487 -

488 -* js/fsck-tag-validation (2014-09-12) 6 commits

489 - (merged to 'next' on 2014-09-19 at 4a62182)

490 - + Make sure that index-pack --strict checks tag objects

491 - + Add regression tests for stricter tag fsck'ing

492 - + fsck: check tag objects' headers

493 - + Make sure fsck_commit_buffer() does not run out of the buffer

494 - + fsck_object(): allow passing object data separately from the object itself

495 - + Refactor type_from_string() to allow continuing after detecting an error

496 - (this branch is used by jc/hash-object-fsck-tag.)

497 -

498 - Teach "git fsck" to inspect the contents of annotated tag objects.

499 -

500 - Will merge to 'master'.

501 -

502 -

503 -* mh/lockfile (2014-09-16) 35 commits

518 +* mh/lockfile (2014-09-26) 38 commits

519 + - hold_locked_index(): move from lockfile.c to read-cache.c

520 + - hold_lock_file_for_append(): restore errno before returning

521 - get_locked_file_path(): new function

522 - lockfile.c: rename static functions

523 - lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF

507 - - commit_locked_index(): extract a function commit_lock_file_to()

524 + - commit_lock_file_to(): refactor a helper out of commit_lock_file()

525 - trim_last_path_component(): replace last_path_elm()

526 - resolve_symlink(): take a strbuf parameter

527 - resolve_symlink(): use a strbuf for internal scratch space

511 - - struct lock_file: change the filename member into a strbuf

528 + - lockfile: change lock_file::filename into a strbuf

529 - commit_lock_file(): use a strbuf to manage temporary space

530 - try_merge_strategy(): use a statically-allocated lock_file object

531 - try_merge_strategy(): remove redundant lock_file allocation

@@ -518,7 +535,7 @@ of the repositories listed at

535 - dump_marks(): remove a redundant call to rollback_lock_file()

536 - api-lockfile: document edge cases

537 - commit_lock_file(): rollback lock file on failure to rename

521 - - commit_lock_file(): if close fails, roll back

538 + - close_lock_file(): if close fails, roll back

539 - commit_lock_file(): die() if called for unlocked lockfile object

540 - commit_lock_file(): inline temporary variable

541 - remove_lock_file(): call rollback_lock_file()

@@ -528,16 +545,20 @@ of the repositories listed at

545 - delete_ref_loose(): don't muck around in the lock_file's filename

546 - cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN

547 - lockfile.c: document the various states of lock_file objects

531 - - lock_file(): always add lock_file object to lock_file_list

548 + - lock_file(): always initialize and register lock_file object

549 - hold_lock_file_for_append(): release lock on errors

550 - lockfile: unlock file if lockfile permissions cannot be adjusted

551 - rollback_lock_file(): set fd to -1

552 - rollback_lock_file(): exit early if lock is not active

553 - rollback_lock_file(): do not clear filename redundantly

537 - - api-lockfile: expand the documentation

554 + - close_lock_file(): exit (successfully) if file is already closed

555 + - api-lockfile: revise and expand the documentation

556 - unable_to_lock_die(): rename function from unable_to_lock_index_die()

557

540 - Rerolled, reviews in progress; it seems that we will see another reroll?

558 + Rerolled, reviews in progress.

559 +

560 + Interacts with jk/write-packed-refs-via-stdio topic that has recently

561 + graduated in an unfortunate way.

562

563

564 * nd/multiple-work-trees (2014-09-16) 32 commits

@@ -578,7 +599,7 @@ of the repositories listed at

599 rely on symbolic links and make sharing of objects and refs safer

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

601

581 - Rerolled, reviews in progress; it seems that we will see another reroll?

602 + Waiting for a reroll ($gmane/257496).

603

604

605 * cc/interpret-trailers (2014-09-22) 11 commits

@@ -599,7 +620,7 @@ of the repositories listed at

620

621 Discussion on the topic with Michael Tsirkin who wants to utilize

622 this machinery is going on. Finally a real functionality review

602 - that is very much welcomed ;-).

623 + that is very much welcomed.

624

625

626 * sp/stream-clean-filter (2014-09-22) 7 commits

@@ -614,7 +635,9 @@ of the repositories listed at

635 Will merge to 'next'.

636

637

617 -* jc/push-cert (2014-09-17) 23 commits

638 +* jc/push-cert (2014-09-25) 24 commits

639 + (merged to 'next' on 2014-09-25 at 3eb1d69)

640 + + receive-pack::hmac_sha1(): copy the entire SHA-1 hash out

641 (merged to 'next' on 2014-09-24 at a99f5d8)

642 + signed push: allow stale nonce in stateless mode

643 + signed push: teach smart-HTTP to pass "git push --signed" around

@@ -639,6 +662,7 @@ of the repositories listed at

662 + receive-pack: do not reuse old_sha1[] for other things

663 + receive-pack: parse feature request a bit earlier

664 + receive-pack: do not overallocate command structure

665 + (this branch is used by jc/push-cert-hmac-optim.)

666

667 Allow "git push" request to be signed, so that it can be verified and

668 audited, using the GPG signature of the person who pushed, that the

@@ -649,11 +673,12 @@ of the repositories listed at

673

674

675 * jc/test-lazy-prereq (2014-06-13) 1 commit

652 - - tests: drop GIT_*_TIMING_TESTS environment variable support

676 + (merged to 'next' on 2014-09-25 at ed479f3)

677 + + tests: drop GIT_*_TIMING_TESTS environment variable support

678

679 Test-script clean-up.

680

656 - Will merge to 'next'.

681 + Will merge to 'master'.

682

683

684 * mt/patch-id-stable (2014-06-10) 1 commit

What's cooking (2014/09 #07)