8ff912128d · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2011, #06; Fri, 13)

3 -X-master-at: 2de58b398b5a1f81bf74a385e41cfc2fcd9cb427

4 -X-next-at: fcbf71a2ac7af454bec14832c8dfba57e793dda7

2 +Subject: What's cooking in git.git (May 2011, #07; Sun, 15)

3 +X-master-at: c565cb452c1e20babe4d0632c58e0f11a9af30c4

4 +X-next-at: 1a857915d643622bb71b1f0683f43acb1ddb48df

5

6 -What's cooking in git.git (May 2011, #06; Fri, 13)

6 +What's cooking in git.git (May 2011, #07; Sun, 15)

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

8

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

@@ -18,96 +18,27 @@ feature freeze in early June.

18

19 We are about to finish the week #3 of this cycle.

20

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

22 -[Graduated to "master"]

23 -

24 -* bf/commit-template-no-cleanup (2011-05-11) 1 commit

25 - (merged to 'next' on 2011-05-11 at 01fde0d)

26 - + Do not strip empty lines / trailing spaces from a commit message template

27 -

28 -* cn/log-parse-opt (2011-04-14) 1 commit

29 - (merged to 'next' on 2011-04-28 at 02f2eac)

30 - + log: convert to parse-options

31 -

32 -* jc/fix-add-u-unmerged (2011-04-23) 1 commit

33 - (merged to 'next' on 2011-04-28 at f7ed821)

34 - + Fix "add -u" that sometimes fails to resolve unmerged paths

35 - (this branch is used by jc/add-delete-default.)

36 -

37 -* jc/t1506-shell-param-expansion-gotcha (2011-05-09) 1 commit

38 - (merged to 'next' on 2011-05-11 at 6c8619e)

39 - + t1507: avoid "${parameter<op>'word'}" inside double-quotes

40 -

41 -* jh/dirstat-lines (2011-04-29) 8 commits

42 - (merged to 'next' on 2011-04-29 at a302674)

43 - + Mark dirstat error messages for translation

44 - + Improve error handling when parsing dirstat parameters

45 - + New --dirstat=lines mode, doing dirstat analysis based on diffstat

46 - + Allow specifying --dirstat cut-off percentage as a floating point number

47 - + Add config variable for specifying default --dirstat behavior

48 - + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file

49 - + Make --dirstat=0 output directories that contribute < 0.1% of changes

50 - + Add several testcases for --dirstat and friends

51 -

52 -* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits

53 - (merged to 'next' on 2011-04-28 at 6006cc4)

54 - + revisions: allow --glob and friends in parse_options-enabled commands

55 - + revisions: split out handle_revision_pseudo_opt function

56 -

57 -* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits

58 - + send-pack: unbreak push over stateless rpc

59 - + send-pack: avoid deadlock when pack-object dies early

60 - (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)

61 -

62 -* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits

63 - (merged to 'next' on 2011-05-05 at 3f4ffb9)

64 - + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

65 - (merged to 'next' on 2011-04-28 at db7e04a)

66 - + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

67 - (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)

68 -

69 -* rr/rerere-libify-clear-gc (2011-05-08) 1 commit

70 - (merged to 'next' on 2011-05-11 at b1d8c88)

71 - + rerere: libify rerere_clear() and rerere_gc()

72 -

73 -This is pure code movement. Changing them to suit the need of other

74 -callers can be built on it as separate patches.

75 -

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

22 [New Topics]

23

79 -* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit

80 - + setup_revisions(): take pathspec from command line and --stdin correctly

81 - (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)

82 -

83 -* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit

84 - - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

85 - (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.)

86 -

87 -* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits

88 - - Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'

89 - - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

90 - (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.)

91 -

92 -These are to fix an ancient bug where feeding "git log --stdin path" with

93 -an input that also has additional pathspec corrupted memory.

24 +* jc/replacing (2011-05-15) 5 commits

25 + - read_sha1_file(): allow selective bypassing of replacement mechanism

26 + - inline lookup_replace_object() calls

27 + - read_sha1_file(): get rid of read_sha1_file_repl() madness

28 + - t6050: make sure we test not just commit replacement

29 + - Declare lookup_replace_object() in cache.h, not in commit.h

30 + (this branch is used by jc/streaming.)

31

95 -* jl/read-tree-m-dry-run (2011-05-11) 1 commit

96 - - Teach read-tree the -n|--dry-run option

32 +Will merge to "next" by the middle of week #4.

33

98 -Looked good. We _might_ want to make -n simply ignore -u, though.

34 +* jh/receive-count-limit (2011-05-14) 1 commit

35 + - receive-pack: Add receive.objectCountLimit to refuse push with too many objects

36

100 -* jc/streaming (2011-05-12) 5 commits

101 - - write_entry(): use streaming API for writing working tree files

102 - - stream: a streaming interface to read from the object store

103 - - sha1_object_info_extended(): expose a bit more information from object-info

104 - - write_entry(): separate two helper functions out

105 - - packed_object_info_detail(): do not return a string

106 - (this branch uses jc/convert.)

37 +* jl/submodule-conflicted-gitmodules (2011-05-14) 2 commits

38 + - Submodules: Don't parse .gitmodules when it contains, merge conflicts

39 + - test that git status works with merge conflict in, .gitmodules

40

108 -The counterpart to jc/bigfile to cover the write-out codepath. This does

109 -not yet have "read directly from pack or loose object without slurping the

110 -whole thing in memory" yet, which is still work in progress.

41 +Will merge to "next" by the middle of week #4.

42

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

44 [Stalled]

@@ -194,10 +125,49 @@ Needs to tighten the advice to only govern the generic How-to part.

125 --------------------------------------------------

126 [Cooking]

127

197 -* jc/bigfile (2011-05-12) 3 commits

198 - - Bigfile: teach "git add" to send a large file straight to a pack

199 - - index_fd(): split into two helper functions

200 - - index_fd(): turn write_object and format_check arguments into one flag

128 +* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit

129 + + setup_revisions(): take pathspec from command line and --stdin correctly

130 + (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)

131 +

132 +* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit

133 + - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

134 + (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.)

135 +

136 +* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits

137 + (merged to 'next' on 2011-05-15 at b4e3a75)

138 + + Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'

139 + + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

140 + (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.)

141 +

142 +These are to fix an ancient bug where feeding "git log --stdin path" with

143 +an input that also has additional pathspec corrupted memory.

144 +

145 +* jl/read-tree-m-dry-run (2011-05-11) 1 commit

146 + - Teach read-tree the -n|--dry-run option

147 +

148 +Looked good. We _might_ want to make -n simply ignore -u, though.

149 +

150 +* jc/streaming (2011-05-15) 12 commits

151 + - streaming: read loose objects incrementally

152 + - sha1_file.c: expose helpers to read loose objects

153 + - streaming: read non-delta incrementally from a pack

154 + - streaming_write_entry(): support files with holes

155 + - streaming_write_entry(): use streaming API in write_entry()

156 + - streaming: a new API to read from the object store

157 + - write_entry(): separate two helper functions out

158 + - unpack_object_header(): make it public

159 + - sha1_object_info_extended(): hint about objects in delta-base cache

160 + - sha1_object_info_extended(): expose a bit more info

161 + - packed_object_info_detail(): do not return a string

162 + - Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming

163 + (this branch uses jc/bigfile, jc/convert and jc/replacing.)

164 +

165 +* jc/bigfile (2011-05-13) 3 commits

166 + (merged to 'next' on 2011-05-15 at 0ee7144)

167 + + Bigfile: teach "git add" to send a large file straight to a pack

168 + + index_fd(): split into two helper functions

169 + + index_fd(): turn write_object and format_check arguments into one flag

170 + (this branch is used by jc/streaming.)

171

172 This covers the entry point for a big file to the system. Other parts that

173 need to know about them are the exit point (i.e. write_entry()), packing

@@ -208,32 +178,35 @@ either unpack-objects or index-pack, which still want to hold the full

178 object in-core and need to be fixed).

179

180 * jc/convert (2011-05-09) 4 commits

211 - - convert: make it harder to screw up adding a conversion attribute

212 - - convert: make it safer to add conversion attributes

213 - - convert: give saner names to crlf/eol variables, types and functions

214 - - convert: rename the "eol" global variable to "core_eol"

181 + (merged to 'next' on 2011-05-15 at 9d35a6e)

182 + + convert: make it harder to screw up adding a conversion attribute

183 + + convert: make it safer to add conversion attributes

184 + + convert: give saner names to crlf/eol variables, types and functions

185 + + convert: rename the "eol" global variable to "core_eol"

186 (this branch is used by jc/streaming.)

187

217 -Just a clean-up.

218 -Will merge to "next" by the end of week #3.

188 +Will merge to "master" by the middle of week #4.

189

190 * jk/blame-line-porcelain (2011-05-09) 3 commits

221 - - blame: add --line-porcelain output format

222 - - blame: refactor porcelain output

223 - - add tests for various blame formats

191 + (merged to 'next' on 2011-05-15 at 93232b3)

192 + + blame: add --line-porcelain output format

193 + + blame: refactor porcelain output

194 + + add tests for various blame formats

195

225 -* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit

226 - - tag: disallow '-' as tag name

196 +Will merge to "master" by the end of week #4.

197

228 -Will merge to "next" by the end of week #3.

198 +* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit

199 + (merged to 'next' on 2011-05-15 at 7df0461)

200 + + tag: disallow '-' as tag name

201

230 -* fc/completion-zsh (2011-05-10) 1 commit

231 - + git-completion: fix regression in zsh support

232 - (this branch is used by sg/completion-updates.)

202 +Will merge to "master" by the end of week #4.

203

204 * nd/sparse-co-fix (2011-05-10) 2 commits

235 - - sparse checkout: do not eagerly decide the fate for whole directory

236 - - t1011: fix sparse-checkout initialization and add new file

205 + (merged to 'next' on 2011-05-15 at 1a85791)

206 + + sparse checkout: do not eagerly decide the fate for whole directory

207 + + t1011: fix sparse-checkout initialization and add new file

208 +

209 +Will merge to "master" by the end of week #4.

210

211 * kk/maint-prefix-in-config-mak (2011-05-09) 3 commits

212 (merged to 'next' on 2011-05-09 at 267a3aa)

@@ -258,7 +231,7 @@ Will merge to "master" by the end of week #4.

231

232 Will merge to "master" by the end of week #4.

233

261 -* ab/i18n-scripts (2011-05-08) 48 commits

234 +* ab/i18n-scripts (2011-05-14) 48 commits

235 - i18n: git-bisect bisect_next_check "You need to" message

236 - i18n: git-bisect [Y/n] messages

237 - i18n: git-bisect bisect_replay + $1 messages

@@ -309,15 +282,15 @@ Will merge to "master" by the end of week #4.

282 - i18n: git-am add git-sh-i18n

283 (this branch uses ab/i18n-scripts-basic.)

284

312 -* ab/i18n-scripts-basic (2011-05-08) 4 commits

285 +* ab/i18n-scripts-basic (2011-05-14) 4 commits

286 - Makefile: add xgettext target for *.sh files

287 - git-sh-i18n.sh: add GIT_GETTEXT_POISON support

288 - git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers

289 - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()

290 (this branch is used by ab/i18n-scripts.)

291

319 -Will be re-rolled to work around systems whose environment variable names

320 -are case insensitive.

292 +Re-rolled to drop credits from the individual documentation pages

293 +and update the documentation.

294

295 * mg/merge-ff-config (2011-05-06) 3 commits

296 (merged to 'next' on 2011-05-08 at 977b432)

@@ -328,19 +301,22 @@ are case insensitive.

301 Will merge to "master" by the end of week #4.

302

303 * mk/grep-pcre (2011-05-09) 10 commits

331 - - git-grep: do not die upon -F/-P when grep.extendedRegexp is set.

332 - - git-grep: Bail out when -P is used with -F or -E

333 - - grep: Add basic tests

334 - - configure: Check for libpcre

335 - - git-grep: Learn PCRE

336 - - grep: Extract compile_regexp_failed() from compile_regexp()

337 - - grep: Fix a typo in a comment

304 + (merged to 'next' on 2011-05-15 at d110135)

305 + + git-grep: do not die upon -F/-P when grep.extendedRegexp is set.

306 + + git-grep: Bail out when -P is used with -F or -E

307 + + grep: Add basic tests

308 + + configure: Check for libpcre

309 + + git-grep: Learn PCRE

310 + + grep: Extract compile_regexp_failed() from compile_regexp()

311 + + grep: Fix a typo in a comment

312 (merged to 'next' on 2011-05-08 at 5d3bede)

313 + grep: Put calls to fixmatch() and regmatch() into patmatch()

314 + contrib/completion: --line-number to git grep

315 + Documentation: Add --line-number to git-grep synopsis

316

343 -Will merge to "next" by the end of week #3.

317 +* fc/completion-zsh (2011-05-10) 1 commit

318 + + git-completion: fix regression in zsh support

319 + (this branch is used by sg/completion-updates.)

320

321 * sg/completion-updates (2011-05-10) 4 commits

322 (merged to 'next' on 2011-05-10 at eaf5398)

@@ -357,14 +333,15 @@ workaround blessed by zsh folks instead.

333

334 Will merge to "master" by the end of week #4.

335

360 -* ld/p4-preserve-user-names (2011-05-10) 3 commits

361 - - git-p4: warn if git authorship won't be retained

336 +* ld/p4-preserve-user-names (2011-05-13) 3 commits

337 + (merged to 'next' on 2011-05-15 at bdedb60)

338 + + git-p4: warn if git authorship won't be retained

339 (merged to 'next' on 2011-05-11 at bc14314)

340 + git-p4: small improvements to user-preservation

341 (merged to 'next' on 2011-04-29 at 25116c8)

342 + git-p4: add option to preserve user names

343

367 -The tip one will be re-rolled.

344 +Will merge to "master" by the end of week #4.

345

346 * jc/magic-pathspec (2011-05-12) 13 commits

347 (merged to 'next' on 2011-05-12 at 656c8b5)

@@ -386,4 +363,4 @@ The tip one will be re-rolled.

363 + magic pathspec: add tentative ":/path/from/top/level" pathspec support

364 (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)

365

389 -This seems to need more time to mature than I expected.

366 +Will merge to "master" by the end of week #4.

What's cooking (2011/05 #07)