e4c448944a · 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 (Feb 2014, #03; Fri, 7)

4 -X-master-at: 6a7071958620dadcce84e4faaa470407ae3d4108

5 -X-next-at: 34970086681ea5b5ca7b0bdca6356de6004e0245

3 +Subject: What's cooking in git.git (Feb 2014, #04; Wed, 12)

4 +X-master-at: bc97e2d8ae24dc2c8d06e616e20a0b4a47c58f67

5 +X-next-at: 4cf525ce1d2c8852398b34afa865f9fb26828d57

6

7 -What's cooking in git.git (Feb 2014, #03; Fri, 7)

7 +What's cooking in git.git (Feb 2014, #04; Wed, 12)

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

9

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

@@ -24,56 +24,85 @@ of the repositories listed at

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

25

26 --------------------------------------------------

27 -[Graduated to "master"]

27 +[New Topics]

28

29 -* aj/ada-diff-word-pattern (2014-02-05) 1 commit

30 - (merged to 'next' on 2014-02-06 at 8062b22)

31 - + userdiff: update Ada patterns

29 +* al/docs (2014-02-11) 4 commits

30 + - docs/git-blame: explain more clearly the example pickaxe use

31 + - docs/git-clone: clarify use of --no-hardlinks option

32 + - docs/git-remote: capitalize first word of initial blurb

33 + - docs/merge-strategies: remove hyphen from mis-merges

34

35 + A handful of documentation updates, all trivially harmless.

36

34 -* nd/tag-doc (2014-02-04) 1 commit

35 - (merged to 'next' on 2014-02-06 at 9f02991)

36 - + git-tag.txt: <commit> for --contains is optional

37 + Will merge to 'next'.

38

39

39 -* ow/manpages-typofix (2014-02-05) 1 commit

40 - (merged to 'next' on 2014-02-06 at b482b8f)

41 - + Documentation: fix typos in man pages

40 +* jk/test-ports (2014-02-10) 2 commits

41 + - tests: auto-set git-daemon port

42 + - tests: auto-set LIB_HTTPD_PORT from test name

43 + (this branch is tangled with nd/http-fetch-shallow-fix.)

44

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

44 -[New Topics]

45 + Avoid having to assign port number to be used in tests manually.

46

46 -* jc/check-attr-honor-working-tree (2014-02-06) 2 commits

47 - - check-attr: move to the top of working tree when in non-bare repository

48 - - t0003: do not chdir the whole test process

47 + Will merge to 'next'.

48

50 - "git check-attr" when (trying to) work on a repository with a

51 - working tree did not work well when the working tree was specified

52 - via --work-tree (and obviously with --git-dir).

49

54 - The command also works in a bare repository but it reads from the

55 - (possibly stale, irrelevant and/or nonexistent) index, which may

56 - need to be fixed to read from HEAD, but that is a completely

57 - separate issue. As a related tangentto this separate issue, we may

58 - want to also fix "check-ignore", which refuses to work in a bare

59 - repository, to also operate in a bare one.

50 +* nd/daemonize-gc (2014-02-10) 2 commits

51 + - gc: config option for running --auto in background

52 + - daemon: move daemonize() to libgit.a

53

54 + Allow running "gc --auto" in the background.

55

62 -* nd/http-fetch-shallow-fix (2014-02-07) 6 commits

63 - - fetch-pack: fix deepen shallow over smart http with no-done cap

64 - - protocol-capabilities.txt: document no-done

65 - - protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt

66 - - pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done'

67 - - t5538: fix default http port

68 - - test: rename http fetch and push test files

56 + Will merge to 'next'.

57

70 - Attempting to deepen a shallow repository by fetching over smart

71 - HTTP transport failed in the protocol exchange, when no-done

72 - extension was used. The fetching side waited for the list of

73 - shallow boundary commits after the sending end stopped talking to

74 - it.

58

76 - Will merge to 'next'.

59 +* nd/gitignore-trailing-whitespace (2014-02-10) 2 commits

60 + - dir: ignore trailing spaces in exclude patterns

61 + - dir: warn about trailing spaces in exclude patterns

62 +

63 + Warn and then ignore trailing whitespaces in .gitignore files,

64 + unless they are quoted for fnmatch(3), e.g. "path\ ".

65 +

66 +

67 +* nd/log-show-linear-break (2014-02-10) 1 commit

68 + - log: add --show-linear-break to help see non-linear history

69 +

70 +

71 +* ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit

72 + - completion: teach --recurse-submodules to fetch, pull and push

73 +

74 +

75 +* ks/tree-diff-more (2014-02-12) 16 commits

76 + - tree-diff: reuse base str(buf) memory on sub-tree recursion

77 + - tree-diff: no need to call "full" diff_tree_sha1 from show_path()

78 + - tree-diff: rework diff_tree interface to be sha1 based

79 + - tree-diff: remove special-case diff-emitting code for empty-tree cases

80 + - tree-diff: simplify tree_entry_pathcmp

81 + - tree-diff: show_path prototype is not needed anymore

82 + - tree-diff: rename compare_tree_entry -> tree_entry_pathcmp

83 + - tree-diff: move all action-taking code out of compare_tree_entry()

84 + - tree-diff: don't assume compare_tree_entry() returns -1,0,1

85 + - FIXUP!

86 + - tree-diff: consolidate code for emitting diffs and recursion in one place

87 + - tree-diff: show_tree() is not needed

88 + - tree-diff: no need to pass match to skip_uninteresting()

89 + - tree-diff: no need to manually verify that there is no mode change for a path

90 + - combine-diff: move changed-paths scanning logic into its own function

91 + - combine-diff: move show_log_first logic/action out of paths scanning

92 + (this branch uses ks/combine-diff and ks/tree-diff-walk.)

93 +

94 +

95 +* jh/note-trees-record-blobs (2014-02-12) 1 commit

96 + - notes: Disallow reusing non-blob as a note object

97 +

98 +

99 +* jk/run-network-tests-by-default (2014-02-12) 1 commit

100 + - tests: turn on network daemon tests by default

101 +

102 + Teach "make test" to run networking tests when possible by default.

103 +

104 + Needs a bit more work.

105 + e.g. $gmane/242013

106

107 --------------------------------------------------

108 [Stalled]

@@ -362,6 +391,40 @@ of the repositories listed at

391 --------------------------------------------------

392 [Cooking]

393

394 +* jc/check-attr-honor-working-tree (2014-02-06) 2 commits

395 + - check-attr: move to the top of working tree when in non-bare repository

396 + - t0003: do not chdir the whole test process

397 +

398 + "git check-attr" when (trying to) work on a repository with a

399 + working tree did not work well when the working tree was specified

400 + via --work-tree (and obviously with --git-dir).

401 +

402 + The command also works in a bare repository but it reads from the

403 + (possibly stale, irrelevant and/or nonexistent) index, which may

404 + need to be fixed to read from HEAD, but that is a completely

405 + separate issue. As a related tangentto this separate issue, we may

406 + want to also fix "check-ignore", which refuses to work in a bare

407 + repository, to also operate in a bare one.

408 +

409 +

410 +* nd/http-fetch-shallow-fix (2014-02-10) 6 commits

411 + - fetch-pack: fix deepen shallow over smart http with no-done cap

412 + - protocol-capabilities.txt: document no-done

413 + - protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt

414 + - pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done'

415 + - test: rename http fetch and push test files

416 + - tests: auto-set LIB_HTTPD_PORT from test name

417 + (this branch is tangled with jk/test-ports.)

418 +

419 + Attempting to deepen a shallow repository by fetching over smart

420 + HTTP transport failed in the protocol exchange, when no-done

421 + extension was used. The fetching side waited for the list of

422 + shallow boundary commits after the sending end stopped talking to

423 + it.

424 +

425 + Will merge to 'next'.

426 +

427 +

428 * jk/makefile (2014-02-05) 16 commits

429 - FIXUP

430 - move LESS/LV pager environment to Makefile

@@ -394,6 +457,7 @@ of the repositories listed at

457 + line-log: convert to using diff_tree_sha1()

458 + tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL

459 + tree-diff: allow diff_tree_sha1 to accept NULL sha1

460 + (this branch is used by ks/combine-diff and ks/tree-diff-more.)

461

462 Will cook in 'next'.

463

@@ -482,13 +546,14 @@ of the repositories listed at

546 Will cook in 'next'.

547

548

485 -* ks/combine-diff (2014-02-05) 5 commits

486 - - combine-diff: move changed-paths scanning logic into its own function

487 - - combine-diff: move show_log_first logic/action out of paths scanning

488 - - tree-diff: no need to pass match to skip_uninteresting()

489 - - tree-diff: no need to manually verify that there is no mode change for a path

549 +* ks/combine-diff (2014-02-12) 6 commits

550 - tests: add checking that combine-diff emits only correct paths

491 - (this branch uses ks/diff-c-with-diff-order.)

551 + - combine-diff: simplify intersect_paths() further

552 + - combine-diff: combine_diff_path.len is not needed anymore

553 + - combine-diff: optimize combine_diff_path sets intersection

554 + - diff test: add tests for combine-diff with orderfile

555 + - diffcore-order: export generic ordering interface

556 + (this branch is used by ks/tree-diff-more; uses ks/tree-diff-walk.)

557

558 By avoiding running full two-way diff between the resulting

559 revision and each of its N parents, combine-diff can be sped up

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

563 Help in reviewing the series is very much appreciated.

564

565

501 -* bc/gpg-sign-everywhere (2014-02-03) 9 commits

566 +* bc/gpg-sign-everywhere (2014-02-11) 9 commits

567 - pull: add the --gpg-sign option.

568 - rebase: add the --gpg-sign option

569 - rebase: parse options in stuck-long mode

@@ -514,7 +579,7 @@ of the repositories listed at

579 Changes to some scripted Porcelains use unsafe variable

580 substitutions and still need to be tightened.

581

517 - Waiting for a reroll.

582 + Will merge to 'next'.

583

584

585 * ds/rev-parse-required-args (2014-01-28) 1 commit

@@ -541,7 +606,7 @@ of the repositories listed at

606

607 * jk/repack-honor-pack-keep (2014-01-28) 1 commit

608 - repack: add `repack.honorpackkeep` config var

544 - (this branch uses jk/pack-bitmap.)

609 + (this branch is tangled with jk/pack-bitmap.)

610

611 Optionally allow "git repack" to include objects that exist in kept

612 packs in newly created packfiles.

@@ -618,14 +683,17 @@ of the repositories listed at

683 - Add data structures and basic functions for commit trailers

684

685

621 -* dk/blame-janitorial (2014-01-22) 2 commits

686 +* dk/blame-janitorial (2014-02-12) 4 commits

687 + - blame.c: prepare_lines should not call xrealloc for every line

688 + (merged to 'next' on 2014-02-11 at 4af3ebd)

689 + + builtin/blame.c::prepare_lines: fix allocation size of sb->lineno

690 (merged to 'next' on 2014-01-29 at 0b7ea97)

691 + Eliminate same_suspect function in builtin/blame.c

692 + builtin/blame.c: struct blame_entry does not need a prev link

693

694 Code clean-up.

695

628 - Will cook in 'next'.

696 + Will merge to and cook in 'next'.

697

698

699 * ks/diff-c-with-diff-order (2014-02-03) 5 commits

@@ -635,7 +703,6 @@ of the repositories listed at

703 + combine-diff: optimize combine_diff_path sets intersection

704 + diff test: add tests for combine-diff with orderfile

705 + diffcore-order: export generic ordering interface

638 - (this branch is used by ks/combine-diff.)

706

707 Teach combine-diff to honour the path-output-order imposed by

708 diffcore-order.

@@ -702,7 +769,8 @@ of the repositories listed at

769 Expecting a reroll.

770

771

705 -* jk/pack-bitmap (2014-01-23) 25 commits

772 +* jk/pack-bitmap (2014-02-12) 26 commits

773 + - ewah: unconditionally ntohll ewah data

774 (merged to 'next' on 2014-01-27 at 0b1dcb5)

775 + ewah: support platforms that require aligned reads

776 + read-cache: use get_be32 instead of hand-rolled ntoh_l

@@ -731,13 +799,13 @@ of the repositories listed at

799 + pack-objects: factor out name_hash

800 + pack-objects: refactor the packing list

801 + revindex: export new APIs

734 - (this branch is used by jk/repack-honor-pack-keep.)

802 + (this branch is tangled with jk/repack-honor-pack-keep.)

803

804 Borrows the bitmap index into packfiles from JGit to speed up

805 enumeration of objects involved in a commit range without having to

806 fully traverse the history.

807

740 - Will cook in 'next'.

808 + Will merge to and cook in 'next'.

809

810

811 * nv/commit-gpgsign-config (2013-12-17) 3 commits

What's cooking (2014/02 #04)