f0ec504591 · matheusbsbs/matheus-bagliano

@@ -0,0 +1,623 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Nov 2009, #04; Mon, 16)

3 +X-master-at: 785c58e5c7b7eaade64621a1ad5090da080c1788

4 +X-next-at: 5b5a93f7582d21b81a76f70ff8760e431d28fedb

5 +

6 +What's cooking in git.git (Nov 2009, #04; Mon, 16)

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 +* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.

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

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

64 +

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

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

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

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

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

70 +

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

72 +

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

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

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

76 +

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

78 +to 'master' and wait for anybody to scream if there is breakage.

79 +

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

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

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

83 +

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

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

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

87 +

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

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

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

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

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

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

94 +

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

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

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

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

99 + + print_wrapped_text(): allow hard newlines

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

101 +

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

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

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

105 +

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

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

108 +

109 +--------------------------------------------------

110 +[New Topics]

111 +

112 +* jn/faster-completion-startup (2009-11-15) 1 commit.

113 + - Speed up bash completion loading

114 +

115 +* th/maint-remote-update-help-string (2009-11-15) 1 commit.

116 + - Update 'git remote update' usage string to match man page.

117 +

118 +* tr/maint-merge-ours-clarification (2009-11-15) 3 commits.

119 + - rebase: refuse to rebase with -s ours

120 + - rebase docs: clarify --merge and --strategy

121 + - Documentation: clarify 'ours' merge strategy

122 +

123 +* tc/format-attribute (2009-11-14) 1 commit

124 + - Check the format of more printf-type functions

125 +

126 +* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.

127 + (merged to 'next' on 2009-11-16 at 5b5a93f)

128 + + diffcore-break: save cnt_data for other phases

129 + + diffcore-break: free filespec data as we go

130 +

131 +* bc/grep-i-F (2009-11-06) 1 commit.

132 + - grep: Allow case insensitive search of fixed-strings

133 +

134 +* mm/config-pathname-tilde-expand (2009-11-16) 2 commits.

135 + - Squash as a fix-up

136 + - Expand ~ and ~user in core.excludesfile, commit.template

137 +

138 +* pb/maint-use-custom-perl (2009-11-17) 1 commit.

139 + - Make sure $PERL_PATH is defined when the test suite is run.

140 +

141 +* th/remote-usage (2009-11-16) 1 commit.

142 + - git remote: Separate usage strings for subcommands

143 +

144 +* mo/maint-crlf-doc (2009-11-14) 1 commit.

145 + - core.autocrlf documentation: mention the crlf attribute

146 +

147 +--------------------------------------------------

148 +[Stalled]

149 +

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

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

152 + - MSVC: Add support for building with NO_MMAP

153 + - Makefile: keep MSVC and Cygwin configuration separate

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

155 +

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

157 +

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

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

160 + + Revert failed attempt since 353c5ee

161 + + read-tree --debug-unpack

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

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

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

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

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

167 + + more D/F conflict tests

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

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

170 + + unpack-trees: typofix

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

172 +

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

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

175 +

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

196 + + Add an expensive test for git-notes

197 + + Speed up git notes lookup

198 + + Add a script to edit/inspect notes

199 + + Introduce commit notes

200 +

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

202 +nothing seems to be happening.

203 +

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

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

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

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

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

209 + + gitweb: Incremental blame (using JavaScript)

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

211 +

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

213 +

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

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

216 + - fast-import: add option command

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

218 + - fast-import: add feature command

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

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

221 +

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

223 +

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

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

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

227 +

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

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

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

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

232 +says "no"?)

233 +

234 +--------------------------------------------------

235 +[Cooking]

236 +

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

260 +

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

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

263 +my comment in $gmane/132592).

264 +

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

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

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

268 +

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

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

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

272 +

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

274 +they can stand on their own.

275 +

276 +All of the above should be ready for 'next'.

277 +

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

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

280 +

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

282 +help advancing this topic).

283 +

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

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

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

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

288 +

289 +Soon in 'next'

290 +

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

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

293 +

294 +I heard this needs at least retitling among other changes?

295 +

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

297 + (merged to 'next' on 2009-11-15 at 3ecd874)

298 + + give priority to progress messages

299 +

300 +Soon in 'master'.

301 +

302 +* rg/doc-workflow (2009-11-15) 3 commits.

303 + - [An RFC fix-up to further reword release section]

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

305 + - Add branch management for releases to gitworkflows

306 +

307 +Thomas's further rewording is added to the top but its log message needs

308 +rewriting and the text might need further restructuring.

309 +

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

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

312 + - t3101: test more ls-tree options

313 +

314 +Looked fine but the test needs to be updated. --abbrev=5 does not

315 +guarantee that output is always 5 hexdigits long.

316 +

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

318 + (merged to 'next' on 2009-11-15 at 3a77d01)

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

320 +

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

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

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

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

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

326 +

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

328 + (merged to 'next' on 2009-11-15 at 32d6de8)

329 + + Update packfile transfer protocol documentation

330 +

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

332 + (merged to 'next' on 2009-11-15 at 79c6a1d)

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

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

335 +

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

337 +necessary, but that can be fixed while in 'next'.

338 +

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

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

341 +

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

343 +rethought.

344 +

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

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

347 + - format-patch documentation: Fix formatting

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

349 + - format-patch: Always generate a patch

350 +

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

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

353 +bit; please check for sanity.

354 +

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

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

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

358 +

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

360 +using MSVC fails" topic.

361 +

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

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

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

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

366 + - teach warn_dangling_symref to take a FILE argument

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

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

369 + - Add the configuration option skipFetchAll

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

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

372 +

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

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

375 +

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

377 +

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

379 + (merged to 'next' on 2009-11-15 at 5c82651)

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

381 + + t1200: further modernize test script style

382 + + t1200: Make documentation and test agree

383 + + t1200: cleanup and modernize test style

384 +

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

386 + (merged to 'next' on 2009-11-15 at 7f3e3ae)

387 + + Provide a build time default-pager setting

388 + + Provide a build time default-editor setting

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

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

391 + + Teach git var about GIT_PAGER

392 + + Teach git var about GIT_EDITOR

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

394 + + Do not use VISUAL editor on dumb terminals

395 + + Handle more shell metacharacters in editor names

396 +

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

398 + (merged to 'next' on 2009-11-15 at e86a8c9)

399 + + configure: add settings for gitconfig, editor and pager

400 + + configure: add macro to set arbitrary make variables

401 +

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

403 +

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

405 + - Add Python support library for remote helpers

406 + - Basic build infrastructure for Python scripts

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

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

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

410 + - Add support for "import" helper command

411 + - Allow specifying the remote helper in the url

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

413 + - Allow fetch to modify refs

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

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

416 + - Fix memory leak in helper method for disconnect

417 +

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

419 +Any comments? Is everybody happy?

420 +

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

422 + - gitweb: Smarter snapshot names

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

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

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

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

427 +

428 +Replaced commits near the tip with recent updates.

429 +

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

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

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

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

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

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

436 +

437 +Soon in 'master'.

438 +

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

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

441 +

442 +* ks/precompute-completion (2009-11-15) 4 commits.

443 + (merged to 'next' on 2009-11-15 at 23cdb96)

444 + + Revert ks/precompute-completion series

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

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

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

448 + + bug: precomputed completion includes scripts sources

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

450 + + Speedup bash completion loading

451 +

452 +Reverted out of 'next', to be replaced with jn/faster-completion-startup

453 +topic.

454 +

455 +* sp/smart-http (2009-11-14) 37 commits

456 + - http-backend: Let gcc check the format of more printf-type functions.

457 + - http-backend: Fix access beyond end of string.

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

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

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

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

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

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

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

465 + + http-backend: Test configuration options

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

467 + + test smart http fetch and push

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

469 + + set httpd port before sourcing lib-httpd

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

471 + + Smart HTTP fetch: gzip requests

472 + + Smart fetch over HTTP: client side

473 + + Smart push over HTTP: client side

474 + + Discover refs via smart HTTP server when available

475 + + http-backend: more explict LocationMatch

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

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

478 + + http-backend: reword some documentation

479 + + http-backend: add GIT_PROJECT_ROOT environment var

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

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

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

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

484 + + Move WebDAV HTTP push under remote-curl

485 + + remote-helpers: Support custom transport options

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

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

488 + + remote-curl: Refactor walker initialization

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

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

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

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

493 + + pkt-line: Add strbuf based functions

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

495 +

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

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

498 + + Windows: use BLK_SHA1 again

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

500 + + mingw: enable OpenSSL

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

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

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

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

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

506 + + imap-send: remove useless uid code

507 +

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

509 +users.

510 +

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

512 + - sparse checkout: inhibit empty worktree

513 + - Add tests for sparse checkout

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

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

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

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

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

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

520 + - Introduce "sparse checkout"

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

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

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

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

525 + - Avoid writing to buffer in add_excludes_from_file_1()

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

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

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

529 + - Add test-index-version

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

531 +

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

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

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

535 +

536 +--------------------------------------------------

537 +[For 1.7.0]

538 +

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

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

541 +

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

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

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

545 +

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

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

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

549 + + commit: support alternate status formats

550 + + status: add --porcelain output format

551 + + status: refactor format option parsing

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

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

554 +

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

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

557 +

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

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

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

561 +

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

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

564 + + status: typo fix in usage

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

566 + + git stat -s: short status output

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

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

569 +

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

571 +

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

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

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

575 +

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

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

578 + + diff.c: fix typoes in comments

579 + + Make test case number unique

580 + + diff: Rename QUIET internal option to QUICK

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

582 +

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

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

585 +we could argue that it is a bugfix.

586 +

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

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

589 + + Refuse deleting the current branch via push

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

591 +

592 +--------------------------------------------------

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

594 +

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

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

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

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

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

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

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

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

603 +

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

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

606 +

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

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

609 +

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

611 +

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

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

614 +

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

616 +

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

618 + . gitweb: Polish the content tags support

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

620 + . gitweb: Refactor project list routines

621 +

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

623 +amount of sense to me.

Meta/Announce: the RPMs are cut on FC11 now