ae18975823 · matheusbsbs/matheus-bagliano

@@ -1,19 +1,28 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

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

4 X-master-at: 5f95c9f850b19b368c43ae399cc831b17a26a5ac

5 X-next-at: dc9e3eb950a3fce88e01983170c37200a6d34d8f

6

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

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

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 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".

14 +The tip of 'next' hasn't been rewound, and none of the topics that

15 +have been cooking there has graduated, yet. Hopefully that can

16 +start happening to open the new development cycle later this week,

17 +at which time I'll be also updating tinyurl.com/gitCal and also

18 +annotate the topics listed in this file with the course of action

19 +(i.e. if you run "Meta/cook -w", many are listed as Undecided right

20 +now, which I need to fix).

21 +

22 +There are many stalled topics; I think some of them do deserve to be

23 +discarded as marked, but others do solve (or at least attempt to)

24 +real issues and it would be nice to see people help unblock them

25 +(one reason for blockage would be that they introduce regressions).

26

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

28 of the repositories listed at

@@ -23,20 +32,102 @@ of the repositories listed at

32 --------------------------------------------------

33 [New Topics]

34

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.)

35 +* bc/blame-crlf-test (2014-02-18) 1 commit

36 + - blame: add a failing test for a CRLF issue.

37

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.

38

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

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

39 +* jk/http-no-curl-easy (2014-02-18) 1 commit

40 + - http: never use curl_easy_perform

41 +

42 +

43 +* jk/janitorial-fixes (2014-02-18) 5 commits

44 + - open_istream(): do not dereference NULL in the error case

45 + - builtin/mv: don't use memory after free

46 + - utf8: use correct type for values in interval table

47 + - utf8: fix iconv error detection

48 + - notes-utils: handle boolean notes.rewritemode correctly

49 +

50 +

51 +* ks/config-file-stdin (2014-02-18) 4 commits

52 + - config: teach "git config --file -" to read from the standard input

53 + - config: change git_config_with_options() interface

54 + - builtin/config.c: rename check_blob_write() -> check_write()

55 + - config: disallow relative include paths from blobs

56 +

57 +

58 +* lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit

59 + - git-contacts: do not fail parsing of good diffs

60 +

61 +

62 +* mh/replace-refs-variable-rename (2014-02-18) 1 commit

63 + - Rename read_replace_refs to check_replace_refs

64 +

65 +

66 +* nd/commit-editor-cleanup (2014-02-18) 3 commits

67 + - commit: add --cleanup=scissors

68 + - wt-status.c: move cut-line print code out to wt_status_add_cut_line

69 + - wt-status.c: make cut_line[] const to shrink .data section a bit

70 +

71 +

72 +* nd/no-more-fnmatch (2014-02-18) 4 commits

73 + - Actually remove compat fnmatch source code

74 + - Stop using fnmatch (either native or compat)

75 + - Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"

76 + - Use wildmatch() directly without fnmatch() wrapper

77 +

78 +

79 +* nd/reset-setup-worktree (2014-02-18) 1 commit

80 + - reset: optionally setup worktree and refresh index on --mixed

81 +

82 +

83 +* po/git-help-user-manual (2014-02-18) 1 commit

84 + - Provide a 'git help user-manual' route to the docbook

85 +

86 +

87 +* rt/links-for-asciidoctor (2014-02-18) 1 commit

88 + - Fix documentation AsciiDoc links for external urls

89 +

90 +

91 +* tg/index-v4-format (2014-02-18) 5 commits

92 + - read-cache: add index.version config variable

93 + - FIXUP

94 + - test-lib: allow setting the index format version

95 + - FIXUP

96 + - introduce GIT_INDEX_VERSION environment variable

97 +

98 +

99 +* tr/diff-submodule-no-reuse-worktree (2014-02-18) 2 commits

100 + - diff: refactor reuse_worktree_file()

101 + - diff: do not reuse_worktree_file for submodules

102 +

103 +

104 +* nd/multiple-work-trees (2014-02-19) 26 commits

105 + - FIXUP???

106 + - gc: support prune --repos

107 + - prune: strategies for linked checkouts

108 + - checkout: detach if the branch is already checked out elsewhere

109 + - checkout: clean up half-prepared directories in --to mode

110 + - checkout: support checking out into a new working directory

111 + - use new wrapper write_file() for simple file writing

112 + - wrapper.c: wrapper to open a file, fprintf then close

113 + - setup.c: support multi-checkout repo setup

114 + - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

115 + - setup.c: convert check_repository_format_gently to use strbuf

116 + - setup.c: detect $GIT_COMMON_DIR in is_git_directory()

117 + - setup.c: convert is_git_directory() to use strbuf

118 + - git-stash: avoid hardcoding $GIT_DIR/logs/....

119 + - *.sh: avoid hardcoding $GIT_DIR/hooks/...

120 + - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

121 + - Add new environment variable $GIT_COMMON_DIR

122 + - commit: use SEQ_DIR instead of hardcoding "sequencer"

123 + - fast-import: use git_path() for accessing .git dir instead of get_git_dir()

124 + - reflog: avoid constructing .lock path with git_path

125 + - *.sh: respect $GIT_INDEX_FILE

126 + - Make git_path() aware of file relocation in $GIT_DIR

127 + - path.c: group git_path(), git_pathdup() and strbuf_git_path() together

128 + - path.c: rename vsnpath() to do_git_path()

129 + - Convert git_snpath() to strbuf_git_path()

130 + - path.c: make get_pathname() return strbuf instead of static buffer

131

132 --------------------------------------------------

133 [Stalled]

@@ -325,6 +416,22 @@ of the repositories listed at

416 --------------------------------------------------

417 [Cooking]

418

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

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

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

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

423 +

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

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

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

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

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

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

430 +

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

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

433 +

434 +

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

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

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

What's cooking (2014/02 #06)