256d39fcde · matheusbsbs/matheus-bagliano

@@ -0,0 +1,636 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Nov 2009, #03; Sun, 15)

3 +X-master-at: b7fba061e05d16fd2c61db5c279b6ad4db98aba4

4 +X-next-at: 2a326b29e43e05e9ccc1bcf1af09cb27ff606193

5 +

6 +What's cooking in git.git (Nov 2009, #03; Sun, 15)

7 +--------------------------------------------------

8 +

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

10 +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 +In 1.7.0, we plan to correct handful of warts in the interfaces everybody

15 +agrees that they were mistakes. The resulting system may not be strictly

16 +backward compatible. Currently planned changes are:

17 +

18 + * refuse push to update the checked out branch in a non-bare repo by

19 + default

20 +

21 + Make "git push" into a repository to update the branch that is checked

22 + out fail by default. You can countermand this default by setting a

23 + configuration variable in the receiving repository.

24 +

25 + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007

26 +

27 + * refuse push to delete the current branch by default

28 +

29 + Make "git push $there :$killed" to delete the branch that is pointed at

30 + by its HEAD fail by default. You can countermand this default by

31 + setting a configuration variable in the receiving repository.

32 +

33 + http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936

34 +

35 + * git-send-email won't make deep threads by default

36 +

37 + Many people said that by default when sending more than 2 patches the

38 + threading git-send-email makes by default is hard to read, and they

39 + prefer the default be one cover letter and each patch as a direct

40 + follow-up to the cover letter. You can countermand this by setting a

41 + configuration variable.

42 +

43 + http://article.gmane.org/gmane.comp.version-control.git/109790

44 +

45 + * git-status won't be "git-commit --dry-run" anymore

46 +

47 + http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993

48 +

49 + * "git-diff -w --exit-code" will exit success if only differences it

50 + found are whitespace changes that are stripped away from the output.

51 +

52 + http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751

53 +

54 +I wasn't fully functioning for the past few days, so this round we have

55 +only added new topics and new patches to existing ones, without changing

56 +the status of individual topics very much.

57 +

58 +--------------------------------------------------

59 +[Graduated to "master"]

60 +

61 +* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.

62 + (merged to 'next' on 2009-11-08 at 0943296)

63 + + format-patch: make "-p" suppress diffstat

64 + (this branch is used by bg/format-patch-doc-update.)

65 +

66 +* vl/maint-openssl-signature-change (2009-10-31) 1 commit.

67 + (merged to 'next' on 2009-10-31 at 0e1ce6b)

68 + + imap-send.c: fix compiler warnings for OpenSSL 1.0

69 +

70 +Prepare ourselves before newer versions of OpenSSL hits more platforms.

71 +

72 +* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.

73 + (merged to 'next' on 2009-11-06 at 27b86ec)

74 + + gitweb: Fix blob linenr links in pathinfo mode

75 +

76 +* bg/merge-ff-only (2009-10-29) 1 commit

77 + (merged to 'next' on 2009-10-31 at b6b49aa)

78 + + Teach 'git merge' and 'git pull' the option --ff-only

79 +

80 +* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.

81 + (merged to 'next' on 2009-10-31 at 3a31fcc)

82 + + ls-files: unbreak "ls-files -i"

83 +

84 +* tr/describe-advice (2009-10-28) 1 commit

85 + (merged to 'next' on 2009-10-31 at 8084850)

86 + + describe: when failing, tell the user about options that work

87 +

88 +* jp/dirty-describe (2009-10-21) 1 commit.

89 + (merged to 'next' on 2009-10-30 at 19c7fc7)

90 + + Teach "git describe" --dirty option

91 +

92 +* jk/gitignore-anchored (2009-10-26) 1 commit

93 + (merged to 'next' on 2009-10-30 at 9391a93)

94 + + gitignore: root most patterns at the top-level directory

95 +

96 +* jk/maint-push-config (2009-10-25) 1 commit.

97 + (merged to 'next' on 2009-10-30 at 934e3c5)

98 + + push: always load default config

99 +

100 +* sr/blame-incomplete (2009-10-19) 1 commit.

101 + (merged to 'next' on 2009-10-22 at 133e0ce)

102 + + blame: make sure that the last line ends in an LF

103 +

104 +I think this is _good enough_ as-is; although it would be better if we

105 +added some hint to the output for Porcelain implementations, that can be

106 +done as a follow-up fix.

107 +

108 +--------------------------------------------------

109 +[New Topics]

110 +

111 +* jn/help-everywhere (2009-11-09) 21 commits

112 + - diff --no-index: make the usage string less scary

113 + - merge-{recursive,subtree}: use usagef() to print usage

114 + - Introduce usagef() that takes a printf-style format

115 + - Let 'git <command> -h' show usage without a git dir

116 + - Show usage string for 'git http-push -h'

117 + - Let 'git http-fetch -h' show usage outside any git repository

118 + - Show usage string for 'git stripspace -h'

119 + - Show usage string for 'git unpack-file -h'

120 + - Show usage string for 'git show-index -h'

121 + - Show usage string for 'git rev-parse -h'

122 + - Show usage string for 'git merge-one-file -h'

123 + - Show usage string for 'git mailsplit -h'

124 + - Show usage string for 'git imap-send -h'

125 + - Show usage string for 'git get-tar-commit-id -h'

126 + - Show usage string for 'git fast-import -h'

127 + - Show usage string for 'git check-ref-format -h'

128 + - Show usage string for 'git show-ref -h'

129 + - Show usage string for 'git merge-ours -h'

130 + - Show usage string for 'git commit-tree -h'

131 + - Show usage string for 'git cherry -h'

132 + - Show usage string for 'git grep -h'

133 + (this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)

134 +

135 +There were unrelated but still worthy fixes, so I reordered some of them;

136 +also the "usage()" change is different from the one that was posted (see

137 +my comment in $gmane/132592).

138 +

139 +* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.

140 + - http-fetch: add missing initialization of argv0_path

141 + (this branch is used by jn/help-everywhere.)

142 +

143 +* jn/remove-fetch--tool (2009-11-09) 1 commit

144 + - Retire fetch--tool helper to contrib/examples

145 + (this branch is used by jn/help-everywhere.)

146 +

147 +These two were originally part of the "help-everywhere" topic but

148 +they can stand on their own.

149 +

150 +* jc/log-stdin (2009-11-03) 1 commit

151 + - Teach --stdin option to "log" family

152 +

153 +This is not signed-off (see $gmane/131971 for list of things you can do to

154 +help advancing this topic).

155 +

156 +* jn/gitweb-log-history (2009-11-13) 3 commits

157 + - gitweb: Make 'history' view (re)use git_log_generic()

158 + - gitweb: Refactor common parts of 'log' and 'shortlog' views

159 + - gitweb: Refactor 'log' action generation, adding git_log_body()

160 +

161 +* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit

162 + - git-pull.sh --rebase: overhaul error handling when no candidates are found

163 +

164 +* np/maint-sideband-favor-status (2009-11-11) 1 commit.

165 + - give priority to progress messages

166 +

167 +This looked obviously correct but I wasn't fully up to speed after being

168 +ill for a few days, so it is queued in 'pu' with everything else.

169 +

170 +* rg/doc-workflow (2009-11-14) 2 commits.

171 + - Corrections to release management section in gitworkflows.txt

172 + - Add branch management for releases to gitworkflows

173 +

174 +* sb/ls-tree-parseopt (2009-11-13) 2 commits.

175 + - ls-tree: migrate to parse-options

176 + - t3101: test more ls-tree options

177 +

178 +* tz/maint-rpm (2009-11-11) 1 commit.

179 + - Makefile: Ensure rpm packages can be read by older rpm versions

180 +

181 +--------------------------------------------------

182 +[Stalled]

183 +

184 +* jl/submodule-add-noname (2009-09-22) 1 commit.

185 + - git submodule add: make the <path> parameter optional

186 +

187 +Dscho started an interesting discussion regarding the larger workflow in

188 +which the "submodule add" is used. I think the patch itself makes sense

189 +but at the same time it probably makes sense to also take the <path> and

190 +infer the <repository> as Dscho suggested, probably in "git submodule

191 +add", not in "git add" proper, at least initially.

192 +

193 +Any objections against merging this to 'next'?

194 +

195 +* jc/fix-tree-walk (2009-10-22) 11 commits.

196 + (merged to 'next' on 2009-10-22 at 10c0c8f)

197 + + Revert failed attempt since 353c5ee

198 + + read-tree --debug-unpack

199 + (merged to 'next' on 2009-10-11 at 0b058e2)

200 + + unpack-trees.c: look ahead in the index

201 + + unpack-trees.c: prepare for looking ahead in the index

202 + + Aggressive three-way merge: fix D/F case

203 + + traverse_trees(): handle D/F conflict case sanely

204 + + more D/F conflict tests

205 + + tests: move convenience regexp to match object names to test-lib.sh

206 + + unpack_callback(): use unpack_failed() consistently

207 + + unpack-trees: typofix

208 + + diff-lib.c: fix misleading comments on oneway_diff()

209 +

210 +This has some stupid bugs and temporarily reverted from 'next' until I can

211 +fix it, but the "temporarily" turned out to be very loooong. Sigh...

212 +

213 +* jh/notes (2009-10-09) 22 commits.

214 + - fast-import: Proper notes tree manipulation using the notes API

215 + - Refactor notes concatenation into a flexible interface for combining notes

216 + - Notes API: Allow multiple concurrent notes trees with new struct notes_tree

217 + - Notes API: for_each_note(): Traverse the entire notes tree with a callback

218 + - Notes API: get_note(): Return the note annotating the given object

219 + - Notes API: add_note(): Add note objects to the internal notes tree structure

220 + - Notes API: init_notes(): Initialize the notes tree from the given notes ref

221 + - Notes API: get_commit_notes() -> format_note() + remove the commit restriction

222 + (merged to 'next' on 2009-11-01 at 948327a)

223 + + Add selftests verifying concatenation of multiple notes for the same commit

224 + + Refactor notes code to concatenate multiple notes annotating the same object

225 + + Add selftests verifying that we can parse notes trees with various fanouts

226 + + Teach the notes lookup code to parse notes trees with various fanout schemes

227 + + Teach notes code to free its internal data structures on request

228 + + Add '%N'-format for pretty-printing commit notes

229 + + Add flags to get_commit_notes() to control the format of the note string

230 + + t3302-notes-index-expensive: Speed up create_repo()

231 + + fast-import: Add support for importing commit notes

232 + + Teach "-m <msg>" and "-F <file>" to "git notes edit"

233 + + Add an expensive test for git-notes

234 + + Speed up git notes lookup

235 + + Add a script to edit/inspect notes

236 + + Introduce commit notes

237 +

238 +I somehow thought that the later API part was waiting for updates but

239 +nothing seems to be happening.

240 +

241 +* jn/gitweb-blame (2009-09-01) 5 commits.

242 + - gitweb: Minify gitweb.js if JSMIN is defined

243 + - gitweb: Create links leading to 'blame_incremental' using JavaScript

244 + (merged to 'next' on 2009-10-11 at 73c4a83)

245 + + gitweb: Colorize 'blame_incremental' view during processing

246 + + gitweb: Incremental blame (using JavaScript)

247 + + gitweb: Add optional "time to generate page" info in footer

248 +

249 +Ajax-y blame. Any progress or RFH?

250 +

251 +* sr/gfi-options (2009-09-06) 6 commits.

252 + - fast-import: test the new option command

253 + - fast-import: add option command

254 + - fast-import: test the new feature command

255 + - fast-import: add feature command

256 + - fast-import: put marks reading in it's own function

257 + - fast-import: put option parsing code in separate functions

258 +

259 +It seemed to be moving again soon, but nothing has happened yet...

260 +

261 +* je/send-email-no-subject (2009-08-05) 1 commit.

262 + (merged to 'next' on 2009-10-11 at 1b99c56)

263 + + send-email: confirm on empty mail subjects

264 +

265 +The existing tests cover the positive case (i.e. as long as the user says

266 +"yes" to the "do you really want to send this message that lacks subject",

267 +the message is sent) of this feature, but the feature itself needs its own

268 +test to verify the negative case (i.e. does it correctly stop if the user

269 +says "no"?)

270 +

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

272 +[Cooking]

273 +

274 +* sc/protocol-doc (2009-11-03) 1 commit.

275 + - Update packfile transfer protocol documentation

276 +

277 +* tr/filter-branch (2009-11-10) 2 commits.

278 + - filter-branch: nearest-ancestor rewriting outside subdir filter

279 + - filter-branch: stop special-casing $filter_subdir argument

280 +

281 +Updated again. Looked sane, except that the option might not be

282 +necessary. But that can be fixed while in 'next', so unless anybody

283 +sees further issues, I'll move this to 'next' soon.

284 +

285 +* em/commit-claim (2009-11-04) 1 commit

286 + - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author

287 +

288 +I just picked better bits from both versions, but this needs to be

289 +rethought.

290 +

291 +* bg/format-patch-doc-update (2009-11-07) 4 commits

292 + - format-patch: Add "--no-stat" as a synonym for "-p"

293 + - format-patch documentation: Fix formatting

294 + - format-patch documentation: Remove diff options that are not useful

295 + - format-patch: Always generate a patch

296 +

297 +Looked sensible, even though this may want to wait for 1.7.0. We'll see

298 +when we merge this to 'next'. I tweaked the --no-stat patch with noneg

299 +bit; please check for sanity.

300 +

301 +* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.

302 + - Makefile: merge two Cygwin configuration sections into one

303 + (this branch is used by rj/cygwin-msvc.)

304 +

305 +This is one of the most obviously correct bit from "Compiling on Cygwin

306 +using MSVC fails" topic.

307 +

308 +* rj/cygwin-msvc (2009-11-09) 3 commits.

309 + - Add explicit Cygwin check to guard WIN32 header inclusion

310 + - MSVC: Add support for building with NO_MMAP

311 + - Makefile: keep MSVC and Cygwin configuration separate

312 + (this branch uses rj/maint-simplify-cygwin-makefile.)

313 +

314 +I think J6t was not happy with the tip one.

315 +

316 +* bg/fetch-multi (2009-11-10) 9 commits

317 + - Re-implement 'git remote update' using 'git fetch'

318 + - builtin-fetch: add --dry-run option

319 + - builtin-fetch: add --prune option

320 + - teach warn_dangling_symref to take a FILE argument

321 + - remote: refactor some logic into get_stale_heads()

322 + - Add missing test for 'git remote update --prune'

323 + - Add the configuration option skipFetchAll

324 + - Teach the --multiple option to 'git fetch'

325 + - Teach the --all option to 'git fetch'

326 +

327 +This series from Björn Gustavsson contains 4 patches from Jay Soffian as

328 +well. I haven't looked at the code very closely yet.

329 +

330 +* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.

331 + (merged to 'next' on 2009-11-06 at d70f646)

332 + + pre-commit.sample: Diff against the empty tree when HEAD is invalid

333 +

334 +Looked Ok.

335 +

336 +* cc/bisect-doc (2009-11-08) 1 commit

337 + - Documentation: add "Fighting regressions with git bisect" article

338 +

339 +Any comments? Should it go to Documentation/technical instead?

340 +

341 +* sb/tutorial-test (2009-11-06) 4 commits

342 + - t1200: prepare for merging with Fast-forward bikeshedding

343 + - t1200: further modernize test script style

344 + - t1200: Make documentation and test agree

345 + - t1200: cleanup and modernize test style

346 +

347 +Ready for 'next', I think.

348 +

349 +* jn/editor-pager (2009-10-30) 9 commits

350 + - Provide a build time default-pager setting

351 + - Provide a build time default-editor setting

352 + - am -i, git-svn: use "git var GIT_PAGER"

353 + - add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"

354 + - Teach git var about GIT_PAGER

355 + - Teach git var about GIT_EDITOR

356 + - Suppress warnings from "git var -l"

357 + - Do not use VISUAL editor on dumb terminals

358 + - Handle more shell metacharacters in editor names

359 +

360 +* bw/autoconf-more (2009-11-04) 2 commits

361 + - configure: add settings for gitconfig, editor and pager

362 + - configure: add macro to set arbitrary make variables

363 +

364 +This will follow jn/editor-pager series.

365 +

366 +* js/maint-diff-color-words (2009-10-30) 3 commits.

367 + (merged to 'next' on 2009-11-10 at 5619714)

368 + + diff --color-words: bit of clean-up

369 + + diff --color-words -U0: fix the location of hunk headers

370 + + t4034-diff-words: add a test for word diff without context

371 +

372 +Fixes a corner case of running --color-words with -U0.

373 +

374 +* sc/difftool-p4merge (2009-10-28) 1 commit

375 + (merged to 'next' on 2009-10-31 at 194b5c5)

376 + + mergetool--lib: add p4merge as a pre-configured mergetool option

377 +

378 +I do not do p4 nor use difftool, so it's much easier for me to merge this

379 +to 'master' and wait for anybody to scream if there is breakage. I'll do

380 +so, unless I hear objections in a few days.

381 +

382 +* sr/vcs-helper (2009-11-06) 12 commits

383 + - Add Python support library for remote helpers

384 + - Basic build infrastructure for Python scripts

385 + - Allow helpers to request the path to the .git directory

386 + - Allow helpers to report in "list" command that the ref is unchanged

387 + - Allow helper to map private ref names into normal names

388 + - Add support for "import" helper command

389 + - Allow specifying the remote helper in the url

390 + - Add a config option for remotes to specify a foreign vcs

391 + - Allow fetch to modify refs

392 + - Use a function to determine whether a remote is valid

393 + - Allow programs to not depend on remotes having urls

394 + - Fix memory leak in helper method for disconnect

395 +

396 +Re-rolled series that contains Daniel's and Johan's.

397 +Any comments? Is everybody happy?

398 +

399 +* mr/gitweb-snapshot (2009-11-07) 4 commits.

400 + - gitweb: Smarter snapshot names

401 + - gitweb: Document current snapshot rules via new tests

402 + - t/gitweb-lib.sh: Split gitweb output into headers and body

403 + (merged to 'next' on 2009-10-11 at 22ba047)

404 + + gitweb: check given hash before trying to create snapshot

405 +

406 +Replaced commits near the tip with recent updates.

407 +

408 +* jp/fetch-cull-many-refs (2009-11-13) 3 commits

409 + (merged to 'next' on 2009-11-15 at db0f967)

410 + + remote: fix use-after-free error detected by glibc in ref_remove_duplicates

411 + (merged to 'next' on 2009-11-01 at 1f09ce9)

412 + + fetch: Speed up fetch of large numbers of refs

413 + + remote: Make ref_remove_duplicates faster for large numbers of refs

414 +

415 +Soon in 'master'.

416 +

417 +* jk/maint-add-p-empty (2009-10-27) 1 commit.

418 + (merged to 'next' on 2009-10-30 at 2bd302f)

419 + + add-interactive: handle deletion of empty files

420 +

421 +Soon in 'master'.

422 +

423 +* lt/revision-bisect (2009-10-27) 1 commit.

424 + (merged to 'next' on 2009-10-30 at 81ee52b)

425 + + Add '--bisect' revision machinery argument

426 +

427 +Soon in 'master'.

428 +

429 +* jc/pretty-lf (2009-10-04) 1 commit.

430 + - Pretty-format: %[+-]x to tweak inter-item newlines

431 +

432 +* rs/pretty-wrap (2009-11-08) 2 commits

433 + (merged to 'next' on 2009-11-08 at 8973fd8)

434 + + log --format: don't ignore %w() at the start of format string

435 + (merged to 'next' on 2009-10-30 at 403bbfe)

436 + + Implement wrap format %w() as if it is a mode switch

437 + (this branch uses js/log-rewrap.)

438 +

439 +Soon in 'master'.

440 +

441 +* js/log-rewrap (2009-10-18) 3 commits

442 + (merged to 'next' on 2009-10-30 at 403bbfe)

443 + + Teach --wrap to only indent without wrapping

444 + + Add strbuf_add_wrapped_text() to utf8.[ch]

445 + + print_wrapped_text(): allow hard newlines

446 + (this branch is used by rs/pretty-wrap.)

447 +

448 +Soon in 'master'.

449 +

450 +* fc/doc-fast-forward (2009-10-24) 1 commit.

451 + (merged to 'next' on 2009-11-01 at faaad90)

452 + + Use 'fast-forward' all over the place

453 +

454 +Soon in 'master'; carrying this in 'next' for too long is turning out to

455 +be quite painful.

456 +

457 +* ks/precompute-completion (2009-10-26) 3 commits.

458 + (merged to 'next' on 2009-10-28 at cd5177f)

459 + + completion: ignore custom merge strategies when pre-generating

460 + (merged to 'next' on 2009-10-22 at f46a28a)

461 + + bug: precomputed completion includes scripts sources

462 + (merged to 'next' on 2009-10-14 at adf722a)

463 + + Speedup bash completion loading

464 +

465 +I didn't follow the discussion from the past few days closely, but I am

466 +getting an impression that the consensus is we shouldn't precompute, so I

467 +may have to revert this and replace with what's cooking on the list when

468 +it stabilizes.

469 +

470 +* sp/smart-http (2009-11-11) 35 commits

471 + (merged to 'next' on 2009-11-15 at 2a326b2)

472 + + http-backend: Fix bad treatment of uintmax_t in Content-Length

473 + + t5551-http-fetch: Work around broken Accept header in libcurl

474 + + t5551-http-fetch: Work around some libcurl versions

475 + + http-backend: Protect GIT_PROJECT_ROOT from /../ requests

476 + + Git-aware CGI to provide dumb HTTP transport

477 + (merged to 'next' on 2009-11-06 at 666837c)

478 + + http-backend: Test configuration options

479 + + http-backend: Use http.getanyfile to disable dumb HTTP serving

480 + + test smart http fetch and push

481 + + http tests: use /dumb/ URL prefix

482 + + set httpd port before sourcing lib-httpd

483 + + t5540-http-push: remove redundant fetches

484 + + Smart HTTP fetch: gzip requests

485 + + Smart fetch over HTTP: client side

486 + + Smart push over HTTP: client side

487 + + Discover refs via smart HTTP server when available

488 + + http-backend: more explict LocationMatch

489 + + http-backend: add example for gitweb on same URL

490 + + http-backend: use mod_alias instead of mod_rewrite

491 + + http-backend: reword some documentation

492 + + http-backend: add GIT_PROJECT_ROOT environment var

493 + + Smart fetch and push over HTTP: server side

494 + + Add stateless RPC options to upload-pack, receive-pack

495 + + Git-aware CGI to provide dumb HTTP transport

496 + + remote-helpers: return successfully if everything up-to-date

497 + + Move WebDAV HTTP push under remote-curl

498 + + remote-helpers: Support custom transport options

499 + + remote-helpers: Fetch more than one ref in a batch

500 + + fetch: Allow transport -v -v -v to set verbosity to 3

501 + + remote-curl: Refactor walker initialization

502 + + Add multi_ack_detailed capability to fetch-pack/upload-pack

503 + + Move "get_ack()" back to fetch-pack

504 + + fetch-pack: Use a strbuf to compose the want list

505 + + pkt-line: Make packet_read_line easier to debug

506 + + pkt-line: Add strbuf based functions

507 + + http-push: fix check condition on http.c::finish_http_pack_request()

508 +

509 +* ef/msys-imap (2009-10-22) 9 commits.

510 + (merged to 'next' on 2009-10-31 at 8630603)

511 + + Windows: use BLK_SHA1 again

512 + + MSVC: Enable OpenSSL, and translate -lcrypto

513 + + mingw: enable OpenSSL

514 + + mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle

515 + + imap-send: build imap-send on Windows

516 + + imap-send: fix compilation-error on Windows

517 + + imap-send: use run-command API for tunneling

518 + + imap-send: use separate read and write fds

519 + + imap-send: remove useless uid code

520 +

521 +Soon in 'master', unless I hear objections from msys folks or imap-send

522 +users.

523 +

524 +* nd/sparse (2009-08-20) 19 commits.

525 + - sparse checkout: inhibit empty worktree

526 + - Add tests for sparse checkout

527 + - read-tree: add --no-sparse-checkout to disable sparse checkout support

528 + - unpack-trees(): ignore worktree check outside checkout area

529 + - unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index

530 + - unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout

531 + - unpack-trees.c: generalize verify_* functions

532 + - unpack-trees(): add CE_WT_REMOVE to remove on worktree alone

533 + - Introduce "sparse checkout"

534 + - dir.c: export excluded_1() and add_excludes_from_file_1()

535 + - excluded_1(): support exclude files in index

536 + - unpack-trees(): carry skip-worktree bit over in merged_entry()

537 + - Read .gitignore from index if it is skip-worktree

538 + - Avoid writing to buffer in add_excludes_from_file_1()

539 + - Teach Git to respect skip-worktree bit (writing part)

540 + - Teach Git to respect skip-worktree bit (reading part)

541 + - Introduce "skip-worktree" bit in index, teach Git to get/set this bit

542 + - Add test-index-version

543 + - update-index: refactor mark_valid() in preparation for new options

544 +

545 +The latest update I didn't look at very closely but I had an impression

546 +that it was touching very generic codepath that would affect non sparse

547 +cases, iow the patch looked very scary (the entire series already is).

548 +

549 +--------------------------------------------------

550 +[For 1.7.0]

551 +

552 +* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.

553 + - git-merge: forbid fast-forward and up-to-date when --no-commit is given

554 +

555 +This makes "git merge --no-commit" fail when it results in fast-forward or

556 +up-to-date. I haven't described this at the beginning of this message

557 +yet, as it is not clear if this change is even necessary. Opinions?

558 +

559 +* jk/1.7.0-status (2009-09-05) 5 commits.

560 + - docs: note that status configuration affects only long format

561 + (merged to 'next' on 2009-10-11 at 65c8513)

562 + + commit: support alternate status formats

563 + + status: add --porcelain output format

564 + + status: refactor format option parsing

565 + + status: refactor short-mode printing to its own function

566 + (this branch uses jc/1.7.0-status.)

567 +

568 +Gives the --short output format to post 1.7.0 "git commit --dry-run" that

569 +is similar to that of post 1.7.0 "git status".

570 +

571 +The tip one is not in 'next' as I have been hoping that somebody may want

572 +to change the code to make it unnecessary, but it does not seem to be

573 +happening, so probably it should also go to 'next'.

574 +

575 +* jc/1.7.0-status (2009-09-05) 4 commits.

576 + (merged to 'next' on 2009-10-11 at 9558627)

577 + + status: typo fix in usage

578 + + git status: not "commit --dry-run" anymore

579 + + git stat -s: short status output

580 + + git stat: the beginning of "status that is not a dry-run of commit"

581 + (this branch is used by jk/1.7.0-status.)

582 +

583 +With this, "git status" is no longer "git commit --dry-run".

584 +

585 +* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.

586 + (merged to 'next' on 2009-10-11 at 043acdf)

587 + + send-email: make --no-chain-reply-to the default

588 +

589 +* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.

590 + (merged to 'next' on 2009-10-11 at 546c74d)

591 + + diff.c: fix typoes in comments

592 + + Make test case number unique

593 + + diff: Rename QUIET internal option to QUICK

594 + + diff: change semantics of "ignore whitespace" options

595 +

596 +This changes exit code from "git diff --ignore-whitespace" and friends

597 +when there is no actual output. It is a backward incompatible change, but

598 +we could argue that it is a bugfix.

599 +

600 +* jc/1.7.0-push-safety (2009-02-09) 2 commits.

601 + (merged to 'next' on 2009-10-11 at 81b8128)

602 + + Refuse deleting the current branch via push

603 + + Refuse updating the current branch in a non-bare repository via push

604 +

605 +--------------------------------------------------

606 +[I have been too busy to purge these]

607 +

608 +* ne/rev-cache (2009-10-19) 7 commits.

609 + . support for commit grafts, slight change to general mechanism

610 + . support for path name caching in rev-cache

611 + . full integration of rev-cache into git, completed test suite

612 + . administrative functions for rev-cache, start of integration into git

613 + . support for non-commit object caching in rev-cache

614 + . basic revision cache system, no integration or features

615 + . man page and technical discussion for rev-cache

616 +

617 +The author indicated that there is another round coming. Does not seem to

618 +pass the tests when merged to 'pu', so it has been ejected for now.

619 +

620 +* jc/log-tz (2009-03-03) 1 commit.

621 + - Allow --date=local --date=other-format to work as expected

622 +

623 +Maybe some people care about this. I dunno.

624 +

625 +* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.

626 + - mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker

627 +

628 +Maybe some people care about this. I dunno.

629 +

630 +* pb/gitweb-no-project-list (2009-11-06) 3 commits.

631 + . gitweb: Polish the content tags support

632 + . gitweb: Support for no project list on gitweb front page

633 + . gitweb: Refactor project list routines

634 +

635 +I picked these up but didn't queue as Warthog9's comments made certain

636 +amount of sense to me.