6dea48b707 · matheusbsbs/matheus-bagliano

@@ -1,23 +1,41 @@

1 To: git@vger.kernel.org

2 +Cc: Eric Wong <normalperson@yhbt.net>,

3 + Pete Wyckoff <pw@padd.com>,

4 + Luke Diamand <luke@diamand.org>,

5 + Erik Faye-Lund <kusmabite@gmail.com>,

6 + Stefan Zager <szager@google.com>

7 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Aug 2012, #05; Sat, 18)

4 -X-master-at: 91e4bfe96f1e72a3ce743fe032bfadfc9509fc2a

5 -X-next-at: f24913b098a0334d129beee428e81b2d82449265

8 +Subject: What's cooking in git.git (Aug 2012, #06; Sun, 19)

9 +X-master-at: 889d35899ba64640e47798681ecb34a4be043bad

10 +X-next-at: d66298809de5c57cf7578f0abaa9088f2784c3c9

11

7 -What's cooking in git.git (Aug 2012, #05; Sat, 18)

12 +What's cooking in git.git (Aug 2012, #06; Sun, 19)

13 --------------------------------------------------

14

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

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

17

13 -I'll be tagging the v1.7.12 final sometime tomorrow, and following

14 -the tradition the next branch will be rebuilt on top of 'master'

15 -after a few days. We would also eject some topics in 'next' that

16 -turned out to be mistakes when that rebuilding happens, but I do not

17 -think we have any such topics right now. And then, post 1.7.12

18 -cycle opens. I think the next cycle should start the transition of

19 -that much waited "push default change" topic and perhaps we may want

20 -to even call it 1.8.0 release. I haven't decided yet.

18 +Now 1.7.12 is out, we will have a few days of calming down period on

19 +the 'master' front, just in case we have to deal with brown paper

20 +bag post-release fixes, and then start getting the topics that have

21 +been cooking on the 'next' branch graduate to the 'master', perhaps

22 +starting on coming Wednesday.

23 +

24 +For this cycle, we already have fairly well cooked topics, many of

25 +which are on 'next', and the git-svn updates for svn 1.7 by Michael

26 +G Schwern is also a candidate for early graduation, provided if Eric

27 +is OK with the series (I'd need to double check with him). There

28 +also were some topics that were almost there already during their

29 +review discussions but somehow lost momentum when we got distracted,

30 +and I think most of them would be ready fairly quickly if the

31 +respective owners of the topics (you know who you are) can find time

32 +to put some work into them.

33 +

34 +So I'm planning to keep this cycle reasonably short and aim for

35 +tagging the result as 1.8.0 at the end of 9th week, on October 21st,

36 +after which I'd disappear for a few weeks.

37 +http://tinyurl.com/gitCal is where you can always find my rough

38 +tagging schedule at.

39

40 You can find the changes described here in the integration branches of the

41 repositories listed at

@@ -27,6 +45,97 @@ repositories listed at

45 --------------------------------------------------

46 [New Topics]

47

48 +* kk/maint-for-each-ref-multi-sort (2012-08-19) 2 commits

49 + - for-each-ref: Fix sort with multiple keys

50 + - t6300: test sort with multiple keys

51 +

52 +A small and sensible fix, even though the accompanying test seems to

53 +touch too many unrelated existing ones needlessly, which may want to

54 +be fixed by a reroll.

55 +

56 +--------------------------------------------------

57 +[Stalled]

58 +

59 +* mz/rebase-range (2012-07-18) 7 commits

60 + . rebase (without -p): correctly calculate patches to rebase

61 + . rebase -p: don't request --left-right only to ignore left side

62 + . rebase -p: use --cherry-mark for todo file

63 + . git-rebase--interactive.sh: look up subject in add_pick_line

64 + . git-rebase--interactive: group all $preserve_merges code

65 + . git-rebase--interactive.sh: extract function for adding "pick" line

66 + . git-rebase--am.sh: avoid special-casing --keep-empty

67 +

68 +Expecting a reroll.

69 +

70 +Performance concerns from Windows folks. Also the series lacks

71 +proper sign-offs.

72 +

73 +* jl/submodule-rm (2012-07-05) 2 commits

74 + - rm: remove submodules from the index and the .gitmodules file

75 + - rm: don't fail when removing populated submodules

76 +

77 +Expecting a reroll.

78 +

79 +* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit

80 + - commit/commit-tree: correct latin1 to utf-8

81 +

82 +Teaches "git commit" and "git commit-tree" the "we are told to use

83 +utf-8 in log message, but this does not look like utf-8---attempt to

84 +pass it through convert-from-latin1-to-utf8 and see if it makes

85 +sense" heuristics "git mailinfo" already uses.

86 +

87 +A draft from Linus received privately without a log message.

88 +Expecting a reroll.

89 +

90 +* mb/remote-default-nn-origin (2012-07-11) 6 commits

91 + - Teach get_default_remote to respect remote.default.

92 + - Test that plain "git fetch" uses remote.default when on a detached HEAD.

93 + - Teach clone to set remote.default.

94 + - Teach "git remote" about remote.default.

95 + - Teach remote.c about the remote.default configuration setting.

96 + - Rename remote.c's default_remote_name static variables.

97 +

98 +When the user does not specify what remote to interact with, we

99 +often attempt to use 'origin'. This can now be customized via a

100 +configuration variable.

101 +

102 +Expecting a reroll.

103 +"The first remote becomes the default" bit is better done as a

104 +separate step.

105 +

106 +* jc/split-blob (2012-04-03) 6 commits

107 + - chunked-object: streaming checkout

108 + - chunked-object: fallback checkout codepaths

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

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

111 + - new representation types in the packstream

112 + - packfile: use varint functions

113 +

114 +Not ready.

115 +

116 +I finished the streaming checkout codepath, but as explained in

117 +127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),

118 +these are still early steps of a long and painful journey. At least

119 +pack-objects and fsck need to learn the new encoding for the series

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

121 +learn it to be used remotely.

122 +

123 +Given that I heard a lot of noise that people want large files, and

124 +that I was asked by somebody at GitTogether'11 privately for an

125 +advice on how to pay developers (not me) to help adding necessary

126 +support, I am somewhat dissapointed that the original patch series

127 +that was sent long time ago still remains here without much comments

128 +and updates from the developer community. I even made the interface

129 +to the logic that decides where to split chunks easily replaceable,

130 +and I deliberately made the logic in the original patch extremely

131 +stupid to entice others, especially the "bup" fanbois, to come up

132 +with a better logic, thinking that giving people an easy target to

133 +shoot for, they may be encouraged to help out. The plan is not

134 +working :-<.

135 +

136 +--------------------------------------------------

137 +[Cooking]

138 +

139 * hv/coding-guidelines (2012-08-15) 1 commit

140 (merged to 'next' on 2012-08-18 at 5a78f2c)

141 + Documentation/CodingGuidelines: spell out more shell guidelines

@@ -35,12 +144,16 @@ In earlier days, "imitate the style in the neibouring code" was

144 sufficient to keep the coherent style, but over time some parts of

145 the codebase have drifted enough to make it ineffective.

146

147 +Will merge to 'master' as part of the first batch.

148 +

149 * jc/daemon-access-hook (2012-08-15) 1 commit

150 - daemon: --access-hook option

151

152 Allow an external command to tell git-daemon to decline service

153 based on the client address, repository path, etc.

154

155 +Will merge to 'next'.

156 +

157 * jc/send-email-reconfirm (2012-08-14) 1 commit

158 - send-email: validate & reconfirm interactive responses

159

@@ -48,6 +161,8 @@ Validate interactive input to "git send-email" to avoid common

161 mistakes such as saying "y<RETURN>" to sender mail address whose

162 prompt is given with a correctly guessed default.

163

164 +Will merge to 'next'.

165 +

166 * pw/p4-submit-conflicts (2012-08-16) 12 commits

167 - git p4: add submit --prepare-p4-only option

168 - git p4: add submit --dry-run option

@@ -62,13 +177,23 @@ prompt is given with a correctly guessed default.

177 - git p4 test: use p4d -L option to suppress log messages

178 - git p4 test: remove bash-ism of combined export/assignment

179

180 +I saw Pete and Luke going back and forth collaborating, so I take

181 +that this may still be rerolled---if not, please holler.

182 +

183 * tx/relative-in-the-future (2012-08-16) 2 commits

184 - date: show relative dates in the future

185 - date: refactor the relative date logic from presentation

186

187 +Not my itch; rewritten an earlier submission by Tom Xue into

188 +somewhat more maintainable form, though it breaks existing i18n.

189 +

190 * ef/win32-cred-helper (2012-08-16) 1 commit

191 - contrib: add win32 credential-helper

192

193 +Credential helper for Win32 (is this GUI???).

194 +

195 +Will merge to 'next'.

196 +

197 * jc/maint-abbrev-option-cli (2012-08-16) 1 commit

198 (merged to 'next' on 2012-08-18 at e002006)

199 + gitcli: describe abbreviation of long options

@@ -78,21 +203,28 @@ abbreviations of long options (e.g. "--option" may be the only flag

203 that the command accepts that begin with "--opt", in which case you

204 can give "--opt") anywhere easy to find for new people.

205

206 +Will merge to 'master' as part of the first batch.

207 +

208 * mv/pull-r-for-rebase (2012-08-17) 1 commit

209 (merged to 'next' on 2012-08-18 at e7d885b)

210 + man: git pull -r is a short for --rebase

211

212 Minor documentation update.

213

214 +Will merge to 'master' as part of the first batch.

215 +

216 * rr/precompose-utf8-cleanup (2012-08-17) 1 commit

217 - cleanup precompose_utf8

218

219 A style and code cleanup.

220 +Will merge to 'next'.

221

222 * jc/doc-git-updates (2012-08-17) 1 commit

223 (merged to 'next' on 2012-08-18 at f24913b)

224 + Documentation: update the introductory section

225

226 +Will merge to 'master' as part of the first batch.

227 +

228 * fa/remote-svn (2012-08-17) 16 commits

229 - Add a test script for remote-svn

230 - remote-svn: add marks-file regeneration

@@ -122,101 +254,33 @@ A style and code cleanup.

254 - vcs-svn: Add sha1 calculation to fast_export and line_buffer

255 (this branch uses fa/remote-svn.)

256

257 +I haven't seen many comments and reviews from people involved in the

258 +area, other than DBarr's worries on teaching exporter (which is

259 +supposed to be Git agnostic, as its output "fast-import" format is

260 +meant to be usable by others) to compute object names in Git way.

261 +

262 +It is somewhat hard for me to judge these two series.

263 +

264 * mh/maint-config-doc-proxy-command (2012-08-18) 2 commits

265 - git-config doc: unconfuse an example

266 - git-config.txt: fix example

267

129 ---------------------------------------------------

130 -[Stalled]

131 -

132 -* mz/rebase-range (2012-07-18) 7 commits

133 - . rebase (without -p): correctly calculate patches to rebase

134 - . rebase -p: don't request --left-right only to ignore left side

135 - . rebase -p: use --cherry-mark for todo file

136 - . git-rebase--interactive.sh: look up subject in add_pick_line

137 - . git-rebase--interactive: group all $preserve_merges code

138 - . git-rebase--interactive.sh: extract function for adding "pick" line

139 - . git-rebase--am.sh: avoid special-casing --keep-empty

140 -

141 -Expecting a reroll.

142 -

143 -Performance concerns from Windows folks. Also the series lacks

144 -proper sign-offs.

145 -

146 -* jl/submodule-rm (2012-07-05) 2 commits

147 - - rm: remove submodules from the index and the .gitmodules file

148 - - rm: don't fail when removing populated submodules

149 -

150 -Expecting a reroll.

151 -

152 -* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit

153 - - commit/commit-tree: correct latin1 to utf-8

154 -

155 -Teaches "git commit" and "git commit-tree" the "we are told to use

156 -utf-8 in log message, but this does not look like utf-8---attempt to

157 -pass it through convert-from-latin1-to-utf8 and see if it makes

158 -sense" heuristics "git mailinfo" already uses.

159 -

160 -A draft from Linus received privately without a log message.

161 -Expecting a reroll.

162 -

163 -* mb/remote-default-nn-origin (2012-07-11) 6 commits

164 - - Teach get_default_remote to respect remote.default.

165 - - Test that plain "git fetch" uses remote.default when on a detached HEAD.

166 - - Teach clone to set remote.default.

167 - - Teach "git remote" about remote.default.

168 - - Teach remote.c about the remote.default configuration setting.

169 - - Rename remote.c's default_remote_name static variables.

170 -

171 -When the user does not specify what remote to interact with, we

172 -often attempt to use 'origin'. This can now be customized via a

173 -configuration variable.

174 -

175 -Expecting a reroll.

176 -"The first remote becomes the default" bit is better done as a

177 -separate step.

178 -

179 -* jc/split-blob (2012-04-03) 6 commits

180 - - chunked-object: streaming checkout

181 - - chunked-object: fallback checkout codepaths

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

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

184 - - new representation types in the packstream

185 - - packfile: use varint functions

186 -

187 -Not ready.

188 -

189 -I finished the streaming checkout codepath, but as explained in

190 -127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),

191 -these are still early steps of a long and painful journey. At least

192 -pack-objects and fsck need to learn the new encoding for the series

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

194 -learn it to be used remotely.

195 -

196 -Given that I heard a lot of noise that people want large files, and

197 -that I was asked by somebody at GitTogether'11 privately for an

198 -advice on how to pay developers (not me) to help adding necessary

199 -support, I am somewhat dissapointed that the original patch series

200 -that was sent long time ago still remains here without much comments

201 -and updates from the developer community. I even made the interface

202 -to the logic that decides where to split chunks easily replaceable,

203 -and I deliberately made the logic in the original patch extremely

204 -stupid to entice others, especially the "bup" fanbois, to come up

205 -with a better logic, thinking that giving people an easy target to

206 -shoot for, they may be encouraged to help out. The plan is not

207 -working :-<.

208 -

209 ---------------------------------------------------

210 -[Cooking]

268 +Will merge to 'next'.

269

270 * ph/stash-rerere (2012-08-17) 2 commits

271 - stash: invoke rerere in case of conflict

272 - test: git-stash conflict sets up rerere

273

274 +"git stash" internally used "git merge-recursive" backend, which did

275 +not trigger "rerere" upon conflicts unlike other mergy operations.

276 +

277 +Will merge to 'next'.

278 +

279 * hv/submodule-path-unmatch (2012-08-14) 1 commit

280 - Let submodule command exit with error status if path does not exist

281

282 As the title says.

283 +Will merge to 'next'.

284

285 * jc/add-delete-default (2012-08-13) 1 commit

286 - git add: notice removal of tracked paths by default

@@ -225,6 +289,9 @@ As the title says.

289 not notice removed files, which may be "Huh?" to some users. They

290 can of course use "git add -A dir/", but why should they?

291

292 +Resurrected from graveyard, as I thought it was a worthwhile thing

293 +to do in the longer term; waiting for comments.

294 +

295 * jc/maint-rev-list-topo-doc (2012-08-15) 1 commit

296 (merged to 'next' on 2012-08-18 at d1f54d9)

297 + rev-list docs: clarify --topo-order description

@@ -233,6 +300,8 @@ It was unclear what "--topo-order" was really about in the

300 documentation. It is not just about "children before parent", but

301 also about "don't mix lineages".

302

303 +Will merge to 'master' as part of the first batch.

304 +

305 * bc/receive-pack-stdout-protection (2012-08-06) 2 commits

306 (merged to 'next' on 2012-08-07 at d7aa316)

307 + receive-pack: do not leak output from auto-gc to standard output

@@ -242,14 +311,14 @@ When "git push" triggered the automatic gc on the receiving end, a

311 message from "git prune" that said it was removing cruft leaked to

312 the standard output, breaking the communication protocol.

313

245 -Not urgent (non regression).

314 +Will merge to 'master' as part of the second batch.

315

316 * bc/prune-info (2012-08-07) 1 commit

317 - prune.c: only print informational message in show_only or verbose mode

318

319 Teach "git prune" without "-v" to be silent about leftover temporary files.

320

252 -Not urgent (non regression).

321 +Will merge to 'next'.

322

323 * jc/tag-doc (2012-08-06) 1 commit

324 (merged to 'next' on 2012-08-18 at 9fe64b2)

@@ -259,7 +328,7 @@ Our documentation used to assume having files in .git/refs/*

328 directories was the only to have branches and tags, but that is not

329 true for quite some time.

330

262 -Not urgent (non regression).

331 +Will merge to 'master' as part of the first batch.

332

333 * jk/docs-docbook-monospace-display (2012-08-07) 1 commit

334 (merged to 'next' on 2012-08-18 at 7e02bf8)

@@ -269,7 +338,7 @@ The documentation in the TeXinfo format was using indented output

338 for materials meant to be examples that are better typeset in

339 monospace.

340

272 -Not urgent (non regression).

341 +Will merge to 'master' as part of the second batch.

342

343 * jc/maint-protect-sh-from-ifs (2012-08-08) 1 commit

344 - sh-setup: protect from exported IFS

@@ -278,6 +347,8 @@ When the user exports a non-default IFS without HT, scripts that

347 rely on being able to parse "ls-files -s | while read a b c..."

348 start to fail. Protect them from such a misconfiguration.

349

350 +Will merge to 'next'.

351 +

352 * jk/check-docs-update (2012-08-08) 8 commits

353 (merged to 'next' on 2012-08-18 at 4409d2e)

354 + check-docs: get documented command list from Makefile

@@ -291,6 +362,8 @@ start to fail. Protect them from such a misconfiguration.

362

363 Simplify "make check-docs" implementation and update its coverage.

364

365 +Will merge to 'master' as part of the first batch.

366 +

367 * js/gitweb-path-info-unquote (2012-08-15) 1 commit

368 (merged to 'next' on 2012-08-15 at 844da17)

369 + gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO

@@ -299,7 +372,7 @@ Stripping of PATH_INFO in gitweb did not take url style quoting into

372 account, failing to notice directories with funny characters e.g. SP

373 in their paths.

374

302 -Not urgent (non regression).

375 +Will merge to 'master' as part of the first batch.

376

377 * mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit

378 - rebase -i: use full onto sha1 in reflog

@@ -307,9 +380,13 @@ Not urgent (non regression).

380 The reflog entries left by "git rebase" and "git rebase -i" were

381 inconsistent.

382

383 +Will merge to 'next'.

384 +

385 * mz/empty-rebase-test (2012-08-09) 1 commit

386 - add tests for 'git rebase --keep-empty'

387

388 +Will merge to 'next'.

389 +

390 * jc/capabilities (2012-08-13) 3 commits

391 - fetch-pack: mention server version with verbose output

392 - parse_feature_request: make it easier to see feature values

@@ -319,6 +396,8 @@ inconsistent.

396 Some capabilities were asked by fetch-pack even when upload-pack did

397 not advertise that they are available. Fix fetch-pack not to do so.

398

399 +Will merge to 'next'.

400 +

401 * pw/p4-use-client-spec-branch-detection (2012-08-11) 5 commits

402 - git p4: make branch detection work with --use-client-spec

403 - git p4: do wildcard decoding in stripRepoPath

@@ -326,11 +405,14 @@ not advertise that they are available. Fix fetch-pack not to do so.

405 - git p4 test: add broken --use-client-spec --detect-branches tests

406 - git p4 test: move client_view() function to library

407

408 +Will merge to 'next' and soon to 'master'.

409 +

410 * jc/maint-push-refs-all (2012-08-07) 2 commits

411 - get_fetch_map(): tighten checks on dest refs

412 - fetch/push: allow refs/*:refs/*

413

414 Allows pushing and fetching refs/stash.

415 +Need to send it out to the list for review.

416

417 * jk/version-string (2012-08-10) 3 commits

418 (merged to 'next' on 2012-08-10 at d8dcb00)

@@ -345,7 +427,7 @@ us an ability to expose the Git version over the wire in the

427 protocol exchange. But we do so carefully only to the other end that

428 understands it.

429

348 -Not urgent (non regression).

430 +Will merge to 'master' as part of the third batch.

431

432 * js/grep-patterntype-config (2012-08-03) 1 commit

433 (merged to 'next' on 2012-08-09 at 1a08d6c)

@@ -354,28 +436,31 @@ Not urgent (non regression).

436 "grep" learned to use a non-standard pattern type by default if a

437 configuration variable tells it to.

438

357 -Not urgent (non regression).

439 +Will merge to 'master' as part of the second batch.

440

441 * mm/die-with-dashdash-help (2012-08-03) 1 commit

442 (merged to 'next' on 2012-08-09 at 1aae096)

443 + setup: clarify error messages for file/revisions ambiguity

444

445 Reword error messages.

364 -Not urgent (non regression).

446 +

447 +Will merge to 'master' as part of the first batch.

448

449 * tr/merge-recursive-flush (2012-08-03) 1 commit

450 (merged to 'next' on 2012-08-09 at da826ec)

451 + merge-recursive: eliminate flush_buffer() in favor of write_in_full()

452

453 Remove unnecessary code.

371 -Not urgent (non regression).

454 +

455 +Will merge to 'master' as part of the first batch.

456

457 * tr/void-diff-setup-done (2012-08-03) 1 commit

458 (merged to 'next' on 2012-08-09 at 668a46f)

459 + diff_setup_done(): return void

460

461 Remove unnecessary code.

378 -Not urgent (non regression).

462 +

463 +Will merge to 'master' as part of the first batch.

464

465 * mk/test-seq (2012-08-04) 1 commit

466 (merged to 'next' on 2012-08-06 at 3f6917c)

@@ -384,7 +469,7 @@ Not urgent (non regression).

469

470 Add a compatibility/utility function to the test framework.

471

387 -Not urgent (non regression).

472 +Will merge to 'master' as part of the first batch.

473

474 * ab/diff-write-incomplete-line (2012-08-05) 1 commit

475 (merged to 'next' on 2012-08-07 at dcf02ae)

@@ -394,14 +479,14 @@ Not urgent (non regression).

479 The output from "git diff -B" for a file that ends with an

480 incomplete line did not put "\ No newline..." on a line of its own.

481

397 -Not urgent (non regression).

482 +Will merge to 'master' as part of the second batch.

483

484 * pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit

485 (merged to 'next' on 2012-08-05 at aa9f5e9)

486 + apply: delete unused deflate_origlen from patch struct

487

488 Remove unused field.

404 -Not urgent (non regression).

489 +Will merge to 'master' as part of the first batch.

490

491 * tg/index-v5 (2012-08-17) 13 commits

492 - p0002-index.sh: add perf test for the index formats

@@ -429,7 +514,7 @@ Assignments to errno before calling system functions that used to

514 matter in the old code were left behind after the code structure

515 changed sufficiently to make them useless.

516

432 -Not urgent (non regression).

517 +Will merge to 'master' as part of the first batch.

518

519 * jc/maint-sane-execvp-notdir (2012-07-31) 1 commit

520 (merged to 'next' on 2012-08-09 at 5dd4240)

@@ -438,7 +523,7 @@ Not urgent (non regression).

523 "git foo" errored out with "Not a directory" when the user had a non

524 directory on $PATH, and worse yet it masked an alias "foo" to run.

525

441 -Not urgent (non regression).

526 +Will merge to 'master' as part of the third batch.

527

528 * jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit

529 (merged to 'next' on 2012-08-09 at 832c238)

@@ -448,7 +533,8 @@ Teach the code that works around NKD/NKC gotcha on MacOS to call

533 iconv_open() only when it is necessary, in the hope of avoiding

534 set-up overhead.

535

451 -Not urgent (non regression).

536 +Needs some work to rename functions

537 +as mentioned by Linus in the discussion.

538

539 * tr/maint-send-email-2047 (2012-07-31) 1 commit

540 (merged to 'next' on 2012-08-09 at 17dfe57)

@@ -457,7 +543,7 @@ Not urgent (non regression).

543 "git send-email" did not unquote encoded words that appear on the

544 header correctly, and lost "_" from strings.

545

460 -Not urgent (non regression).

546 +Will merge to 'master' as part of the first batch.

547

548 * cw/cherry-pick-allow-empty-message (2012-08-06) 1 commit

549 (merged to 'next' on 2012-08-09 at eab95f6)

@@ -467,7 +553,7 @@ Not urgent (non regression).

553 log message. The "--allow-empty-message" option can be used to

554 silently proceed.

555

470 -Not urgent (non regression).

556 +Will merge to 'master' as part of the third batch.

557

558 * ms/git-svn-1.7 (2012-08-02) 20 commits

559 - git-svn: remove ad-hoc canonicalizations

@@ -494,12 +580,14 @@ Not urgent (non regression).

580 A series by Michael Schwern via Eric to update git-svn to revamp the

581 way URLs are internally passed around, to make it work with SVN 1.7.

582

583 +Will merge to 'next' after pinging Eric to double check and then to 'master'.

584 +

585 * jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit

586 (merged to 'next' on 2012-07-30 at 9b27acc)

587 + t7406: fix misleading "rev-parse --max-count=1 HEAD"

588

589 Test clean-up, with no behaviour change.

502 -Not urgent (non regression).

590 +Will merge to 'master' as part of the second batch.

591

592 * jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit

593 + diff: do not use null sha1 as a sentinel value

@@ -508,7 +596,6 @@ Not urgent (non regression).

596 "git diff" had a confusion between taking data from a path in the

597 working tree and taking data from an object that happens to have

598 name 0{40} recorded in a tree.

511 -Not urgent (non regression).

599

600 * mz/cherry-code-cleanup (2012-07-29) 3 commits

601 - cherry: remove redundant check for merge commit

@@ -516,7 +603,8 @@ Not urgent (non regression).

603 - remove unnecessary parameter from get_patch_ids()

604

605 Minor code clean-up on the cherry-pick codepath.

519 -Not urgent (non regression).

606 +

607 +Will merge to 'next'.

608

609 * jc/maint-config-exit-status (2012-07-30) 1 commit

610 (merged to 'next' on 2012-07-30 at 8392da9)

@@ -527,7 +615,7 @@ being incorrect. Update the implementation to give the documented

615 status for a case that was documented, and introduce a new code for

616 "all other errors".

617

530 -Not urgent (non regression).

618 +Will merge to 'master' as part of the third batch.

619

620 * jk/maint-null-in-trees (2012-07-29) 2 commits

621 (merged to 'next' on 2012-07-30 at 771c497)

@@ -537,7 +625,7 @@ Not urgent (non regression).

625

626 We do not want a link to 0{40} object stored anywhere in our objects.

627

540 -Not urgent (non regression).

628 +Will merge to 'master' as part of the second batch.

629

630 * sz/submodule-force-update (2012-07-25) 1 commit

631 (merged to 'next' on 2012-07-26 at 3bda2be)

@@ -545,8 +633,6 @@ Not urgent (non regression).

633

634 We may want a documentation update and a few tests on top.

635

548 -Not urgent (non regression).

549 -

636 * jc/test-prereq (2012-08-04) 8 commits

637 (merged to 'next' on 2012-08-04 at 6dd9156)

638 + fixup! t3910: use the UTF8_NFD_TO_NFC test prereq

@@ -564,7 +650,7 @@ Teaches the test framework to probe rarely used prerequistes lazily,

650 and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and

651 NKD/NKC MacOS x gotcha.

652

567 -Not urgent (non regression).

653 +Will merge to 'master' as part of the first batch.

654

655 * da/difftool-updates (2012-08-10) 12 commits

656 (merged to 'next' on 2012-08-10 at 4accbf6)

@@ -586,16 +672,17 @@ Not urgent (non regression).

672 "git difftool --dir-diff" learned to use symbolic links to prepare

673 temporary copy of the working tree when available.

674

589 -Not urgent (non regression).

675 +Will merge to 'master' as part of the second batch.

676

677 * jk/no-more-pre-exec-callback (2012-06-05) 1 commit

678 (merged to 'next' on 2012-07-23 at fe59cb6)

679 + pager: drop "wait for output to run less" hack

680

595 -Will defer for 6 months until ancient "less" goes extinct.

681 +Will defer until the end of the 2012,

682 +waiting for older "less" to go extinct.

683

684 * mm/push-default-switch-warning (2012-06-24) 1 commit

685 (merged to 'next' on 2012-06-26 at fea512a)

686 + push: start warning upcoming default change for push.default

687

601 -Will defer for another cycle.

688 +Will merge to 'master' as part of the second batch.

What's cooking (2012/08 #06)