d14d04c381 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Oct 2011, #11; Fri, 28)

3 -X-master-at: e8e1c29021da446d0c50573ef9619bf74f515c20

4 -X-next-at: 2527a49a5c76e4269d28e410ef11c6c243f1abcb

2 +Subject: What's cooking in git.git (Nov 2011, #01; Thu, 3)

3 +X-master-at: ee6dfb2d83ba1b057943e705f707fa27e34e47f9

4 +X-next-at: 2ce082cef3fbf0c6614d29a8e7011b09c39899a1

5

6 -What's cooking in git.git (Oct 2011, #11; Fri, 28)

6 +What's cooking in git.git (Nov 2011, #01; Thu, 3)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -It probably is a good point to stop taking new topics and start

13 -switching our focus to fixing bugs in the topics already in 'master'.

14 -

12 Here are the repositories that have my integration branches:

13

14 With maint, master, next, pu, todo:

@@ -47,47 +44,76 @@ These branches are pushed to their own separate repositories instead:

44 --------------------------------------------------

45 [New Topics]

46

50 -* nd/misc-cleanups (2011-10-27) 6 commits

51 - (merged to 'next' on 2011-10-28 at 2527a49)

52 - + unpack_object_header_buffer(): clear the size field upon error

53 - + tree_entry_interesting: make use of local pointer "item"

54 - + tree_entry_interesting(): give meaningful names to return values

55 - + read_directory_recursive: reduce one indentation level

56 - + get_tree_entry(): do not call find_tree_entry() on an empty tree

57 - + tree-walk.c: do not leak internal structure in tree_entry_len()

58 -

59 -These are unquestionably good parts taken out of a larger series, so that

60 -we can focus more on the other changes in later rounds of review.

61 -

62 -Will keep in 'next' during this cycle.

63 -

64 -* ss/blame-textconv-fake-working-tree (2011-10-28) 2 commits

65 - - (squash) test for previous

66 - - blame.c: Properly initialize strbuf after calling, textconv_object()

67 -

68 -A trivial fix for a breakage worth fixing.

69 -Will merge to 'master' before -rc1.

47 +* jc/stream-to-pack (2011-11-03) 4 commits

48 + - Bulk check-in

49 + - finish_tmp_packfile(): a helper function

50 + - create_tmp_packfile(): a helper function

51 + - write_pack_header(): a helper function

52 +

53 +Teaches "git add" to send large-ish blob data straight to a packfile.

54 +This is a continuation to the "large file support" topic. I think this

55 +codepath to move data from worktree to repository needs to become aware of

56 +streaming, just like the checkout codepath that goes the other way, which

57 +was done in the previous "large file support" topic in the 1.7.7 cycle.

58 +

59 +* jn/gitweb-side-by-side-diff (2011-10-31) 8 commits

60 + - gitweb: Add navigation to select side-by-side diff

61 + - gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"

62 + - t9500: Add basic sanity tests for side-by-side diff in gitweb

63 + - t9500: Add test for handling incomplete lines in diff by gitweb

64 + - gitweb: Give side-by-side diff extra CSS styling

65 + - gitweb: Add a feature to show side-by-side diff

66 + - gitweb: Extract formatting of diff chunk header

67 + - gitweb: Refactor diff body line classification

68 +

69 +Replaces a series from Kato Kazuyoshi on the same topic.

70 +

71 +* vr/msvc (2011-10-31) 3 commits

72 + - MSVC: Remove unneeded header stubs

73 + - Compile fix for MSVC: Include <io.h>

74 + - Compile fix for MSVC: Do not include sys/resources.h

75 +

76 +It seems this needs to be rehashed with msysgit folks.

77 +

78 +* mf/curl-select-fdset (2011-11-02) 2 commits

79 + - http.c: Use timeout suggested by curl instead of fixed 50ms timeout

80 + - http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping

81 +

82 +* na/strtoimax (2011-11-02) 2 commits

83 + - Support sizes >=2G in various config options accepting 'g' sizes.

84 + - Add strtoimax() compatibility function.

85

86 --------------------------------------------------

87 [Graduated to "master"]

88

74 -* js/grep-mutex (2011-10-26) 3 commits

75 - (merged to 'next' on 2011-10-26 at 6fac2d6)

76 - + builtin/grep: simplify lock_and_read_sha1_file()

77 - + builtin/grep: make lock/unlock into static inline functions

78 - + git grep: be careful to use mutexes only when they are initialized

89 +* dm/pack-objects-update (2011-10-20) 4 commits

90 + (merged to 'next' on 2011-10-27 at fa52898)

91 + + pack-objects: don't traverse objects unnecessarily

92 + + pack-objects: rewrite add_descendants_to_write_order() iteratively

93 + + pack-objects: use unsigned int for counter and offset values

94 + + pack-objects: mark add_to_write_order() as inline

95 +

96 +* ef/mingw-upload-archive (2011-10-30) 3 commits

97 + (merged to 'next' on 2011-10-30 at 5267fa3)

98 + + upload-archive: use start_command instead of fork

99 + + compat/win32/poll.c: upgrade from upstream

100 + + mingw: move poll out of sys-folder

101

80 -* rj/gitweb-clean-js (2011-10-26) 1 commit

81 - (merged to 'next' on 2011-10-26 at db36a24)

82 - + gitweb/Makefile: Remove static/gitweb.js in the clean target

102 +* jk/git-tricks (2011-10-21) 3 commits

103 + (merged to 'next' on 2011-10-23 at 7c9bf71)

104 + + completion: match ctags symbol names in grep patterns

105 + + contrib: add git-jump script

106 + + contrib: add diff highlight script

107

84 -* rs/maint-estimate-cache-size (2011-10-26) 1 commit

85 - (merged to 'next' on 2011-10-26 at 2f11375)

86 - + read-cache.c: fix index memory allocation

108 +* nd/pretty-commit-log-message (2011-10-23) 2 commits

109 + (merged to 'next' on 2011-10-27 at 4b61df7)

110 + + pretty.c: use original commit message if reencoding fails

111 + + pretty.c: free get_header() return value

112

88 -* sn/complete-bash-wo-process-subst (2011-10-26) 1 commit

89 - (merged to 'next' on 2011-10-26 at 8662ed6)

90 - + completion: fix issue with process substitution not working on Git for Windows

113 +* ss/blame-textconv-fake-working-tree (2011-10-28) 2 commits

114 + (merged to 'next' on 2011-10-30 at 9588bc1)

115 + + (squash) test for previous

116 + + blame.c: Properly initialize strbuf after calling, textconv_object()

117

118 --------------------------------------------------

119 [Stalled]

@@ -131,24 +157,22 @@ it would soon realize the don't.

157

158 Will keep in 'pu' as a showcase for a while and then will drop.

159

134 -* kk/gitweb-side-by-side-diff (2011-10-17) 2 commits

135 - - gitweb: add a feature to show side-by-side diff

136 - - gitweb: change format_diff_line() to remove leading SP from $diff_class

137 -

138 -Fun.

139 -Will keep in 'pu' until the planned re-roll comes.

140 -

160 --------------------------------------------------

161 [Cooking]

162

144 -* ef/mingw-upload-archive (2011-10-26) 3 commits

145 - - upload-archive: use start_command instead of fork

146 - - compat/win32/poll.c: upgrade from upstream

147 - - mingw: move poll out of sys-folder

163 +* nd/misc-cleanups (2011-10-27) 6 commits

164 + (merged to 'next' on 2011-10-28 at 2527a49)

165 + + unpack_object_header_buffer(): clear the size field upon error

166 + + tree_entry_interesting: make use of local pointer "item"

167 + + tree_entry_interesting(): give meaningful names to return values

168 + + read_directory_recursive: reduce one indentation level

169 + + get_tree_entry(): do not call find_tree_entry() on an empty tree

170 + + tree-walk.c: do not leak internal structure in tree_entry_len()

171

149 -Are msysgit folks OK with this series (I didn't see msysgit list Cc'ed on

150 -these patches)? If so let's move this forward, as the changes to the core

151 -part seem solid.

172 +These are unquestionably good parts taken out of a larger series, so that

173 +we can focus more on the other changes in later rounds of review.

174 +

175 +Will keep in 'next' during this cycle.

176

177 * rs/allocate-cache-entry-individually (2011-10-26) 2 commits

178 (merged to 'next' on 2011-10-27 at 2e4acd6)

@@ -157,13 +181,6 @@ part seem solid.

181

182 Will keep in 'next' during this cycle.

183

160 -* nd/pretty-commit-log-message (2011-10-23) 2 commits

161 - (merged to 'next' on 2011-10-27 at 4b61df7)

162 - + pretty.c: use original commit message if reencoding fails

163 - + pretty.c: free get_header() return value

164 -

165 -Will merge to 'master' before -rc0.

166 -

184 * mh/ref-api-3 (2011-10-19) 11 commits

185 (merged to 'next' on 2011-10-23 at 92e2d35)

186 + is_refname_available(): reimplement using do_for_each_ref_in_array()

@@ -231,24 +248,6 @@ Will keep in 'pu' until hearing a convincing argument for the patch.

248

249 Will keep in 'next' during this cycle.

250

234 -* dm/pack-objects-update (2011-10-20) 4 commits

235 - (merged to 'next' on 2011-10-27 at fa52898)

236 - + pack-objects: don't traverse objects unnecessarily

237 - + pack-objects: rewrite add_descendants_to_write_order() iteratively

238 - + pack-objects: use unsigned int for counter and offset values

239 - + pack-objects: mark add_to_write_order() as inline

240 -

241 -Will merge to 'master' before -rc0.

242 -

243 -* jk/git-tricks (2011-10-21) 3 commits

244 - (merged to 'next' on 2011-10-23 at 7c9bf71)

245 - + completion: match ctags symbol names in grep patterns

246 - + contrib: add git-jump script

247 - + contrib: add diff highlight script

248 -

249 -As this stuff is in contrib/ I do not care too much about the stability.

250 -Will merge to 'master' unless there is strong objection.

251 -

251 * jc/signed-commit (2011-10-21) 7 commits

252 (merged to 'next' on 2011-10-23 at 03eec25)

253 + pretty: %G[?GS] placeholders

@@ -297,3 +296,10 @@ Allow setting "description" for branches and use it to help communications

296 between humans in various workflow elements.

297

298 Will keep in 'next' during this cycle.

299 +

300 +--------------------------------------------------

301 +[Discarded]

302 +

303 +* kk/gitweb-side-by-side-diff (2011-10-17) 2 commits

304 + . gitweb: add a feature to show side-by-side diff

305 + . gitweb: change format_diff_line() to remove leading SP from $diff_class

What's cooking (2011/11 #1)