3f3ce10e31 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: bc97e2d8ae24dc2c8d06e616e20a0b4a47c58f67

5 -X-next-at: 4cf525ce1d2c8852398b34afa865f9fb26828d57

3 +Subject: What's cooking in git.git (Feb 2014, #05; Fri, 14)

4 +X-master-at: 5f95c9f850b19b368c43ae399cc831b17a26a5ac

5 +X-next-at: dc9e3eb950a3fce88e01983170c37200a6d34d8f

6

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

7 +What's cooking in git.git (Feb 2014, #05; Fri, 14)

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 -The tip of 'master' has been tagged as v1.9.0-rc3. As a workaround

15 -to make life easier for third-party tools, the upcoming major

16 -release will be called "Git 1.9.0" (not "Git 1.9"). The first

17 -maintenance release for it will be "Git 1.9.1", and the major

18 -release after "Git 1.9.0" will either be "Git 2.0.0" or "Git

19 -1.10.0".

14 +The tip of 'master' is v1.9.0. The first maintenance release for it

15 +will be "Git 1.9.1", and the major release after "Git 1.9.0" will

16 +either be "Git 2.0.0" or "Git 1.10.0".

17

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

19 of the repositories listed at

@@ -26,83 +23,20 @@ of the repositories listed at

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

24 [New Topics]

25

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 -

37 - Will merge to 'next'.

38 -

39 -

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 -

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

46 -

47 - Will merge to 'next'.

48 -

49 -

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 -

56 - Will merge to 'next'.

57 -

58 -

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

26 +* ks/tree-diff-nway (2014-02-14) 2 commits

27 + - combine-diff: speed it up, by using multiparent diff

28 + - tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

29 + (this branch uses ks/combine-diff, ks/tree-diff-more and ks/tree-diff-walk.)

30

31 + Instead of running N pair-wise diff-trees when inspecting a

32 + N-parent merge, find the set of paths that were touched by walking

33 + N+1 trees in parallel. These set of paths can then be turned into

34 + N pair-wise diff-tree results to be processed through rename

35 + detections and such. And N=2 case nicely degenerates to the usual

36 + 2-way diff-tree, which is very nice.

37

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

38 + Promising, but unfortunately the implementation seems a bit too

39 + unportable for such a core part of the system.

40

41 --------------------------------------------------

42 [Stalled]

@@ -391,6 +325,85 @@ of the repositories listed at

325 --------------------------------------------------

326 [Cooking]

327

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

329 + (merged to 'next' on 2014-02-13 at 4157cf3)

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

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

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

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

334 +

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

336 +

337 + Will cook in 'next'.

338 +

339 +

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

341 + (merged to 'next' on 2014-02-13 at cbedcb2)

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

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

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

345 +

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

347 +

348 + Will cook in 'next'.

349 +

350 +

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

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

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

354 +

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

356 +

357 + Will merge to 'next'.

358 +

359 +

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

361 + - dir: ignore trailing spaces in exclude patterns

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

363 +

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

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

366 +

367 +

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

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

370 +

371 +

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

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

374 +

375 +

376 +* ks/tree-diff-more (2014-02-13) 15 commits

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

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

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

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

381 + - tree-diff: simplify tree_entry_pathcmp

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

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

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

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

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

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

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

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

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

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

392 + (this branch is used by ks/tree-diff-nway; uses ks/combine-diff and ks/tree-diff-walk.)

393 +

394 +

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

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

397 +

398 +

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

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

401 +

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

403 +

404 + Will merge to and then cook in 'next'.

405 +

406 +

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

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

409 - t0003: do not chdir the whole test process

@@ -407,13 +420,15 @@ of the repositories listed at

420 repository, to also operate in a bare one.

421

422

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

423 +* nd/http-fetch-shallow-fix (2014-02-13) 7 commits

424 + (merged to 'next' on 2014-02-13 at 7ec3c2f)

425 + + t5537: move http tests out to t5539

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

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

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

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

430 + + test: rename http fetch and push test files

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

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

433

434 Attempting to deepen a shallow repository by fetching over smart

@@ -422,7 +437,7 @@ of the repositories listed at

437 shallow boundary commits after the sending end stopped talking to

438 it.

439

425 - Will merge to 'next'.

440 + Will cook in 'next'.

441

442

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

@@ -457,7 +472,7 @@ of the repositories listed at

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

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

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

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

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

476

477 Will cook in 'next'.

478

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

568 - combine-diff: optimize combine_diff_path sets intersection

569 - diff test: add tests for combine-diff with orderfile

570 - diffcore-order: export generic ordering interface

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

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

572

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

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

@@ -564,22 +579,23 @@ of the repositories listed at

579

580

581 * 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

570 - - rebase: don't try to match -M option

571 - - rebase: remove useless arguments check

572 - - am: add the --gpg-sign option

573 - - am: parse options in stuck-long mode

574 - - git-sh-setup.sh: add variable to use the stuck-long mode

575 - - cherry-pick, revert: add the --gpg-sign option

582 + (merged to 'next' on 2014-02-13 at 390376c)

583 + + pull: add the --gpg-sign option.

584 + + rebase: add the --gpg-sign option

585 + + rebase: parse options in stuck-long mode

586 + + rebase: don't try to match -M option

587 + + rebase: remove useless arguments check

588 + + am: add the --gpg-sign option

589 + + am: parse options in stuck-long mode

590 + + git-sh-setup.sh: add variable to use the stuck-long mode

591 + + cherry-pick, revert: add the --gpg-sign option

592

593 Teach "--gpg-sign" option to many commands that create commits.

594

595 Changes to some scripted Porcelains use unsafe variable

596 substitutions and still need to be tightened.

597

582 - Will merge to 'next'.

598 + Will cook in 'next'.

599

600

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

@@ -604,9 +620,9 @@ of the repositories listed at

620 Will cook in 'next'.

621

622

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

623 +* jk/repack-honor-pack-keep (2014-02-12) 1 commit

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

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

625 + (this branch uses jk/pack-bitmap.)

626

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

628 packs in newly created packfiles.

@@ -684,7 +700,8 @@ of the repositories listed at

700

701

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

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

703 + (merged to 'next' on 2014-02-13 at cc6f7eb)

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

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

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

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

@@ -693,7 +710,7 @@ of the repositories listed at

710

711 Code clean-up.

712

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

713 + Will cook in 'next'.

714

715

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

@@ -770,7 +787,8 @@ of the repositories listed at

787

788

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

773 - - ewah: unconditionally ntohll ewah data

790 + (merged to 'next' on 2014-02-13 at 591b040)

791 + + ewah: unconditionally ntohll ewah data

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

793 + ewah: support platforms that require aligned reads

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

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

817 + pack-objects: factor out name_hash

818 + pack-objects: refactor the packing list

819 + revindex: export new APIs

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

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

821

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

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

824 fully traverse the history.

825

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

826 + Will cook in 'next'.

827

828

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

What's cooking (2014/02 #05)