b06305f5a4 · matheusbsbs/matheus-bagliano

@@ -1,17 +1,17 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Feb 2014, #01; Mon, 3)

4 -X-master-at: be961c292f1d36097afa1690df68cf90f655c855

5 -X-next-at: d198f5de1081dd0a829bcc347e50bf5423f2e778

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

4 +X-master-at: 89ba81dc7643f5b126b15b15a8dcd3893d05ee47

5 +X-next-at: ed4ee9f6d9847e9cfc1ea6faeea20ae612ccbcfb

6

7 -What's cooking in git.git (Feb 2014, #01; Mon, 3)

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

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' is at 1.9-rc2.

14 +v1.9.0-rc3 is expected to happen this weekend or early next week.

15

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

17 of the repositories listed at

@@ -21,86 +21,93 @@ of the repositories listed at

21 --------------------------------------------------

22 [New Topics]

23

24 -* bs/stdio-undef-before-redef (2014-01-31) 1 commit

25 - (merged to 'next' on 2014-01-31 at 9874918)

26 - + git-compat-util.h: #undef (v)snprintf before #define them

27 -

28 - When we replace broken macros from stdio.h in git-compat-util.h,

29 - #undef them to avoid re-definition warnings from the C

30 - preprocessor.

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

25 + - userdiff: update Ada patterns

26 +

27 + Will merge to 'next' and then to 'master'.

28 +

29 +

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

31 + - FIXUP

32 + - move LESS/LV pager environment to Makefile

33 + - Makefile: teach scripts to include make variables

34 + - FIXUP

35 + - Makefile: auto-build C strings from make variables

36 + - Makefile: drop *_SQ variables

37 + - FIXUP

38 + - Makefile: add c-quote helper function

39 + - Makefile: introduce sq function for shell-quoting

40 + - Makefile: always create files via make-var

41 + - Makefile: store GIT-* sentinel files in MAKE/

42 + - Makefile: prefer printf to echo for GIT-*

43 + - Makefile: use tempfile/mv strategy for GIT-*

44 + - Makefile: introduce make-var helper function

45 + - Makefile: fix git-instaweb dependency on gitweb

46 + - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS

47 +

48 +

49 +* ks/tree-diff-walk (2014-02-05) 4 commits

50 + - revision: convert to using diff_tree_sha1()

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

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

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

54

32 - Will cook in 'next'.

55 + Will merge to 'next'.

56

57

35 -* ep/varscope (2014-01-31) 7 commits

36 - (merged to 'next' on 2014-01-31 at d198f5d)

37 - + builtin/gc.c: reduce scope of variables

38 - + builtin/fetch.c: reduce scope of variable

39 - + builtin/commit.c: reduce scope of variables

40 - + builtin/clean.c: reduce scope of variable

41 - + builtin/blame.c: reduce scope of variables

42 - + builtin/apply.c: reduce scope of variables

43 - + bisect.c: reduce scope of variable

58 +* nd/reset-intent-to-add (2014-02-05) 1 commit

59 + - reset: support "--mixed --intent-to-add" mode

60

45 - Shrink lifetime of variables by moving their definitions to an

46 - inner scope where appropriate.

61 + Will merge to 'next'.

62

48 - Will cook in 'next'.

63

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

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

66

51 -* mw/symlinks (2014-02-03) 5 commits

52 - - setup: don't dereference in-tree symlinks for absolute paths

53 - - setup: add 'abspath_part_inside_repo' function

54 - - t0060: add tests for prefix_path when path begins with work tree

55 - - t0060: add test for prefix_path when path == work tree

56 - - t0060: add test for manipulating symlinks via absolute paths

67 + Will merge to 'next' and then to 'master'.

68

58 - All subcommands that take pathspecs mishandled an in-tree symbolic

59 - link when given it as a full path from the root (which arguably is

60 - a sick way to use pathspecs). "git ls-files -s $(pwd)/RelNotes" in

61 - our tree is an easy reproduction recipe.

69

63 - We may want to add tests to illustrate symptoms that are visible to

64 - the end user, but the updated code looked reasonable.

70 +* nd/test-rename-reset (2014-02-04) 1 commit

71 + - t7101, t7014: rename test files to indicate what that file is for

72

73 Will merge to 'next'.

74

75

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

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

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

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

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

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

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

76 +* tb/repack-fix-renames (2014-02-05) 1 commit

77 + - repack.c: rename a few variables

78

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

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

79 - significantly.

79 + Perhaps unneeded, as the longer-term plan is to drop the codeblock

80 + this change touches.

81

81 - Not quite sure if we want another custom tree walker for it, or it

82 - should be written by using existing two-way diff with the result of

83 - earlier intersect_path() as pathspec.

82 + Will discard.

83

85 ---------------------------------------------------

86 -[Stalled]

84

88 -* jk/color-for-more-pagers (2014-01-17) 4 commits

89 - - pager: disable colors for some known-bad configurations

90 - - DONOTMERGE: needs matching change to git-sh-setup

91 - - setup_pager: set MORE=R

92 - - setup_pager: refactor LESS/LV environment setting

85 +* tr/remerge-diff (2014-02-05) 6 commits

86 + - log --remerge-diff: show what the conflict resolution changed

87 + - merge-recursive: allow storing conflict hunks in index

88 + - Fold all merge diff variants into an enum

89 + - combine-diff: do not pass revs->dense_combined_merges redundantly

90 + - log: add a merge base inspection option

91 + - pretty: refactor add_merge_info() into parts

92 + (this branch uses tr/merge-recursive-index-only.)

93

94 - 'more' implementation of BSD wants to be told with MORE=R

95 - environment before it shows colored output, while 'more' on some

96 - other platforms will die when seeing MORE=R environment.

94 + "log -p" output learns a new way to let users inspect a merge

95 + commit by showing the differences between the automerged result

96 + with conflicts the person who recorded the merge would have seen

97 + and the final conflict resolution that was recorded in the merge.

98

98 - It appears that we are coming to the consensus that trying to be

99 - too intimately knowledgeable about quirks of various pager

100 - implementations on different platforms is a losing proposition.

99 + RFC.

100

102 - Waiting for a reroll.

101

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

103 + - Documentation: fix typos in man pages

104 +

105 + Various typofixes, all looked correct.

106 +

107 + Will merge to 'next' and then to 'master'.

108 +

109 +--------------------------------------------------

110 +[Stalled]

111

112 * po/everyday-doc (2014-01-27) 1 commit

113 - Make 'git help everyday' work

@@ -372,6 +379,69 @@ of the repositories listed at

379 --------------------------------------------------

380 [Cooking]

381

382 +* bs/stdio-undef-before-redef (2014-01-31) 1 commit

383 + (merged to 'next' on 2014-01-31 at 9874918)

384 + + git-compat-util.h: #undef (v)snprintf before #define them

385 +

386 + When we replace broken macros from stdio.h in git-compat-util.h,

387 + #undef them to avoid re-definition warnings from the C

388 + preprocessor.

389 +

390 + Will cook in 'next'.

391 +

392 +

393 +* ep/varscope (2014-01-31) 7 commits

394 + (merged to 'next' on 2014-01-31 at d198f5d)

395 + + builtin/gc.c: reduce scope of variables

396 + + builtin/fetch.c: reduce scope of variable

397 + + builtin/commit.c: reduce scope of variables

398 + + builtin/clean.c: reduce scope of variable

399 + + builtin/blame.c: reduce scope of variables

400 + + builtin/apply.c: reduce scope of variables

401 + + bisect.c: reduce scope of variable

402 +

403 + Shrink lifetime of variables by moving their definitions to an

404 + inner scope where appropriate.

405 +

406 + Will cook in 'next'.

407 +

408 +

409 +* mw/symlinks (2014-02-04) 6 commits

410 + - setup: don't dereference in-tree symlinks for absolute paths

411 + - setup: add abspath_part_inside_repo() function

412 + - t0060: add tests for prefix_path when path begins with work tree

413 + - t0060: add test for prefix_path when path == work tree

414 + - t0060: add test for prefix_path on symlinks via absolute paths

415 + - t3004: add test for ls-files on symlinks via absolute paths

416 +

417 + All subcommands that take pathspecs mishandled an in-tree symbolic

418 + link when given it as a full path from the root (which arguably is

419 + a sick way to use pathspecs). "git ls-files -s $(pwd)/RelNotes" in

420 + our tree is an easy reproduction recipe.

421 +

422 + We may want to add tests to illustrate symptoms that are visible to

423 + the end user, but the updated code looked reasonable.

424 +

425 + Will merge to 'next'.

426 +

427 +

428 +* ks/diff-c-with-diff-order-more (2014-02-05) 5 commits

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

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

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

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

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

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

435 +

436 + By avoiding running full two-way diff between the resulting

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

438 + significantly.

439 +

440 + Not quite sure if we want another custom tree walker for it, or it

441 + should be written by using existing two-way diff with the result of

442 + earlier intersect_path() as pathspec.

443 +

444 +

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

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

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

@@ -504,21 +574,22 @@ of the repositories listed at

574

575 Code clean-up.

576

507 - Will hold.

577 + Will cook in 'next'.

578

579

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

511 - - combine-diff: simplify intersect_paths() further

512 - - combine-diff: combine_diff_path.len is not needed anymore

513 - - combine-diff: optimize combine_diff_path sets intersection

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

515 - - diffcore-order: export generic ordering interface

581 + (merged to 'next' on 2014-02-04 at 24a8b2e)

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

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

584 + + combine-diff: optimize combine_diff_path sets intersection

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

586 + + diffcore-order: export generic ordering interface

587 (this branch is used by ks/diff-c-with-diff-order-more.)

588

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

590 diffcore-order.

591

521 - Will merge to 'next'.

592 + Will cook in 'next'.

593

594

595 * bl/blame-full-history (2014-01-14) 1 commit

@@ -558,8 +629,7 @@ of the repositories listed at

629 be used more pleasantly by checking out a concrete branch when

630 cloning them to prime the well.

631

561 - This round seems to be almost ready; further discussions are of

562 - course very much welcomed.

632 + Will merge to 'next'.

633

634

635 * jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits

@@ -657,10 +727,11 @@ of the repositories listed at

727 Will cook in 'next' until Git 2.0.

728

729

660 -* tr/merge-recursive-index-only (2013-10-28) 3 commits

730 +* tr/merge-recursive-index-only (2014-02-05) 3 commits

731 - merge-recursive: -Xindex-only to leave worktree unchanged

732 - merge-recursive: internal flag to avoid touching the worktree

733 - merge-recursive: remove dead conditional in update_stages()

734 + (this branch is used by tr/remerge-diff.)

735

736 Will hold.

737

@@ -734,3 +805,19 @@ of the repositories listed at

805

806 Teach parse-options machinery to optionally parse numbers with a

807 unit suffix, e.g. 8g, 4m, 128k.

808 +

809 +

810 +* jk/color-for-more-pagers (2014-01-17) 4 commits

811 + . pager: disable colors for some known-bad configurations

812 + . DONOTMERGE: needs matching change to git-sh-setup

813 + . setup_pager: set MORE=R

814 + . setup_pager: refactor LESS/LV environment setting

815 +

816 + 'more' implementation of BSD wants to be told with MORE=R

817 + environment before it shows colored output, while 'more' on some

818 + other platforms will die when seeing MORE=R environment. But the

819 + consensus is that trying to be too intimately knowledgeable about

820 + quirks of various pager implementations on different platforms is a

821 + losing proposition.

822 +

823 + Will be superseded by jk/makefile series when it matures.

What's cooking (2014/02 #02)