d146792947 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: 8963314c77af9a4eda5dcbdbab3d4001af83ad81

4 -X-next-at: debedcddff2f53e631c2ab6fdff41d36fd7381df

2 +Subject: What's cooking in git.git (Oct 2011, #09; Sun, 23)

3 +X-master-at: 10b2a48113b8ab6b8f48229eb40fc3637ce025ae

4 +X-next-at: 03eec2553f5bdf546687f47517181ada4484cae8

5

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

6 +What's cooking in git.git (Oct 2011, #09; Sun, 23)

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

8

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

@@ -47,9 +47,16 @@ They are pushed to their own separate repositories instead:

47 --------------------------------------------------

48 [New Topics]

49

50 -* fg/submodule-git-file-git-dir (2011-10-21) 2 commits

51 - - submodule::module_clone(): silence die() message from module_name()

52 - - submodule: whitespace fix

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

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

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

53 +

54 +--------------------------------------------------

55 +[Graduated to "master"]

56 +

57 +* cn/doc-config-bare-subsection (2011-10-16) 1 commit

58 + (merged to 'next' on 2011-10-17 at a6412d4)

59 + + Documentation: update [section.subsection] to reflect what git does

60

61 * jc/broken-ref-dwim-fix (2011-10-19) 3 commits

62 (merged to 'next' on 2011-10-19 at 40cad95)

@@ -60,41 +67,77 @@ They are pushed to their own separate repositories instead:

67

68 This only takes good bits from the failed jc/check-ref-format-fixup topic

69 and implements saner workaround for the recent breakage on the 'master'.

63 -Will merge to 'master' shortly.

70

65 -* jm/maint-gitweb-filter-forks-fix (2011-10-21) 1 commit

66 - (merged to 'next' on 2011-10-21 at debedcd)

67 - + gitweb: fix regression when filtering out forks

71 +* jc/maint-remove-renamed-ref (2011-10-12) 1 commit

72 + (merged to 'next' on 2011-10-12 at 819c3e4)

73 + + branch -m/-M: remove undocumented RENAMED-REF

74

69 -Will merge to 'master' shortly.

75 +* jc/make-tags (2011-10-18) 1 commit

76 + (merged to 'next' on 2011-10-19 at b0b91bf)

77 + + Makefile: ask "ls-files" to list source files if available

78

71 -* lh/gitweb-site-html-head (2011-10-21) 1 commit

72 - - gitweb: provide a way to customize html headers

79 +* jc/match-refs-clarify (2011-09-12) 2 commits

80 + (merged to 'next' on 2011-10-19 at b295e1e)

81 + + rename "match_refs()" to "match_push_refs()"

82 + + send-pack: typofix error message

83

74 -Looked Ok.

75 -Will merge to 'next'.

84 +* jc/unseekable-bundle (2011-10-13) 2 commits

85 + (merged to 'next' on 2011-10-19 at 2978ee0)

86 + + bundle: add parse_bundle_header() helper function

87 + + bundle: allowing to read from an unseekable fd

88

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

78 - - is_refname_available(): reimplement using do_for_each_ref_in_array()

79 - - names_conflict(): simplify implementation

80 - - names_conflict(): new function, extracted from is_refname_available()

81 - - repack_without_ref(): reimplement using do_for_each_ref_in_array()

82 - - do_for_each_ref_in_array(): new function

83 - - do_for_each_ref(): correctly terminate while processesing extra_refs

84 - - add_ref(): take a (struct ref_entry *) parameter

85 - - create_ref_entry(): extract function from add_ref()

86 - - parse_ref_line(): add a check that the refname is properly formatted

87 - - repack_without_ref(): remove temporary

88 - - Rename another local variable name -> refname

89 - (this branch uses mh/ref-api and mh/ref-api-2.)

90 -

91 -Looked reasonable.

92 -Will merge to 'next'.

89 +* jk/daemon-msgs (2011-10-15) 1 commit

90 + (merged to 'next' on 2011-10-15 at 415cf53)

91 + + daemon: give friendlier error messages to clients

92 + (this branch is used by cb/daemon-permission-errors.)

93

94 -* mm/mediawiki-author-fix (2011-10-20) 1 commit

95 - - git-remote-mediawiki: don't include HTTP login/password in author

94 +* jk/maint-pack-objects-compete-with-delete (2011-10-14) 2 commits

95 + (merged to 'next' on 2011-10-15 at 49479e4)

96 + + downgrade "packfile cannot be accessed" errors to warnings

97 + + pack-objects: protect against disappearing packs

98

97 -Will merge to 'next'.

99 +* mh/ref-api (2011-10-16) 7 commits

100 + (merged to 'next' on 2011-10-17 at 219000f)

101 + + clear_ref_cache(): inline function

102 + + write_ref_sha1(): only invalidate the loose ref cache

103 + + clear_ref_cache(): extract two new functions

104 + + clear_ref_cache(): rename parameter

105 + + invalidate_ref_cache(): expose this function in the refs API

106 + + invalidate_ref_cache(): take the submodule as parameter

107 + + invalidate_ref_cache(): rename function from invalidate_cached_refs()

108 + (this branch is used by mh/ref-api-2 and mh/ref-api-3.)

109 +

110 +* ph/transport-with-gitfile (2011-10-11) 5 commits

111 + (merged to 'next' on 2011-10-12 at 6d58417)

112 + + Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile

113 + (merged to 'next' on 2011-10-06 at 891b8b6)

114 + + Add test showing git-fetch groks gitfiles

115 + + Teach transport about the gitfile mechanism

116 + + Learn to handle gitfiles in enter_repo

117 + + enter_repo: do not modify input

118 +

119 +* po/insn-editor (2011-10-17) 1 commit

120 + (merged to 'next' on 2011-10-19 at cbf5e0b)

121 + + "rebase -i": support special-purpose editor to edit insn sheet

122 +

123 +* pw/p4-update (2011-10-17) 6 commits

124 + (merged to 'next' on 2011-10-17 at f69f6cc)

125 + + git-p4: handle files with shell metacharacters

126 + + git-p4: keyword flattening fixes

127 + + git-p4: stop ignoring apple filetype

128 + + git-p4: recognize all p4 filetypes

129 + + git-p4: handle utf16 filetype properly

130 + + git-p4 tests: refactor and cleanup

131 +

132 +* sc/difftool-skip (2011-10-14) 2 commits

133 + (merged to 'next' on 2011-10-14 at b91c581)

134 + + t7800: avoid arithmetic expansion notation

135 + (merged to 'next' on 2011-10-11 at 38d7e84)

136 + + git-difftool: allow skipping file by typing 'n' at prompt

137 +

138 +* ss/inet-ntop (2011-10-18) 1 commit

139 + (merged to 'next' on 2011-10-19 at 85469f6)

140 + + inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

141

142 --------------------------------------------------

143 [Stalled]

@@ -130,25 +173,74 @@ I do not think there is anything fundamentally wrong with this series, but

173 the risk of breakage far outweighs observed performance gain in one

174 particular workload.

175

176 +* jc/verbose-checkout (2011-10-16) 2 commits

177 + - checkout -v: give full status output after switching branches

178 + - checkout: move the local changes report to the end

179 +

180 +This is just to leave a record that the reason why we do not do this not

181 +because we are incapable of coding this, but because it is not a good idea

182 +to do this. I suspect people who are new to git that might think they need

183 +it would soon realize the don't.

184 +

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

186 +

187 --------------------------------------------------

188 [Cooking]

189

136 -* rr/revert-cherry-pick (2011-10-19) 6 commits

190 +* tc/submodule-clone-name-detection (2011-10-21) 2 commits

191 + (merged to 'next' on 2011-10-23 at c18af03)

192 + + submodule::module_clone(): silence die() message from module_name()

193 + + submodule: whitespace fix

194 +

195 +"git submodule clone" used to show unnecessary error message when

196 +submodule mapping from name to path is not found in .gitmodules file.

197 +

198 +Will merge to 'master'.

199 +

200 +* jm/maint-gitweb-filter-forks-fix (2011-10-21) 1 commit

201 + (merged to 'next' on 2011-10-21 at debedcd)

202 + + gitweb: fix regression when filtering out forks

203 +

204 +Will merge to 'master' shortly.

205 +

206 +* lh/gitweb-site-html-head (2011-10-21) 1 commit

207 + (merged to 'next' on 2011-10-23 at 65075df)

208 + + gitweb: provide a way to customize html headers

209 +

210 +Will merge to 'master' shortly.

211 +

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

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

214 + + is_refname_available(): reimplement using do_for_each_ref_in_array()

215 + + names_conflict(): simplify implementation

216 + + names_conflict(): new function, extracted from is_refname_available()

217 + + repack_without_ref(): reimplement using do_for_each_ref_in_array()

218 + + do_for_each_ref_in_array(): new function

219 + + do_for_each_ref(): correctly terminate while processesing extra_refs

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

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

222 + + parse_ref_line(): add a check that the refname is properly formatted

223 + + repack_without_ref(): remove temporary

224 + + Rename another local variable name -> refname

225 + (this branch uses mh/ref-api-2.)

226 +

227 +* mm/mediawiki-author-fix (2011-10-20) 1 commit

228 + (merged to 'next' on 2011-10-23 at 9f85b67)

229 + + git-remote-mediawiki: don't include HTTP login/password in author

230 +

231 +Will merge to 'master' shortly.

232 +

233 +* rr/revert-cherry-pick (2011-10-23) 5 commits

234 - revert: simplify communicating command-line arguments

235 - revert: allow mixed pick and revert instructions

236 - revert: make commit subjects in insn sheet optional

140 - - revert: fix buffer overflow in insn sheet parser

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

238 - revert: free msg in format_todo()

239

144 -Perhaps 3rd and 4th should be squashed together?

145 -

146 -* jc/match-refs-clarify (2011-09-12) 2 commits

147 - (merged to 'next' on 2011-10-19 at b295e1e)

148 - + rename "match_refs()" to "match_push_refs()"

149 - + send-pack: typofix error message

240 +The internals of "git revert/cherry-pick" has been further refactored to

241 +serve as the basis for the sequencer.

242

151 -Will merge to 'master' shortly.

243 +Will merge to 'next'.

244

245 * jn/libperl-git-config (2011-10-21) 2 commits

246 (merged to 'next' on 2011-10-21 at 76e2d4b)

@@ -157,60 +249,23 @@ Will merge to 'master' shortly.

249

250 Will merge to 'master' shortly.

251

160 -* ss/inet-ntop (2011-10-18) 1 commit

161 - (merged to 'next' on 2011-10-19 at 85469f6)

162 - + inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

163 -

164 -Will merge to 'master' shortly.

165 -

166 -* jc/check-ref-format-fixup (2011-10-19) 3 commits

252 +* jc/check-ref-format-fixup (2011-10-19) 2 commits

253 (merged to 'next' on 2011-10-19 at 98981be)

254 + Revert "Restrict ref-like names immediately below $GIT_DIR"

255 (merged to 'next' on 2011-10-15 at 8e89bc5)

256 + Restrict ref-like names immediately below $GIT_DIR

171 - + refs.c: move dwim_ref()/dwim_log() from sha1_name.c

172 - (this branch is tangled with jc/broken-ref-dwim-fix.)

257

258 This became a no-op except for the bottom one which is part of the other

259 topic now.

260 Will discard once the other topic graduates to 'master'.

261

178 -* pw/p4-update (2011-10-17) 6 commits

179 - (merged to 'next' on 2011-10-17 at f69f6cc)

180 - + git-p4: handle files with shell metacharacters

181 - + git-p4: keyword flattening fixes

182 - + git-p4: stop ignoring apple filetype

183 - + git-p4: recognize all p4 filetypes

184 - + git-p4: handle utf16 filetype properly

185 - + git-p4 tests: refactor and cleanup

186 -

187 -Will merge to 'master' in the fifth wave.

188 -

189 -* cn/doc-config-bare-subsection (2011-10-16) 1 commit

190 - (merged to 'next' on 2011-10-17 at a6412d4)

191 - + Documentation: update [section.subsection] to reflect what git does

192 -

193 -Will merge to 'master' in the fifth wave.

194 -

262 * cb/daemon-permission-errors (2011-10-17) 2 commits

263 - daemon: report permission denied error to clients

264 - daemon: add tests

198 - (this branch uses jk/daemon-msgs.)

265

266 The tip commit might be loosening things a bit too much.

267 Will keep in 'pu' until hearing a convincing argument for the patch.

268

203 -* jc/verbose-checkout (2011-10-16) 2 commits

204 - - checkout -v: give full status output after switching branches

205 - - checkout: move the local changes report to the end

206 -

207 -This is just to leave a record that the reason why we do not do this not

208 -because we are incapable of coding this, but because it is not a good idea

209 -to do this. I suspect people who are new to git that might think they need

210 -it would soon realize the don't.

211 -

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

213 -

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

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

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

@@ -234,18 +289,12 @@ Will keep in 'pu' until the planned re-roll comes.

289 + refs: rename "refname" variables

290 + struct ref_entry: document name member

291 + cache.h: add comments for git_path() and git_path_submodule()

237 - (this branch is used by mh/ref-api-3; uses mh/ref-api.)

292 + (this branch is used by mh/ref-api-3.)

293

294 It is either merge this quickly to 'master' and hope there won't be any

295 more unexpected breakage that forces us to delay the release, or hold it

241 -on 'next' until the next cycle. I am inclined to the former, but not quite

242 -ready to commit to it yet.

243 -

244 -* po/insn-editor (2011-10-17) 1 commit

245 - (merged to 'next' on 2011-10-19 at cbf5e0b)

246 - + "rebase -i": support special-purpose editor to edit insn sheet

247 -

248 -Will merge to 'master' shortly.

296 +on 'next' until the next cycle. I am inclined to do the former, but not

297 +quite ready to commit to it yet.

298

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

300 - pack-objects: don't traverse objects unnecessarily

@@ -258,44 +307,23 @@ the cycle for a series that touches a seriously important part of the

307 system.

308

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

261 - - completion: match ctags symbol names in grep patterns

262 - - contrib: add git-jump script

263 - - contrib: add diff highlight script

264 -

265 -Will merge to 'next'.

266 -

267 -* jc/make-tags (2011-10-18) 1 commit

268 - (merged to 'next' on 2011-10-19 at b0b91bf)

269 - + Makefile: ask "ls-files" to list source files if available

270 -

271 -Will merge to 'master' shortly.

272 -

273 -* jc/signed-commit (2011-10-20) 6 commits

274 - - parse_signed_commit: really use the entire commit log message

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

276 - - t7004: extract generic "GPG testing" bits

277 - - log: --show-signature

278 - - commit: teach --gpg-sign option

279 - - Split GPG interface into its own helper library

280 -

281 -This is to replace the earlier "signed push" experiments. Probably ready

282 -for 'next'.

283 -

284 -* mh/ref-api (2011-10-16) 7 commits

285 - (merged to 'next' on 2011-10-17 at 219000f)

286 - + clear_ref_cache(): inline function

287 - + write_ref_sha1(): only invalidate the loose ref cache

288 - + clear_ref_cache(): extract two new functions

289 - + clear_ref_cache(): rename parameter

290 - + invalidate_ref_cache(): expose this function in the refs API

291 - + invalidate_ref_cache(): take the submodule as parameter

292 - + invalidate_ref_cache(): rename function from invalidate_cached_refs()

293 - (this branch is used by mh/ref-api-2 and mh/ref-api-3.)

294 -

295 -It is either merge this quickly to 'master' and hope there won't be any

296 -more unexpected breakage that forces us to delay the release, or hold it

297 -on 'next' until the next cycle. I am inclined to the former, but not quite

298 -ready to commit to it yet.

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

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

312 + + contrib: add git-jump script

313 + + contrib: add diff highlight script

314 +

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

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

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

318 + + parse_signed_commit: really use the entire commit log message

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

320 + + t7004: extract generic "GPG testing" bits

321 + + log: --show-signature

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

323 + + Split GPG interface into its own helper library

324 +

325 +This is to replace the earlier "signed push" experiments.

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

327

328 * sg/complete-refs (2011-10-21) 9 commits

329 - completion: remove broken dead code from __git_heads() and __git_tags()

@@ -308,31 +336,8 @@ ready to commit to it yet.

336 - completion: optimize refs completion

337 - completion: document __gitcomp()

338

311 -Rerolled.

312 -

313 -Will keep in 'pu' until an Ack or two from people who have worked on the

314 -completion in the past comes.

315 -

316 -* jc/unseekable-bundle (2011-10-13) 2 commits

317 - (merged to 'next' on 2011-10-19 at 2978ee0)

318 - + bundle: add parse_bundle_header() helper function

319 - + bundle: allowing to read from an unseekable fd

320 -

321 -Will merge to 'master' shortly.

322 -

323 -* jk/daemon-msgs (2011-10-15) 1 commit

324 - (merged to 'next' on 2011-10-15 at 415cf53)

325 - + daemon: give friendlier error messages to clients

326 - (this branch is used by cb/daemon-permission-errors.)

327 -

328 -Will merge to 'master' in the fifth wave.

329 -

330 -* jk/maint-pack-objects-compete-with-delete (2011-10-14) 2 commits

331 - (merged to 'next' on 2011-10-15 at 49479e4)

332 - + downgrade "packfile cannot be accessed" errors to warnings

333 - + pack-objects: protect against disappearing packs

334 -

335 -Will merge to 'master' in the fifth wave.

339 +Will merge to 'next' but won't merge further until an Ack or two from

340 +people who have worked on the completion in the past comes.

341

342 * cn/fetch-prune (2011-10-15) 5 commits

343 (merged to 'next' on 2011-10-16 at 02a449e)

@@ -342,32 +347,11 @@ Will merge to 'master' in the fifth wave.

347 + t5510: add tests for fetch --prune

348 + fetch: free all the additional refspecs

349

345 -Will merge to 'master' in the sixth wave.

346 -

347 -* sc/difftool-skip (2011-10-14) 2 commits

348 - (merged to 'next' on 2011-10-14 at b91c581)

349 - + t7800: avoid arithmetic expansion notation

350 - (merged to 'next' on 2011-10-11 at 38d7e84)

351 - + git-difftool: allow skipping file by typing 'n' at prompt

352 -

353 -Will merge to 'master' in the fifth wave.

354 -

355 -* jc/maint-remove-renamed-ref (2011-10-12) 1 commit

356 - (merged to 'next' on 2011-10-12 at 819c3e4)

357 - + branch -m/-M: remove undocumented RENAMED-REF

358 -

359 -Will merge to 'master' in the sixth wave.

360 -

361 -* ph/transport-with-gitfile (2011-10-11) 5 commits

362 - (merged to 'next' on 2011-10-12 at 6d58417)

363 - + Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile

364 - (merged to 'next' on 2011-10-06 at 891b8b6)

365 - + Add test showing git-fetch groks gitfiles

366 - + Teach transport about the gitfile mechanism

367 - + Learn to handle gitfiles in enter_repo

368 - + enter_repo: do not modify input

350 +"git fetch --prune" used to prune remote tracking branches by comparing

351 +what was actually fetched and what was configured to be fetched, which was

352 +wrong.

353

370 -Will merge to 'master' in the fifth wave.

354 +Will merge to 'master' shortly.

355

356 * jc/request-pull-show-head-4 (2011-10-15) 11 commits

357 (merged to 'next' on 2011-10-15 at 7e340ff)

@@ -386,4 +370,7 @@ Will merge to 'master' in the fifth wave.

370 + branch: add read_branch_desc() helper function

371 + Merge branch 'bk/ancestry-path' into jc/branch-desc

372

389 -Will merge to 'master' in the sixth wave.

373 +Allow setting "description" for branches and use it to help communications

374 +between humans in various workflow elements.

375 +

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

What's cooking (2011/10 #09)