a096a5edb3 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2010, #01; Sun, 2)

3 -X-master-at: ddb27a5a6b5ed74c70d56c96592b32eed415d72b

4 -X-next-at: 6845abd811ce929d456af10c5b4ba79640e19438

2 +Subject: What's cooking in git.git (May 2010, #02; Fri, 7)

3 +X-master-at: cfb88e9a8d4926b0011ae2dd67e1f57a98f4b768

4 +X-next-at: 703bdcf9e5ad91e669ce4c834d8d17a47c9e720e

5

6 -What's cooking in git.git (May 2010, #01; Sun, 2)

6 +What's cooking in git.git (May 2010, #02; Fri, 7)

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

8

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

@@ -11,88 +11,50 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 marked with '.' do not appear in any of the integration branches, but I am

12 still holding onto them.

13

14 -The latest release 1.7.1 has been out for a week and I will soon rewind

15 -'next' and switch 'maint' for 1.7.1.X series. It appears that no grave

16 -regression has been reported, which is a good sign.

14 +I'm in the middle of physically moving and haven't started graduating the

15 +topics that have been cooking in 'next'. Perhaps I can find time to do so

16 +for some of them over the weekend. I expect that I won't be back up to

17 +speed until later this month.

18

19 --------------------------------------------------

20 [New Topics]

21

21 -* cb/maint-stash-orphaned-file (2010-04-18) 2 commits

22 - (merged to 'next' on 2010-04-22 at f9de16c)

23 - + stash tests: stash can lose data in a file removed from the index

24 - + stash: Don't overwrite files that have gone from the index

25 -

26 -* jn/maint-bundle (2010-04-19) 2 commits

27 - (merged to 'next' on 2010-04-22 at b2668a6)

28 - + fix "bundle --stdin" segfault

29 - + t5704 (bundle): add tests for bundle --stdin

30 -

31 -* pb/patch-id-plus (2010-04-19) 2 commits

32 - (merged to 'next' on 2010-04-22 at 5177f8b)

33 - + patch-id: Add support for mbox format

34 - + patch-id: extract parsing one diff out of generate_id_list

22 +* jn/gitweb-syntax-highlight (2010-04-27) 2 commits

23 + - gitweb: Refactor syntax highlighting support

24 + - gitweb: Syntax highlighting support

25

36 -* rr/doc-submitting (2010-04-19) 1 commit

37 - (merged to 'next' on 2010-04-22 at b557474)

38 - + SubmittingPatches: Add new section about what to base work on

26 +* jn/maint-amend-missing-name (2010-05-02) 1 commit

27 + - commit --amend: cope with missing display name

28

40 -* st/remote-tags-no-tags (2010-04-20) 2 commits

41 - - remote add: add a --[no-]tags option

42 - - Honor "tagopt = --tags" configuration option

29 +* rs/diff-no-minimal (2010-05-02) 1 commit

30 + - git diff too slow for a file

31

44 -* jc/rev-list-ancestry-path (2010-04-20) 1 commit

45 - - revision: --ancestry-path

32 +* ab/test-cleanup (2010-05-07) 2 commits

33 + - Turn setup code in t2007-checkout-symlink.sh into a test

34 + - Move t6000lib.sh to lib-*

35

47 -Just an illustration patch. merge simplification logic used when

48 -pathspecs are in effect interacts with this rather badly.

36 +* by/blame-doc-m-c (2010-05-06) 1 commit

37 + - blame-options.txt: Add default value for `-M/-C` options.

38

50 -* cb/assume-unchanged-fix (2010-05-01) 2 commits

51 - - Documentation: git-add does not update files marked "assume unchanged"

52 - - do not overwrite files marked "assume unchanged"

39 +* by/log-follow (2010-05-06) 3 commits

40 + - Make git log --follow find copies among unmodified files.

41 + - Make diffcore_std only can run once before a diff_flush

42 + - Add a macro DIFF_QUEUE_CLEAR.

43

54 -* jn/fsck-ident (2010-04-24) 1 commit

55 - - fsck: check ident lines in commit objects

44 +* eb/crlf (2010-05-07) 3 commits

45 + - Add per-repository eol normalization

46 + - Add tests for per-repository eol normalization

47 + - Add "auto-eol" attribute and "core.eolStyle" config variable

48

57 -* jn/gitweb-caching-prep (2010-04-24) 5 commits

58 - - gitweb: Move generating page title to separate subroutine

59 - - gitweb: Add custom error handler using die_error

60 - - gitweb: Use nonlocal jump instead of 'exit' in die_error

61 - - gitweb: href(..., -path_info => 0|1)

62 - - Export more test-related variables when running external tests

49 +* jn/notes-doc (2010-05-03) 4 commits

50 + - Documentation/notes: nitpicks

51 + - Documentation/notes: describe content of notes

52 + - Documentation/notes: adjust description to use configuration section

53 + - Documentation/notes: describe effect of environment and configuration

54

64 -* jn/gitweb-install (2010-05-01) 2 commits

65 - - gitweb: Create install target for gitweb in Makefile

66 - - gitweb: Improve installation instructions in gitweb/INSTALL

67 -

68 -* jn/gitweb-our-squelch (2010-04-30) 1 commit

69 - - gitweb: Silence 'Variable VAR may be unavailable' warnings

70 -

71 -* jn/maint-request-pull (2010-04-24) 2 commits

72 - - request-pull: protect against OPTIONS_KEEPDASHDASH from environment

73 - - tests for request-pull

74 - (this branch is used by jn/request-pull.)

75 -

76 -* jn/request-pull (2010-04-24) 2 commits

77 - - adapt request-pull tests for new pull request format

78 - - Merge branch 'jn/maint-request-pull' into jn/request-pull

79 - (this branch uses jn/maint-request-pull.)

80 -

81 -* jn/shortlog (2010-04-26) 4 commits

82 - . pretty: Respect --abbrev option

83 - . shortlog: Document and test --format option

84 - . t4201 (shortlog): Test output format with multiple authors

85 - . t4201 (shortlog): guard setup with test_expect_success

86 -

87 -This seems to cause intermittent test failure for me especially when run

88 -under "make -j4".

89 -

90 -* wp/pretty-enhancement (2010-04-30) 5 commits

91 - - pretty: add aliases for pretty formats

92 - - pretty: add infrastructure to allow format aliases

93 - - pretty: make it easier to add new formats

94 - - pretty: make %H/%h/etc respect --abbrev[-commit]

95 - - pretty: add conditional %C?colorname placeholders

55 +* mg/advice-statushints (2010-04-22) 2 commits

56 + - wt-status: take advice.statusHints seriously

57 + - t7508: test advice.statusHints

58

59 --------------------------------------------------

60 [Graduated to "master"]

@@ -152,18 +114,106 @@ Good thing to do, but it came at a bad time.

114 --------------------------------------------------

115 [Cooking]

116

117 +* cb/maint-stash-orphaned-file (2010-04-18) 2 commits

118 + (merged to 'next' on 2010-05-04 at 38488ba)

119 + + stash tests: stash can lose data in a file removed from the index

120 + + stash: Don't overwrite files that have gone from the index

121 +

122 +(was in 'next' on 2010-04-22)

123 +

124 +* jn/maint-bundle (2010-04-19) 2 commits

125 + (merged to 'next' on 2010-05-04 at f2086f5)

126 + + fix "bundle --stdin" segfault

127 + + t5704 (bundle): add tests for bundle --stdin

128 +

129 +(was in 'next' on 2010-04-22)

130 +

131 +* pb/patch-id-plus (2010-04-19) 2 commits

132 + (merged to 'next' on 2010-05-04 at 59881b8)

133 + + patch-id: Add support for mbox format

134 + + patch-id: extract parsing one diff out of generate_id_list

135 +

136 +(was in 'next' on 2010-04-22)

137 +

138 +* rr/doc-submitting (2010-04-19) 1 commit

139 + (merged to 'next' on 2010-05-04 at 5f040bd)

140 + + SubmittingPatches: Add new section about what to base work on

141 +

142 +(was in 'next' on 2010-04-22)

143 +

144 +* st/remote-tags-no-tags (2010-04-20) 2 commits

145 + - remote add: add a --[no-]tags option

146 + - Honor "tagopt = --tags" configuration option

147 +

148 +* jc/rev-list-ancestry-path (2010-04-20) 1 commit

149 + - revision: --ancestry-path

150 +

151 +Just an illustration patch. merge simplification logic used when

152 +pathspecs are in effect interacts with this rather badly.

153 +

154 +* cb/assume-unchanged-fix (2010-05-01) 2 commits

155 + - Documentation: git-add does not update files marked "assume unchanged"

156 + - do not overwrite files marked "assume unchanged"

157 +

158 +* jn/fsck-ident (2010-04-24) 1 commit

159 + - fsck: check ident lines in commit objects

160 +

161 +There also was a companion patch to fast-import to deal with foreign SCM

162 +interface that may not have human-readable author identifier.

163 +

164 +* jn/gitweb-caching-prep (2010-04-24) 5 commits

165 + - gitweb: Move generating page title to separate subroutine

166 + - gitweb: Add custom error handler using die_error

167 + - gitweb: Use nonlocal jump instead of 'exit' in die_error

168 + - gitweb: href(..., -path_info => 0|1)

169 + - Export more test-related variables when running external tests

170 +

171 +* jn/gitweb-install (2010-05-01) 2 commits

172 + - gitweb: Create install target for gitweb in Makefile

173 + - gitweb: Improve installation instructions in gitweb/INSTALL

174 +

175 +* jn/gitweb-our-squelch (2010-04-30) 1 commit

176 + - gitweb: Silence 'Variable VAR may be unavailable' warnings

177 +

178 +* jn/maint-request-pull (2010-05-07) 3 commits

179 + - t5150: protect backslash with backslash in shell

180 + - request-pull: protect against OPTIONS_KEEPDASHDASH from environment

181 + - tests for request-pull

182 + (this branch is used by jn/request-pull.)

183 +

184 +* jn/request-pull (2010-04-24) 2 commits

185 + - adapt request-pull tests for new pull request format

186 + - Merge branch 'jn/maint-request-pull' into jn/request-pull

187 + (this branch uses jn/maint-request-pull.)

188 +

189 +* jn/shortlog (2010-05-03) 5 commits

190 + - pretty: Respect --abbrev option

191 + - shortlog: Document and test --format option

192 + - t4201 (shortlog): Test output format with multiple authors

193 + - t4201 (shortlog): guard setup with test_expect_success

194 + - Documentation/shortlog: scripted users should not rely on implicit HEAD

195 +

196 +* wp/pretty-enhancement (2010-05-02) 3 commits

197 + - pretty: add aliases for pretty formats

198 + - pretty: add infrastructure for commit format aliases

199 + - pretty: make it easier to add new formats

200 +

201 * jn/t7006-fixup (2010-04-14) 1 commit

156 - (merged to 'next' on 2010-04-22 at 358ea26)

202 + (merged to 'next' on 2010-05-04 at 490ab5d)

203 + t7006: guard cleanup with test_expect_success

204

205 +(was in 'next' on 2010-04-22)

206 +

207 * js/maint-receive-pack-symref-alias (2010-04-19) 3 commits

160 - (merged to 'next' on 2010-04-22 at 5d1338f)

208 + (merged to 'next' on 2010-05-04 at 259f4f1)

209 + t5516-fetch-push.sh: style cleanup

210 + receive-pack: detect aliased updates which can occur with symrefs

211 + receive-pack: switch global variable 'commands' to a parameter

212

213 +(was in 'next' on 2010-04-22)

214 +

215 * sp/maint-dumb-http-pack-reidx (2010-04-19) 12 commits

166 - (merged to 'next' on 2010-04-22 at c94f19e)

216 + (merged to 'next' on 2010-05-04 at 166443a)

217 + http.c::new_http_pack_request: do away with the temp variable filename

218 + http-fetch: Use temporary files for pack-*.idx until verified

219 + http-fetch: Use index-pack rather than verify-pack to check packs

@@ -177,125 +227,155 @@ Good thing to do, but it came at a bad time.

227 + t5550-http-fetch: Use subshell for repository operations

228 + http.c: Remove bad free of static block

229

230 +(was in 'next' on 2010-04-22)

231 +

232 * hg/id-munging (2010-04-06) 2 commits

233 - convert: Keep foreign $Id$ on checkout.

234 - convert: Safer handling of $Id$ contraction.

235

236 * jn/submodule-basic-test (2010-04-10) 3 commits

185 - (merged to 'next' on 2010-04-22 at 6d22343)

237 + (merged to 'next' on 2010-05-04 at 0bec27a)

238 + t7400: clarify submodule update tests

239 + t7400: clarify 'submodule add' tests

240 + t7400: split setup into multiple tests

241

242 +(was in 'next' on 2010-04-22)

243 +

244 * np/index-pack-memsave (2010-04-12) 3 commits

191 - (merged to 'next' on 2010-04-22 at 4135456)

245 + (merged to 'next' on 2010-05-04 at 366b014)

246 + index-pack: smarter memory usage when appending objects

247 + index-pack: rationalize unpack_entry_data()

248 + index-pack: smarter memory usage when resolving deltas

249

250 +(was in 'next' on 2010-04-22)

251 +

252 * jc/am-3-show-corrupted-patch (2010-04-09) 1 commit

197 - (merged to 'next' on 2010-04-22 at 49959c8)

253 + (merged to 'next' on 2010-05-04 at 951f0e6)

254 + am -3: recover the diagnostic messages for corrupt patches

255

256 +(was in 'next' on 2010-04-22)

257 +

258 * jc/maint-no-reflog-expire-unreach-for-head (2010-04-09) 3 commits

201 - (merged to 'next' on 2010-04-22 at bf9c927)

259 + (merged to 'next' on 2010-05-04 at d23a180)

260 + reflog --expire-unreachable: special case entries in "HEAD" reflog

261 + more war on "sleep" in tests

262 + Document gc.<pattern>.reflogexpire variables

263 (this branch uses jc/maint-reflog-expire-unreachable.)

264

207 -Rerolled; instead of ignoring the configuration like the previous round

208 -did, this one prunes stale entries that are unreachable from any ref from

209 -the reflog of HEAD.

265 +(was in 'next' on 2010-04-22)

266

267 * cw/maint-exec-defpath (2010-04-15) 2 commits

212 - (merged to 'next' on 2010-04-22 at e990e5b)

268 + (merged to 'next' on 2010-05-04 at 8d1591f)

269 + autoconf: Check if <paths.h> exists and set HAVE_PATHS_H

270 + exec_cmd.c: replace hard-coded path list with one from <paths.h>

271

272 +(was in 'next' on 2010-04-22)

273 +

274 * tr/word-diff (2010-04-14) 1 commit

217 - (merged to 'next' on 2010-04-22 at a10062e)

275 + (merged to 'next' on 2010-05-04 at d191b25)

276 + diff: add --word-diff option that generalizes --color-words

277

278 +(was in 'next' on 2010-04-22)

279 There are gitk patches that go with this series.

280

281 * sp/maint-describe-tiebreak-with-tagger-date (2010-04-12) 5 commits

223 - (merged to 'next' on 2010-04-22 at f712ae9)

282 + (merged to 'next' on 2010-05-04 at af2d605)

283 + describe: Break annotated tag ties by tagger date

284 + tag.c: Parse tagger date (if present)

285 + tag.c: Refactor parse_tag_buffer to be saner to program

286 + tag.h: Remove unused signature field

287 + tag.c: Correct indentation

288

289 +(was in 'next' on 2010-04-22)

290 +

291 * bg/apply-blank-trailing-context (2010-04-08) 1 commit

231 - (merged to 'next' on 2010-04-14 at a393c0b)

292 + (merged to 'next' on 2010-05-04 at 31f3482)

293 + apply: Allow blank *trailing* context lines to match beyond EOF

294

295 +(was in 'next' on 2010-04-14)

296 +

297 * bg/send-email-smtpdomain (2010-04-10) 4 commits

235 - (merged to 'next' on 2010-04-14 at 88fff99)

298 + (merged to 'next' on 2010-05-04 at 2afbe2c)

299 + send-email: Cleanup smtp-domain and add config

300 + Document send-email --smtp-domain

301 + send-email: Don't use FQDNs without a '.'

302 + send-email: Cleanup { style

303

304 +(was in 'next' on 2010-04-14)

305 +

306 * rc/ls-remote-default (2010-04-09) 1 commit

242 - (merged to 'next' on 2010-04-14 at d5081bd)

307 + (merged to 'next' on 2010-05-04 at 2af33e1)

308 + ls-remote: fall-back to default remotes when no remote specified

309

310 +(was in 'next' on 2010-04-14)

311 +

312 * rc/maint-curl-helper (2010-04-08) 3 commits

246 - (merged to 'next' on 2010-04-14 at 2eb9177)

313 + (merged to 'next' on 2010-05-04 at c32988d)

314 + remote-curl: ensure that URLs have a trailing slash

315 + http: make end_url_with_slash() public

316 + t5541-http-push: add test for URLs with trailing slash

317

318 +(was in 'next' on 2010-04-14)

319 +

320 * hg/maint-attr-fix (2010-04-06) 3 commits

252 - (merged to 'next' on 2010-04-14 at a27c7d7)

321 + (merged to 'next' on 2010-05-04 at 8b98845)

322 + attr: Expand macros immediately when encountered.

323 + attr: Allow multiple changes to an attribute on the same line.

324 + attr: Fixed debug output for macro expansion.

325

326 +(was in 'next' on 2010-04-14)

327 +

328 * jc/status-show-ignored (2010-05-01) 6 commits

258 - (merged to 'next' on 2010-05-01 at 6845abd)

329 + (merged to 'next' on 2010-05-04 at 8b32120)

330 + wt-status: fix 'fprintf' compilation warning

260 - (merged to 'next' on 2010-04-22 at c6abe03)

331 + status: --ignored option shows ignored files

332 + wt-status: rename and restructure status-print-untracked

333 + wt-status: collect ignored files

334 + wt-status: plug memory leak while collecting untracked files

335 + wt-status: remove unused workdir_untracked member

336

337 +(was in 'next' on 2010-05-01)

338 +

339 I am negative about conflating the JSON output to the mix at this point.

340 Let's stabilize "status" with the existing --porcelain/-z option first.

341

342 * eb/unpretty-b-format (2010-03-24) 1 commit

271 - (merged to 'next' on 2010-04-07 at 7f5c112)

343 + (merged to 'next' on 2010-05-04 at a466ed8)

344 + Add `%B' in format strings for raw commit body in `git log' and friends

345

346 +(was in 'next' on 2010-04-07)

347 +

348 * ab/commit-empty-message (2010-04-06) 1 commit

275 - (merged to 'next' on 2010-04-07 at 701e863)

349 + (merged to 'next' on 2010-05-04 at 54c2e47)

350 + Add option to git-commit to allow empty log messages

351

352 +(was in 'next' on 2010-04-07)

353 +

354 * jc/test-sleepless (2010-04-06) 1 commit

279 - (merged to 'next' on 2010-04-07 at 8ccf40a)

355 + (merged to 'next' on 2010-05-04 at 9ff84b0)

356 + war on "sleep" in tests

357

358 +(was in 'next' on 2010-04-07)

359 +

360 * jc/maint-reflog-expire-unreachable (2010-04-07) 1 commit

283 - (merged to 'next' on 2010-04-22 at 2a46172)

361 + (merged to 'next' on 2010-05-04 at 4efe837)

362 + reflog --expire-unreachable: avoid merge-base computation

363 (this branch is used by jc/maint-no-reflog-expire-unreach-for-head.)

364

365 +(was in 'next' on 2010-04-22)

366 +

367 * np/malloc-threading (2010-04-08) 2 commits

288 - (merged to 'next' on 2010-04-10 at e1730fb)

368 + (merged to 'next' on 2010-05-04 at 1b0567f)

369 + Thread-safe xmalloc and xrealloc needs a recursive mutex

370 + Make xmalloc and xrealloc thread-safe

371

292 -The fix should eventually go to 'maint' and 'master'. This queues the one

293 -from J6t for Windows compatibility.

372 +(was in 'next' on 2010-04-10)

373 +

374 +The fix should eventually go to 'maint' and 'master'.

375

376 * js/async-thread (2010-03-09) 7 commits

296 - (merged to 'next' on 2010-04-22 at ee8874e)

297 - + Enable threaded async procedures whenever pthreads is available

298 - (merged to 'next' on 2010-03-20 at 9939243)

377 + - Enable threaded async procedures whenever pthreads is available

378 + (merged to 'next' on 2010-05-04 at 2644e74)

379 + Dying in an async procedure should only exit the thread, not the process.

380 + Reimplement async procedures using pthreads

381 + Windows: more pthreads functions

@@ -303,29 +383,29 @@ from J6t for Windows compatibility.

383 + Make report() from usage.c public as vreportf() and use it.

384 + Modernize t5530-upload-pack-error.

385

306 -As the malloc-threading topic has been cooking for a while, the tip one

307 -may not be so bad to unleash to 'next' users, especially because we are in

308 -the pre-release feature freeze.

386 +(all except for the tip was in 'next' on 2010-03-20).

387

388 * sd/log-decorate (2010-04-08) 6 commits

311 - (merged to 'next' on 2010-04-08 at 68fee56)

389 + (merged to 'next' on 2010-05-04 at 6e54ae9)

390 + log.decorate: only ignore it under "log --pretty=raw"

391 + script with rev-list instead of log

314 - (merged to 'next' on 2010-04-06 at 992c9ad)

392 + log --pretty/--oneline: ignore log.decorate

316 - (merged to 'next' on 2010-03-08 at 58a6fba)

393 + log.decorate: usability fixes

394 + Add `log.decorate' configuration variable.

395 + git_config_maybe_bool()

396

397 +(was in 'next' on 2010-04-08)

398 +

399 * mh/status-optionally-refresh (2010-04-03) 3 commits

322 - (merged to 'next' on 2010-04-05 at 0e64aac)

400 + (merged to 'next' on 2010-05-04 at be164f0)

401 + t7508: add a test for "git status" in a read-only repository

402 + git status: refresh the index if possible

403 + t7508: add test for "git status" refreshing the index

404

405 +(was in 'next' on 2010-04-05)

406 +

407 * cw/ws-indent-with-tab (2010-04-03) 6 commits

328 - (merged to 'next' on 2010-04-05 at 5b5e579)

408 + (merged to 'next' on 2010-05-04 at 1d7aca4)

409 + whitespace: tests for git-apply --whitespace=fix with tab-in-indent

410 + whitespace: add tab-in-indent support for --whitespace=fix

411 + whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst

@@ -333,12 +413,12 @@ the pre-release feature freeze.

413 + whitespace: add tab-in-indent error class

414 + whitespace: we cannot "catch all errors known to git" anymore

415

416 +(was in 'next' on 2010-04-05)

417 +

418 * sr/remote-helper-export (2010-04-12) 9 commits

337 - (merged to 'next' on 2010-04-12 at cefbb2f)

419 + (merged to 'next' on 2010-05-04 at 519ab16)

420 + t5800: testgit helper requires Python support

339 - (merged to 'next' on 2010-04-09 at 94f6e3d)

421 + Makefile: Simplify handling of python scripts

341 - (merged to 'next' on 2010-04-07 at 5651307)

422 + remote-helpers: add tests for testgit helper

423 + remote-helpers: add testgit helper

424 + remote-helpers: add support for an export command

@@ -348,60 +428,68 @@ the pre-release feature freeze.

428 + clone: pass the remote name to remote_get

429 (this branch is used by jp/hold-string-list-sanity.)

430

431 +(was in 'next' on 2010-04-12)

432 +

433 * cc/revert-strategy (2010-03-31) 5 commits

352 - (merged to 'next' on 2010-04-05 at 50909c1)

434 + (merged to 'next' on 2010-05-04 at 6d44a83)

435 + revert: add "--strategy" option to choose merge strategy

436 + merge: make function try_merge_command non static

437 + merge: refactor code that calls "git merge-STRATEGY"

438 + revert: refactor merge recursive code into its own function

439 + revert: use strbuf to refactor the code that writes the merge message

440

359 -This is more about debugging and we are not in a great hurry.

441 +(was in 'next' on 2010-04-05)

442

443 * sc/http-late-auth (2010-04-01) 1 commit

362 - (merged to 'next' on 2010-04-02 at c991acf)

444 + (merged to 'next' on 2010-05-04 at 23ae2e8)

445 + Prompt for a username when an HTTP request 401s

446

447 +(was in 'next' on 2010-04-02)

448 +

449 * jk/cached-textconv (2010-04-01) 5 commits

366 - (merged to 'next' on 2010-04-02 at a023e3c)

450 + (merged to 'next' on 2010-05-04 at e4b72a0)

451 + diff: avoid useless filespec population

452 + diff: cache textconv output

453 + textconv: refactor calls to run_textconv

454 + introduce notes-cache interface

455 + make commit_tree a library function

456

373 -The small leak fixes in the beginning of the series has been merged to

374 -'master' after a minor fixup.

457 +(was in 'next' on 2010-04-02)

458

459 * ld/discovery-limit-to-fs (2010-04-04) 6 commits

460 - write-index: check and warn when worktree crosses a filesystem boundary

378 - (merged to 'next' on 2010-04-07 at 11ea09a)

461 + (merged to 'next' on 2010-05-04 at b7118ad)

462 + Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM

463 + GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries

464 + Add support for GIT_ONE_FILESYSTEM

465 + truncate cwd string before printing error message

466 + config.c: remove static keyword from git_env_bool()

467

385 -The tip one is a bit iffy; the whole series changes behaviour in a corner

386 -case, and is not a 1.7.1 material.

468 +(all except for the tip was in 'next' on 2010-04-07)

469 +

470 +The tip one is a bit iffy.

471

472 * pc/remove-warn (2010-03-26) 4 commits

389 - (merged to 'next' on 2010-04-02 at 52fc00d)

473 + (merged to 'next' on 2010-05-04 at c79c1e6)

474 + Remove a redundant errno test in a usage of remove_path

475 + Introduce remove_or_warn function

476 + Implement the rmdir_or_warn function

477 + Generalise the unlink_or_warn function

478

395 -I cherry-picked only obviously sensible bits.

479 +(was in 'next' on 2010-04-02)

480

481 * em/checkout-orphan (2010-03-21) 1 commit

398 - (merged to 'next' on 2010-03-28 at 86b6a4f)

482 + (merged to 'next' on 2010-05-04 at ddb45fc)

483 + git checkout: create unparented branch by --orphan

484

485 +(was in 'next' on 2010-03-28)

486 +

487 Perhaps needs a bit of documentation updates, describing the "going open

488 source" scenario.

489

490 * ar/config-from-command-line (2010-03-26) 2 commits

405 - (merged to 'next' on 2010-04-07 at e50fd3a)

491 + (merged to 'next' on 2010-05-04 at 2962717)

492 + Use strbufs instead of open-coded string manipulation

493 + Allow passing of configuration parameters in the command line

494 +

495 +(was in 'next' on 2010-04-07)

What's cooking (2010/05 #02)