6a7057e371 · matheusbsbs/matheus-bagliano

@@ -1,18 +1,18 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2011, #07; Mon, 19)

3 -X-master-at: 876a6f4991abdd72ea707b193b4f2b831096ad3c

4 -X-next-at: 0b410e5c3b357520ddace5bff4c5bfa3699f9220

2 +Subject: What's cooking in git.git (Dec 2011, #08; Thu, 22)

3 +X-master-at: 5d6dfc7cb140a6eb90138334fab2245b69bc8bc4

4 +X-next-at: 7d1ccddcec7e93d27acda459c41e32851e845d51

5

6 -What's cooking in git.git (Dec 2011, #07; Mon, 19)

6 +What's cooking in git.git (Dec 2011, #08; Thu, 22)

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

11 'next'.

12

13 -The second large batch of topics for 1.7.9 graduated to 'master', and the

14 -tip of it should be 85% feature complete for this cycle (modulo fixes and

15 -tweaks).

13 +The tip of 'master' is now feature complete for 1.7.9 so I could tag it as

14 +the -rc0, but I'll let it simmer for several days to give people chance to

15 +test over the holidays.

16

17 Here are the repositories that have my integration branches:

18

@@ -42,185 +42,151 @@ The preformatted documentation in HTML and man format are found in:

42 --------------------------------------------------

43 [New Topics]

44

45 -* jc/advice-doc (2011-12-18) 1 commit

46 - (merged to 'next' on 2011-12-19 at 0b410e5)

47 - + advice: Document that they all default to true

48 - (this branch is used by jc/advise-push-default.)

45 +* tr/doc-sh-setup (2011-12-20) 1 commit

46 + (merged to 'next' on 2011-12-21 at bd73695)

47 + + git-sh-setup: make require_clean_work_tree part of the interface

48

50 -Will merge to "master".

49 +* ab/sun-studio-portability (2011-12-21) 3 commits

50 + (merged to 'next' on 2011-12-21 at 0cc5a63)

51 + + Appease Sun Studio by renaming "tmpfile"

52 + + Fix a bitwise negation assignment issue spotted by Sun Studio

53 + + Fix an enum assignment issue spotted by Sun Studio

54

52 ---------------------------------------------------

53 -[Graduated to "master"]

55 +* tr/bash-read-unescaped (2011-12-21) 1 commit

56 + (merged to 'next' on 2011-12-21 at de865c1)

57 + + bash completion: use read -r everywhere

58 +

59 +* jc/advise-i18n (2011-12-22) 1 commit

60 + - i18n of multi-line advice messages

61

55 -* ab/enable-i18n (2011-12-05) 1 commit

56 - (merged to 'next' on 2011-12-13 at 65af8cd)

57 - + i18n: add infrastructure for translating Git with gettext

58 -

59 -* ci/stripspace-docs (2011-12-12) 1 commit

60 - (merged to 'next' on 2011-12-13 at 35b2cdf)

61 - + Update documentation for stripspace

62 -

63 -* ew/keepalive (2011-12-05) 1 commit

64 - (merged to 'next' on 2011-12-13 at 1b5d5c4)

65 - + enable SO_KEEPALIVE for connected TCP sockets

66 -

67 -* jc/checkout-m-twoway (2011-12-15) 3 commits

68 - (merged to 'next' on 2011-12-15 at cc64fed)

69 - + checkout_merged(): squelch false warning from some gcc

70 - (merged to 'next' on 2011-12-11 at b61057f)

71 - + Test 'checkout -m -- path'

72 - (merged to 'next' on 2011-12-09 at c946009)

73 - + checkout -m: no need to insist on having all 3 stages

74 -

75 -* jk/credentials (2011-12-12) 14 commits

76 - (merged to 'next' on 2011-12-12 at 7a6d658)

77 - + t: add test harness for external credential helpers

78 - + credentials: add "store" helper

79 - + strbuf: add strbuf_add*_urlencode

80 - + Makefile: unix sockets may not available on some platforms

81 - + credentials: add "cache" helper

82 - + docs: end-user documentation for the credential subsystem

83 - + credential: make relevance of http path configurable

84 - + credential: add credential.*.username

85 - + credential: apply helper config

86 - + http: use credential API to get passwords

87 - + credential: add function for parsing url components

88 - + introduce credentials API

89 - + t5550: fix typo

90 - + test-lib: add test_config_global variant

91 - (this branch is used by jk/git-prompt.)

92 -

93 -* jk/fetch-no-tail-match-refs (2011-12-13) 4 commits

94 - (merged to 'next' on 2011-12-13 at 805c018)

95 - + connect.c: drop path_match function

96 - + fetch-pack: match refs exactly

97 - + t5500: give fully-qualified refs to fetch-pack

98 - + drop "match" parameter from get_remote_heads

99 -

100 -* jk/maint-mv (2011-12-12) 5 commits

101 - (merged to 'next' on 2011-12-13 at 58caedb)

102 - + mv: be quiet about overwriting

103 - + mv: improve overwrite warning

104 - + mv: make non-directory destination error more clear

105 - + mv: honor --verbose flag

106 - + docs: mention "-k" for both forms of "git mv"

107 -

108 -* jk/maint-push-over-dav (2011-12-13) 2 commits

109 - (merged to 'next' on 2011-12-13 at 45e376c)

110 - + http-push: enable "proactive auth"

111 - + t5540: test DAV push with authentication

112 -

113 -* jk/maint-snprintf-va-copy (2011-12-12) 1 commit

114 - (merged to 'next' on 2011-12-13 at d37a7e1)

115 - + compat/snprintf: don't look at va_list twice

116 -

117 -* jn/maint-sequencer-fixes (2011-12-12) 7 commits

118 - (merged to 'next' on 2011-12-13 at 5b3950c)

119 - + revert: stop creating and removing sequencer-old directory

120 - + Revert "reset: Make reset remove the sequencer state"

121 - + revert: do not remove state until sequence is finished

122 - + revert: allow single-pick in the middle of cherry-pick sequence

123 - + revert: pass around rev-list args in already-parsed form

124 - + revert: allow cherry-pick --continue to commit before resuming

125 - + revert: give --continue handling its own function

126 - (this branch is used by rr/revert-cherry-pick.)

127 -

128 -* nd/resolve-ref (2011-12-13) 3 commits

129 - (merged to 'next' on 2011-12-13 at c7002e9)

130 - + Rename resolve_ref() to resolve_ref_unsafe()

131 - + Convert resolve_ref+xstrdup to new resolve_refdup function

132 - + revert: convert resolve_ref() to read_ref_full()

133 -

134 -* rr/test-chaining (2011-12-11) 7 commits

135 - (merged to 'next' on 2011-12-13 at b08445e)

136 - + t3401: use test_commit in setup

137 - + t3401: modernize style

138 - + t3040 (subprojects-basic): fix '&&' chaining, modernize style

139 - + t1510 (worktree): fix '&&' chaining

140 - + t3030 (merge-recursive): use test_expect_code

141 - + test: fix '&&' chaining

142 - + t3200 (branch): fix '&&' chaining

143 -

144 -* tr/cache-tree (2011-12-06) 5 commits

145 - (merged to 'next' on 2011-12-13 at e0da64d)

146 - + reset: update cache-tree data when appropriate

147 - + commit: write cache-tree data when writing index anyway

148 - + Refactor cache_tree_update idiom from commit

149 - + Test the current state of the cache-tree optimization

150 - + Add test-scrap-cache-tree

62 +Allow localization of advice messages that tend to be longer and

63 +multi-line formatted. For now this is deliberately limited to advise()

64 +interface and not vreportf() in general as touching the latter has

65 +interactions with error() that has plumbing callers whose prefix "error: "

66 +should never be translated.

67

68 --------------------------------------------------

153 -[Cooking]

69 +[Graduated to "master"]

70

71 * cn/maint-lf-to-crlf-filter (2011-12-16) 1 commit

156 - - lf_to_crlf_filter(): tell the caller we added "\n" when draining

72 + (merged to 'next' on 2011-12-20 at 83d6f7c)

73 + + lf_to_crlf_filter(): tell the caller we added "\n" when draining

74 (this branch is used by jc/maint-lf-to-crlf-keep-crlf.)

75

76 A recent fix to the codepath was not quite correct.

77

161 -Will merge to "next".

78 +* ef/setenv-putenv (2011-12-14) 2 commits

79 + (merged to 'next' on 2011-12-20 at 4845020)

80 + + compat/setenv.c: error if name contains '='

81 + + compat/setenv.c: update errno when erroring out

82 + (this branch is used by ef/x-setenv-putenv.)

83 +

84 +* jc/advice-doc (2011-12-18) 1 commit

85 + (merged to 'next' on 2011-12-19 at 0b410e5)

86 + + advice: Document that they all default to true

87 + (this branch is used by jc/advise-push-default.)

88

89 * jc/maint-lf-to-crlf-keep-crlf (2011-12-18) 1 commit

164 - - lf_to_crlf_filter(): resurrect CRLF->CRLF hack

165 - (this branch uses cn/maint-lf-to-crlf-filter.)

90 + (merged to 'next' on 2011-12-20 at eee6eb3)

91 + + lf_to_crlf_filter(): resurrect CRLF->CRLF hack

92

93 The lf-to-crlf filter in the streaming checkout codepath forgot that we

94 try not to convert LF to CRLF if the repository data already has CRLF.

95

170 -Will merge to "next".

171 -

96 * jc/request-pull-show-head-4 (2011-12-19) 2 commits

97 (merged to 'next' on 2011-12-19 at 771939b)

98 + request-pull: do not emit "tag" before the tagname

99 (merged to 'next' on 2011-12-16 at bea51ac)

100 + request-pull: update the "pull" command generation logic

101

178 -Will merge to "master".

179 -

102 * jk/doc-fsck (2011-12-16) 1 commit

181 - - docs: brush up obsolete bits of git-fsck manpage

182 -

183 -Will merge to "next".

103 + (merged to 'next' on 2011-12-20 at 70df8a4)

104 + + docs: brush up obsolete bits of git-fsck manpage

105

106 * jk/follow-rename-score (2011-12-16) 1 commit

186 - - use custom rename score during --follow

187 -

188 -Will merge to "next".

189 -

190 -* jk/pretty-reglog-ent (2011-12-16) 1 commit

191 - - pretty: give placeholders to reflog identity

107 + (merged to 'next' on 2011-12-20 at 74db2a9)

108 + + use custom rename score during --follow

109

193 -Will merge to "next".

110 +* jk/git-prompt (2011-12-12) 10 commits

111 + (merged to 'next' on 2011-12-20 at 24aff90)

112 + + contrib: add credential helper for OS X Keychain

113 + + Makefile: OS X has /dev/tty

114 + + Makefile: linux has /dev/tty

115 + + credential: use git_prompt instead of git_getpass

116 + + prompt: use git_terminal_prompt

117 + + add generic terminal prompt function

118 + + refactor git_getpass into generic prompt function

119 + + move git_getpass to its own source file

120 + + imap-send: don't check return value of git_getpass

121 + + imap-send: avoid buffer overflow

122

123 * jk/http-push-to-empty (2011-12-19) 1 commit

124 (merged to 'next' on 2011-12-19 at 845e2a1)

125 + remote-curl: don't pass back fake refs

126

199 -* jk/maint-push-v-is-verbose (2011-12-17) 1 commit

200 - - make "git push -v" actually verbose

127 +* jk/maint-do-not-feed-stdin-to-tests (2011-12-15) 1 commit

128 + (merged to 'next' on 2011-12-20 at 43e83c5)

129 + + test-lib: redirect stdin of tests

130

202 -Will merge to "next".

131 +* jk/maint-push-v-is-verbose (2011-12-17) 1 commit

132 + (merged to 'next' on 2011-12-20 at b79f101)

133 + + make "git push -v" actually verbose

134

135 * jk/maint-strbuf-missing-init (2011-12-18) 2 commits

205 - - Update jk/maint-strbuf-missing-init to builtin/ rename

206 - - commit, merge: initialize static strbuf

136 + (merged to 'next' on 2011-12-20 at 72fa8ae)

137 + + Update jk/maint-strbuf-missing-init to builtin/ rename

138 + + commit, merge: initialize static strbuf

139

208 -Will merge to "next".

140 +* jk/pretty-reglog-ent (2011-12-16) 1 commit

141 + (merged to 'next' on 2011-12-20 at 949b010)

142 + + pretty: give placeholders to reflog identity

143

210 -* rs/diff-tree-combined-clean-up (2011-12-17) 3 commits

211 - - submodule: use diff_tree_combined_merge() instead of diff_tree_combined()

212 - - pass struct commit to diff_tree_combined_merge()

213 - - use struct sha1_array in diff_tree_combined()

144 +* jn/test-cleanup-7006 (2011-12-14) 1 commit

145 + (merged to 'next' on 2011-12-20 at 952f48f)

146 + + test: errors preparing for a test are not special

147 +

148 +* mh/ref-api (2011-12-12) 16 commits

149 + (merged to 'next' on 2011-12-15 at d65a830)

150 + + add_ref(): take a (struct ref_entry *) parameter

151 + + create_ref_entry(): extract function from add_ref()

152 + + repack_without_ref(): remove temporary

153 + + resolve_gitlink_ref_recursive(): change to work with struct ref_cache

154 + + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions

155 + + resolve_gitlink_ref(): improve docstring

156 + + get_ref_dir(): change signature

157 + + refs: change signatures of get_packed_refs() and get_loose_refs()

158 + + is_dup_ref(): extract function from sort_ref_array()

159 + + add_ref(): add docstring

160 + + parse_ref_line(): add docstring

161 + + is_refname_available(): remove the "quiet" argument

162 + + clear_ref_array(): rename from free_ref_array()

163 + + refs: rename parameters result -> sha1

164 + + refs: rename "refname" variables

165 + + struct ref_entry: document name member

166 + (this branch is used by mh/ref-api-rest.)

167

215 -Will merge to "next".

168 +Later part split out to expedite moving the earlier good bits forward.

169

217 -* jn/maint-gitweb-utf8-fix (2011-12-19) 4 commits

218 - - gitweb: Fix fallback mode of to_utf8 subroutine

219 - - gitweb: Output valid utf8 in git_blame_common('data')

220 - - gitweb: esc_html() site name for title in OPML

221 - - gitweb: Call to_utf8() on input string in chop_and_escape_str()

170 +* nd/war-on-nul-in-commit (2011-12-15) 3 commits

171 + (merged to 'next' on 2011-12-20 at d441111)

172 + + commit_tree(): refuse commit messages that contain NULs

173 + + Convert commit_tree() to take strbuf as message

174 + + merge: abort if fails to commit

175 +

176 +* rs/diff-tree-combined-clean-up (2011-12-17) 3 commits

177 + (merged to 'next' on 2011-12-20 at 265e049)

178 + + submodule: use diff_tree_combined_merge() instead of diff_tree_combined()

179 + + pass struct commit to diff_tree_combined_merge()

180 + + use struct sha1_array in diff_tree_combined()

181

223 -Will merge to "next".

182 +* tr/grep-threading (2011-12-16) 3 commits

183 + (merged to 'next' on 2011-12-20 at 1a852ef)

184 + + grep: disable threading in non-worktree case

185 + + grep: enable threading with -p and -W using lazy attribute lookup

186 + + grep: load funcname patterns for -W

187 +

188 +--------------------------------------------------

189 +[Stalled]

190

191 * pw/p4-docs-and-tests (2011-12-18) 11 commits

192 - git-p4: document and test submit options

@@ -239,7 +205,6 @@ Waiting for a reroll.

205

206 * jc/advise-push-default (2011-12-18) 1 commit

207 - push: hint to use push.default=upstream when appropriate

242 - (this branch uses jc/advice-doc.)

208

209 Peff had a good suggestion outlining an updated code structure so that

210 somebody new can try to dip his or her toes in the development. Any

@@ -247,44 +212,6 @@ takers?

212

213 Waiting for a reroll.

214

250 -* ef/setenv-putenv (2011-12-14) 2 commits

251 - - compat/setenv.c: error if name contains '='

252 - - compat/setenv.c: update errno when erroring out

253 - (this branch is used by ef/x-setenv-putenv.)

254 -

255 -Will merge to "next".

256 -

257 -* jk/maint-do-not-feed-stdin-to-tests (2011-12-15) 1 commit

258 - - test-lib: redirect stdin of tests

259 -

260 -Will merge to "next".

261 -

262 -* jn/test-cleanup-7006 (2011-12-14) 1 commit

263 - - test: errors preparing for a test are not special

264 -

265 -Will merge to "next".

266 -

267 -* nd/war-on-nul-in-commit (2011-12-15) 3 commits

268 - - commit_tree(): refuse commit messages that contain NULs

269 - - Convert commit_tree() to take strbuf as message

270 - - merge: abort if fails to commit

271 -

272 -Will merge to "next".

273 -

274 -* jk/git-prompt (2011-12-12) 10 commits

275 - - contrib: add credential helper for OS X Keychain

276 - - Makefile: OS X has /dev/tty

277 - - Makefile: linux has /dev/tty

278 - - credential: use git_prompt instead of git_getpass

279 - - prompt: use git_terminal_prompt

280 - - add generic terminal prompt function

281 - - refactor git_getpass into generic prompt function

282 - - move git_getpass to its own source file

283 - - imap-send: don't check return value of git_getpass

284 - - imap-send: avoid buffer overflow

285 -

286 -Will merge to 'next' after taking another look.

287 -

215 * mh/ref-api-rest (2011-12-12) 35 commits

216 - repack_without_ref(): call clear_packed_ref_cache()

217 - read_packed_refs(): keep track of the directory being worked in

@@ -321,49 +248,58 @@ Will merge to 'next' after taking another look.

248 - do_for_each_ref_in_arrays(): new function

249 - do_for_each_ref_in_array(): new function

250 - do_for_each_ref(): correctly terminate while processesing extra_refs

324 - (this branch uses mh/ref-api.)

251

252 The API for extra anchoring points may require rethought first; that would

253 hopefully make the "ref" part a lot simpler.

254

255 Waiting for a reroll.

256

331 -* mh/ref-api (2011-12-12) 16 commits

332 - (merged to 'next' on 2011-12-15 at d65a830)

333 - + add_ref(): take a (struct ref_entry *) parameter

334 - + create_ref_entry(): extract function from add_ref()

335 - + repack_without_ref(): remove temporary

336 - + resolve_gitlink_ref_recursive(): change to work with struct ref_cache

337 - + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions

338 - + resolve_gitlink_ref(): improve docstring

339 - + get_ref_dir(): change signature

340 - + refs: change signatures of get_packed_refs() and get_loose_refs()

341 - + is_dup_ref(): extract function from sort_ref_array()

342 - + add_ref(): add docstring

343 - + parse_ref_line(): add docstring

344 - + is_refname_available(): remove the "quiet" argument

345 - + clear_ref_array(): rename from free_ref_array()

346 - + refs: rename parameters result -> sha1

347 - + refs: rename "refname" variables

348 - + struct ref_entry: document name member

349 - (this branch is used by mh/ref-api-rest.)

257 +* jc/split-blob (2011-12-01) 6 commits

258 + . WIP (streaming chunked)

259 + - chunked-object: fallback checkout codepaths

260 + - bulk-checkin: support chunked-object encoding

261 + - bulk-checkin: allow the same data to be multiply hashed

262 + - new representation types in the packstream

263 + - varint-in-pack: refactor varint encoding/decoding

264

351 -Later part split out to expedite moving the earlier good bits forward.

265 +Not ready.

266

353 -Will merge to "master".

267 +At least pack-objects and fsck need to learn the new encoding for the

268 +series to be usable locally, and then index-pack/unpack-objects needs to

269 +learn it to be used remotely.

270

355 -* tr/grep-threading (2011-12-16) 3 commits

356 - - grep: disable threading in non-worktree case

357 - - grep: enable threading with -p and -W using lazy attribute lookup

358 - - grep: load funcname patterns for -W

271 +--------------------------------------------------

272 +[Cooking]

273

360 -Will merge to 'next' after taking another look.

274 +* jn/maint-gitweb-utf8-fix (2011-12-19) 4 commits

275 + (merged to 'next' on 2011-12-20 at b816812)

276 + + gitweb: Fix fallback mode of to_utf8 subroutine

277 + + gitweb: Output valid utf8 in git_blame_common('data')

278 + + gitweb: esc_html() site name for title in OPML

279 + + gitweb: Call to_utf8() on input string in chop_and_escape_str()

280

281 * tr/pty-all (2011-12-19) 1 commit

363 - - test-terminal: set output terminals to raw mode

282 + (merged to 'next' on 2011-12-20 at 9b637d3)

283 + + test-terminal: set output terminals to raw mode

284

285 Kept only the second one from the original.

366 -Will merge to "next".

286 +

287 +* rr/revert-cherry-pick (2011-12-15) 6 commits

288 + (merged to 'next' on 2011-12-21 at d0428dc)

289 + + t3502, t3510: clarify cherry-pick -m failure

290 + + t3510 (cherry-pick-sequencer): use exit status

291 + + revert: simplify getting commit subject in format_todo()

292 + + revert: tolerate extra spaces, tabs in insn sheet

293 + + revert: make commit subjects in insn sheet optional

294 + + revert: free msg in format_todo()

295 +

296 +* jc/signed-commit (2011-11-29) 5 commits

297 + (merged to 'next' on 2011-12-21 at 8fcbf00)

298 + + gpg-interface: allow use of a custom GPG binary

299 + + pretty: %G[?GS] placeholders

300 + + test "commit -S" and "log --show-signature"

301 + + log: --show-signature

302 + + commit: teach --gpg-sign option

303

304 * jc/push-ignore-stale (2011-12-14) 2 commits

305 - push: --ignore-stale option

@@ -373,36 +309,3 @@ Probably solving a wrong problem and encouraging a wrong workflow while at

309 it. jc/advise-push-default might be a better approach.

310

311 Will drop.

376 -

377 -* rr/revert-cherry-pick (2011-12-15) 6 commits

378 - - t3502, t3510: clarify cherry-pick -m failure

379 - - t3510 (cherry-pick-sequencer): use exit status

380 - - revert: simplify getting commit subject in format_todo()

381 - - revert: tolerate extra spaces, tabs in insn sheet

382 - - revert: make commit subjects in insn sheet optional

383 - - revert: free msg in format_todo()

384 -

385 -Will merge to "next".

386 -

387 -* jc/split-blob (2011-12-01) 6 commits

388 - . WIP (streaming chunked)

389 - - chunked-object: fallback checkout codepaths

390 - - bulk-checkin: support chunked-object encoding

391 - - bulk-checkin: allow the same data to be multiply hashed

392 - - new representation types in the packstream

393 - - varint-in-pack: refactor varint encoding/decoding

394 -

395 -Not ready.

396 -

397 -At least pack-objects and fsck need to learn the new encoding for the

398 -series to be usable locally, and then index-pack/unpack-objects needs to

399 -learn it to be used remotely.

400 -

401 -* jc/signed-commit (2011-11-29) 5 commits

402 - - gpg-interface: allow use of a custom GPG binary

403 - - pretty: %G[?GS] placeholders

404 - - test "commit -S" and "log --show-signature"

405 - - log: --show-signature

406 - - commit: teach --gpg-sign option

407 -

408 -Not urgent.

What's cooking (2011/12 #08)