4361d41186 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2011, #09; Fri, 30)

2 +Subject: What's cooking in git.git (Oct 2011, #01; Tue, 4)

3 X-master-at: 703f05ad5835cff92b12c29aecf8d724c8c847e2

4 X-next-at: fb0d39e4afa503eb7e63e40306f6f566df484586

5

6 -What's cooking in git.git (Sep 2011, #09; Fri, 30)

6 +What's cooking in git.git (Oct 2011, #01; Tue, 4)

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

8

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

@@ -31,22 +31,92 @@ tentatively have the following in your $HOME/.gitconfig:

31 [url "http://code.google.com/p/git-core"]

32 insteadOf = git://git.kernel.org/pub/scm/git/git.git

33

34 -I just tagged v1.7.7 final, and expect to rewind and rebuild the 'next'

35 -branch on top of it sometime next week.

34 +I am planning to kick some topics out of 'next' back to 'pu' to give them

35 +a chance to be cleaned up. Not happened yet, but see below for ideas.

36

37 --------------------------------------------------

38 [New Topics]

39

40 -* dm/tree-walk (2011-09-28) 2 commits

41 - - tree-walk: micro-optimization in tree_entry_interesting

42 - - tree-walk: drop unused parameter from match_dir_prefix

40 +* cb/do-not-pretend-to-hijack-long-help (2011-10-03) 2 commits

41 + - fixup: leave uppercase H alone

42 + - use -h for synopsis and --help for manpage consistently

43

44 -* cs/perl-config-path-send-email (2011-09-30) 2 commits

45 - - use new Git::config_path() for aliasesfile

46 - - Add Git::config_path()

44 +Will squash the top one into the original unless somebody objects.

45

48 -* jc/checkout-from-tree-keep-local-changes (2011-09-30) 1 commit

49 - - checkout $tree $path: do not clobber local changes in $path not in $tree

46 +* cp/git-web-browse-browsers (2011-10-03) 1 commit

47 + - git-web--browse: avoid the use of eval

48 +

49 +Will merge to "next".

50 +

51 +* il/archive-err-signal (2011-10-03) 1 commit

52 + - transport: do not allow to push over git:// protocol

53 +

54 +Will merge to "next".

55 +

56 +* nd/daemon-log-sock-errors (2011-10-03) 1 commit

57 + - daemon: log errors if we could not use some sockets

58 +

59 +Will merge to "next".

60 +

61 +* nd/document-err-packet (2011-10-03) 1 commit

62 + - pack-protocol: document "ERR" line

63 +

64 +Will merge to "next".

65 +

66 +* nd/git-daemon-error-msgs (2011-10-03) 1 commit

67 + - daemon: return "access denied" if a service is not allowed

68 +

69 +Will merge to "next".

70 +

71 +* jc/is-url-simplify (2011-10-03) 1 commit

72 + - url.c: simplify is_url()

73 +

74 +Will merge to "next".

75 +

76 +* jn/ident-from-etc-mailname (2011-10-03) 1 commit

77 + - ident: check /etc/mailname if email is unknown

78 +

79 +Will merge to "next".

80 +

81 +The warning might have to be squelched further, but that can be done as a

82 +separate patch in-tree.

83 +

84 +* jn/no-g-plus-s-on-bsd (2011-10-03) 1 commit

85 + - Makefile: do not set setgid bit on directories on GNU/kFreeBSD

86 +

87 +Will merge to "next".

88 +

89 +* js/log-show-children (2011-10-04) 1 commit

90 + - log --children

91 +

92 +Will merge to "next".

93 +

94 +* rs/name-rev-usage (2011-10-03) 1 commit

95 + - name-rev: split usage string

96 +

97 +Will merge to "next".

98 +

99 +* rs/test-ctype (2011-10-03) 2 commits

100 + - test-ctype: add test for is_pathspec_magic

101 + - test-ctype: macrofy

102 +

103 +Will merge to "next".

104 +

105 +* rs/pending (2011-10-03) 8 commits

106 + - commit: factor out clear_commit_marks_for_object_array

107 + - checkout: use leak_pending flag

108 + - bundle: use leak_pending flag

109 + - bisect: use leak_pending flag

110 + - revision: add leak_pending flag

111 + - checkout: use add_pending_{object,sha1} in orphan check

112 + - revision: factor out add_pending_sha1

113 + - checkout: check for "Previous HEAD" notice in t2020

114 +

115 +* ph/transport-with-gitfile (2011-10-04) 4 commits

116 + - Add test showing git-fetch groks gitfiles

117 + - Teach transport about the gitfile mechanism

118 + - Learn to handle gitfiles in enter_repo

119 + - enter_repo: do not modify input

120

121 --------------------------------------------------

122 [Stalled]

@@ -63,6 +133,8 @@ branch on top of it sometime next week.

133 The second from the bottom one needs to be replaced with a properly

134 written commit log message.

135

136 +Will kick back to 'pu'.

137 +

138 * jc/signed-push (2011-09-12) 7 commits

139 - push -s: support pre-receive-signature hook

140 - push -s: receiving end

@@ -84,7 +156,6 @@ This was the v2 that updated notes tree on the receiving end.

156

157 This is the third edition, that moves the preparation of the notes tree to

158 the sending end.

87 -

159 I expect that both of these topics will be discarded.

160

161 * jk/add-i-hunk-filter (2011-07-27) 5 commits

@@ -95,7 +166,7 @@ I expect that both of these topics will be discarded.

166 + add--interactive: factor out regex error handling

167 + add--interactive: refactor patch mode argument processing

168

98 -Will be dropped.

169 +Will discard.

170

171 * jh/receive-count-limit (2011-05-23) 10 commits

172 - receive-pack: Allow server to refuse pushes with too many objects

@@ -110,6 +181,7 @@ Will be dropped.

181 - Update technical docs to reflect side-band-64k capability in receive-pack

182

183 Would need another round to separate per-pack and per-session limits.

184 +Will discard.

185

186 * jk/generation-numbers (2011-09-11) 8 commits

187 - metadata-cache.c: make two functions static

@@ -122,7 +194,8 @@ Would need another round to separate per-pack and per-session limits.

194 - Merge branch 'jk/tag-contains-ab' (early part) into HEAD

195

196 The initial "tag --contains" de-pessimization without need for generation

125 -numbers is already in; backburnered.

197 +numbers is already in.

198 +Will discard.

199

200 * sr/transport-helper-fix-rfc (2011-07-19) 2 commits

201 - t5800: point out that deleting branches does not work

@@ -136,31 +209,54 @@ command line, 2011-08-25) in bk/ancestry-path would help.

209 - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep

210

211 Incomplete with respect to backslash processing in prefix_filename(), and

139 -also loses the ability to escape glob specials. Perhaps drop?

212 +also loses the ability to escape glob specials.

213 +Will discard.

214

215 --------------------------------------------------

216 [Cooking]

217

218 +* jc/grep-untracked-exclude (2011-10-04) 1 commit

219 + - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

220 + (this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)

221 +

222 +* jc/maint-grep-untracked-exclude (2011-10-04) 1 commit

223 + - grep: teach --untracked and --exclude-standard options

224 + (this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)

225 +

226 +Will merge to "next".

227 +

228 +* dm/tree-walk (2011-09-28) 2 commits

229 + - tree-walk: micro-optimization in tree_entry_interesting

230 + - tree-walk: drop unused parameter from match_dir_prefix

231 +

232 +Will merge to "next".

233 +

234 +* cs/perl-config-path-send-email (2011-09-30) 2 commits

235 + - use new Git::config_path() for aliasesfile

236 + - Add Git::config_path()

237 +

238 +Will merge to "next".

239 +

240 +* jc/checkout-from-tree-keep-local-changes (2011-09-30) 1 commit

241 + - checkout $tree $path: do not clobber local changes in $path not in $tree

242 +

243 +Will merge to "next".

244 +

245 * jc/apply-blank-at-eof-fix (2011-09-26) 1 commit

246 - apply --whitespace=error: correctly report new blank lines at end

247

248 +Will merge to "next".

249 +

250 * nd/sparse-doc (2011-09-26) 1 commit

251 - git-read-tree.txt: update sparse checkout examples

252

253 +Will merge to "next".

254 +

255 * jp/get-ref-dir-unsorted (2011-09-30) 2 commits

256 - refs: Use binary search to lookup refs faster

257 - Don't sort ref_list too early

258

154 -* jc/grep-untracked-exclude (2011-09-28) 2 commits

155 - - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

156 - - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

157 - (this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)

158 -

159 -* jc/maint-grep-untracked-exclude (2011-09-28) 3 commits

160 - - grep: rename --exclude to --exclude-standard

161 - - grep: --untracked and --exclude tests

162 - - grep: teach --untracked and --exclude options

163 - (this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)

259 +Will merge to "next".

260

261 * jc/parse-options-boolean (2011-09-28) 5 commits

262 - apply: use OPT_NOOP_NOARG

@@ -169,18 +265,28 @@ also loses the ability to escape glob specials. Perhaps drop?

265 - archive.c: use OPT_BOOL()

266 - parse-options: deprecate OPT_BOOLEAN

267

268 +Will merge to "next".

269 +

270 * mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit

271 - notes_merge_commit(): do not pass temporary buffer to other function

272

273 +Will merge to "next".

274 +

275 * ph/push-to-delete-nothing (2011-09-30) 1 commit

276 - receive-pack: don't pass non-existent refs to post-{receive,update} hooks

277

278 +Will merge to "next".

279 +

280 * ps/gitweb-js-with-lineno (2011-09-27) 1 commit

281 - gitweb: Fix links to lines in blobs when javascript-actions are enabled

282

283 +Will merge to "next".

284 +

285 * zj/send-email-authen-sasl (2011-09-29) 1 commit

286 - send-email: auth plain/login fix

287

288 +Will merge to "next".

289 +

290 * jc/maint-diffstat-numstat-context (2011-09-22) 1 commit

291 (merged to 'next' on 2011-09-26 at 12539ab)

292 + diff: teach --stat/--numstat to honor -U$num

@@ -189,52 +295,73 @@ also loses the ability to escape glob specials. Perhaps drop?

295 many context lines it is showing, so running --(num)stat with 0 lines of

296 context internally gives a result that may be surprising to some people.

297

298 +Will merge to "master" as the second wave.

299 +

300 * nd/maint-sparse-errors (2011-09-22) 2 commits

301 (merged to 'next' on 2011-09-26 at cdcdec5)

302 + Add explanation why we do not allow to sparse checkout to empty working tree

303 + sparse checkout: show error messages when worktree shaping fails

304

197 -* rs/diff-cleanup-records-fix (2011-09-26) 1 commit

305 +Will merge to "master" as the third wave.

306 +

307 +* rs/diff-cleanup-records-fix (2011-10-03) 2 commits

308 + - diff: resurrect XDF_NEED_MINIMAL with --minimal

309 (merged to 'next' on 2011-09-27 at 3bd75d8)

310 + Revert removal of multi-match discard heuristic in 27af01

311

312 +Will merge to "next".

313 +

314 * di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits

315 - fast-import: don't allow to note on empty branch

316 - fast-import: don't allow to tag empty branch

317

205 -Looked reasonable.

318 +Will merge to "next".

319

320 * js/check-attr-cached (2011-09-22) 2 commits

321 (merged to 'next' on 2011-09-27 at 74d7b66)

322 + t0003: remove extra whitespaces

323 + Teach '--cached' option to check-attr

324

325 +Will merge to "master" as the first wave.

326 +

327 * bw/grep-no-index-no-exclude (2011-09-15) 2 commits

328 (merged to 'next' on 2011-09-26 at 776f13b)

329 + grep --no-index: don't use git standard exclusions

330 + grep: do not use --index in the short usage output

331 (this branch is used by jc/grep-untracked-exclude and jc/maint-grep-untracked-exclude.)

332

333 +Will merge to "master" as the third wave.

334 +

335 * jc/want-commit (2011-09-15) 1 commit

336 (merged to 'next' on 2011-09-26 at 5841512)

337 + Allow git merge ":/<pattern>"

338

339 +Will merge to "master" as the first wave.

340 +

341 * jc/ls-remote-short-help (2011-09-16) 1 commit

342 (merged to 'next' on 2011-09-26 at e24a27a)

343 + ls-remote: a lone "-h" is asking for help

344

345 +Will merge to "master" as the first wave.

346 +

347 * jc/maint-bundle-too-quiet (2011-09-19) 1 commit

348 (merged to 'next' on 2011-09-26 at ba140d4)

349 + Teach progress eye-candy to fetch_refs_from_bundle()

350

351 +Will merge to "master" as the first wave.

352 +

353 * jk/filter-branch-require-clean-work-tree (2011-09-15) 1 commit

354 (merged to 'next' on 2011-09-26 at 206a74a)

355 + filter-branch: use require_clean_work_tree

356

357 +Will merge to "master" as the first wave.

358 +

359 * jn/gitweb-highlite-sanitise (2011-09-16) 1 commit

360 (merged to 'next' on 2011-09-26 at c79390a)

361 + gitweb: Strip non-printable characters from syntax highlighter output

362

363 +Will merge to "master" as the first wave.

364 +

365 * mh/check-ref-format-3 (2011-09-16) 22 commits

366 - add_ref(): verify that the refname is formatted correctly

367 - resolve_ref(): expand documentation

@@ -259,28 +386,40 @@ Looked reasonable.

386 - git check-ref-format: add options --allow-onelevel and --refspec-pattern

387 - t1402: add some more tests

388

389 +Will merge to "next".

390 +

391 * cn/eradicate-working-copy (2011-09-21) 1 commit

392 (merged to 'next' on 2011-09-26 at 2683d36)

393 + Remove 'working copy' from the documentation and C code

394

395 +Will merge to "master" as the first wave.

396 +

397 * js/bisect-no-checkout (2011-09-21) 1 commit

398 (merged to 'next' on 2011-09-21 at e94ad3e)

399 + bisect: fix exiting when checkout failed in bisect_start()

400

401 +Will merge to "master" as the third wave.

402 +

403 * mg/maint-doc-sparse-checkout (2011-09-21) 3 commits

404 (merged to 'next' on 2011-09-21 at f316dec)

405 + git-read-tree.txt: correct sparse-checkout and skip-worktree description

406 + git-read-tree.txt: language and typography fixes

407 + unpack-trees: print "Aborting" to stderr

408

409 +Will merge to "master" as the first wave.

410 +

411 * ms/patch-id-with-overlong-line (2011-09-22) 1 commit

412 (merged to 'next' on 2011-09-26 at a33d0b2)

413 + patch-id.c: use strbuf instead of a fixed buffer

414

415 +Will merge to "master" as the first wave.

416 +

417 * sn/doc-update-index-assume-unchanged (2011-09-21) 1 commit

418 (merged to 'next' on 2011-09-21 at 325e796)

419 + Documentation/git-update-index: refer to 'ls-files'

420

421 +Will merge to "master" as the first wave.

422 +

423 * jc/request-pull-show-head-4 (2011-09-21) 7 commits

424 - request-pull: use the branch description

425 - request-pull: state what commit to expect

@@ -291,11 +430,15 @@ Looked reasonable.

430 - Merge branch 'bk/ancestry-path' into jc/branch-desc

431 (this branch uses bk/ancestry-path.)

432

433 +Will merge to "next".

434 +

435 * jm/mergetool-pathspec (2011-09-26) 2 commits

436 (merged to 'next' on 2011-09-26 at f699566)

437 + mergetool: no longer need to save standard input

438 + mergetool: Use args as pathspec to unmerged files

439

440 +Will merge to "master" as the second wave.

441 +

442 * nd/maint-autofix-tag-in-head (2011-09-18) 4 commits

443 (merged to 'next' on 2011-09-27 at dc8e2e3)

444 + Accept tags in HEAD or MERGE_HEAD

@@ -303,13 +446,14 @@ Looked reasonable.

446 + merge: use return value of resolve_ref() to determine if HEAD is invalid

447 + merge: keep stash[] a local variable

448

449 +Will merge to "master" as the third wave.

450 +

451 * jk/maint-fetch-submodule-check-fix (2011-09-12) 1 commit

452 (merged to 'next' on 2011-09-12 at 3c73b8c)

453 + fetch: avoid quadratic loop checking for updated submodules

454 (this branch is used by jk/argv-array.)

455

311 -This probably can wait, as long as the other half of the regression fix

312 -is in the upcoming release.

456 +Will merge to "master" as the first wave.

457

458 * bc/attr-ignore-case (2011-09-14) 5 commits

459 (merged to 'next' on 2011-09-26 at 1e0814c)

@@ -319,10 +463,14 @@ is in the upcoming release.

463 + cleanup: use internal memory allocation wrapper functions everywhere

464 + attr.c: avoid inappropriate access to strbuf "buf" member

465

466 +Will merge to "master" as the second wave.

467 +

468 * jc/maint-fsck-fwrite-size-check (2011-09-11) 1 commit

469 (merged to 'next' on 2011-09-16 at 2258f11)

470 + fsck: do not abort upon finding an empty blob

471

472 +Will merge to "master" as the first wave.

473 +

474 * jk/argv-array (2011-09-14) 7 commits

475 (merged to 'next' on 2011-09-16 at 90feab4)

476 + run_hook: use argv_array API

@@ -334,38 +482,48 @@ is in the upcoming release.

482 + add sha1_array API docs

483 (this branch uses jk/maint-fetch-submodule-check-fix.)

484

485 +This has a slight interaction with the "pending_sha1 without having to

486 +read the object" work on rs/pending, but otherwise OK.

487 +

488 +Will merge to "master" as the first wave.

489 +

490 * js/cred-macos-x-keychain-2 (2011-09-14) 1 commit

491 (merged to 'next' on 2011-09-26 at 4f289a4)

492 + contrib: add a pair of credential helpers for Mac OS X's keychain

493 (this branch uses jk/http-auth-keyring.)

494

342 -Welcome addition to build our confidence in the jk/http-auth-keyring topic.

495 +Will kick back to 'pu' together with 'jk/http-auth-keyring'.

496

497 * rj/maint-t9159-svn-rev-notation (2011-09-21) 1 commit

498 (merged to 'next' on 2011-09-26 at 525a567)

499 + t9159-*.sh: skip for mergeinfo test for svn <= 1.4

500

501 +Will merge to "master" as the first wave.

502 +

503 * tr/doc-note-rewrite (2011-09-13) 1 commit

504 (merged to 'next' on 2011-09-16 at 5fe813a)

505 + Documentation: basic configuration of notes.rewriteRef

506

352 -Updated to a safer wording.

507 +Will merge to "master" as the first wave.

508

509 * jk/default-attr (2011-09-12) 1 commit

510 - attr: map builtin userdiff drivers to well-known extensions

511

357 -Will be re-rolled after 1.7.7 final.

512 +Will discard, expecting a fresh re-roll.

513

514 * hl/iso8601-more-zone-formats (2011-09-12) 1 commit

515 (merged to 'next' on 2011-09-12 at 270f5c7)

516 + date.c: Support iso8601 timezone formats

517

518 +Will merge to "master" as the first wave.

519 +

520 * jc/run-receive-hook-cleanup (2011-09-12) 1 commit

521 (merged to 'next' on 2011-09-12 at 68dd431)

522 + refactor run_receive_hook()

523 (this branch is used by jc/signed-push and jc/signed-push-3.)

524

525 Just to make it easier to run a hook that reads from its standard input.

526 +Will merge to "master" as the first wave.

527

528 * jk/for-each-ref (2011-09-08) 5 commits

529 (merged to 'next' on 2011-09-14 at 36ed515)

@@ -375,17 +533,20 @@ Just to make it easier to run a hook that reads from its standard input.

533 + t6300: add more body-parsing tests

534 + t7004: factor out gpg setup

535

536 +Will merge to "master" as the first wave.

537 +

538 * wh/normalize-alt-odb-path (2011-09-07) 1 commit

539 (merged to 'next' on 2011-09-14 at 96f722b)

540 + sha1_file: normalize alt_odb path before comparing and storing

541

542 +Will merge to "master" as the first wave.

543 +

544 * fk/use-kwset-pickaxe-grep-f (2011-09-11) 2 commits

545 (merged to 'next' on 2011-09-14 at 436d858)

546 + obstack.c: Fix some sparse warnings

547 + sparse: Fix an "Using plain integer as NULL pointer" warning

548

387 -In general we would prefer to see these fixed at the upstream first, but

388 -we have essentially forked from them at their last GPLv2 versions...

549 +Will merge to "master" as the first wave.

550

551 * jc/make-static (2011-09-14) 4 commits

552 (merged to 'next' on 2011-09-14 at c5943ff)

@@ -395,12 +556,14 @@ we have essentially forked from them at their last GPLv2 versions...

556 + vcs-svn: remove unused functions and make some static

557 + make-static: master

558

398 -With a few fix-ups; probably needs to be ejected after 1.7.7 happens.

559 +Will discard (or at least kick it back to 'pu').

560

561 * rj/quietly-create-dep-dir (2011-09-11) 1 commit

562 (merged to 'next' on 2011-09-12 at 93d1c6b)

563 + Makefile: Make dependency directory creation less noisy

564

565 +Will merge to "master" as the first wave.

566 +

567 * mz/remote-rename (2011-09-11) 4 commits

568 (merged to 'next' on 2011-09-26 at 5e64f68)

569 + remote: only update remote-tracking branch if updating refspec

@@ -408,18 +571,21 @@ With a few fix-ups; probably needs to be ejected after 1.7.7 happens.

571 + remote: "rename o foo" should not rename ref "origin/bar"

572 + remote: write correct fetch spec when renaming remote 'remote'

573

574 +Will merge to "master" as the second wave.

575 +

576 * cb/common-prefix-unification (2011-09-12) 3 commits

577 (merged to 'next' on 2011-09-14 at 24f571f)

578 + rename pathspec_prefix() to common_prefix() and move to dir.[ch]

579 + consolidate pathspec_prefix and common_prefix

580 + remove prefix argument from pathspec_prefix

581

582 +Will merge to "master" as the second wave.

583 +

584 * cb/send-email-help (2011-09-12) 1 commit

585 (merged to 'next' on 2011-09-14 at ae71999)

586 + send-email: add option -h

587

421 -A separate set of patches to remove the hidden fully-spelled "help" from

422 -other commands would be nice to have as companion patches as well.

588 +Will merge to "master" as the first wave.

589

590 * jc/fetch-pack-fsck-objects (2011-09-04) 3 commits

591 (merged to 'next' on 2011-09-12 at a031347)

@@ -431,6 +597,8 @@ We had an option to verify the sent objects before accepting a push but

597 lacked the corresponding option when fetching. In the light of the recent

598 k.org incident, a change like this would be a good addition.

599

600 +Will merge to "master" as the first wave.

601 +

602 * jc/fetch-verify (2011-09-01) 3 commits

603 (merged to 'next' on 2011-09-12 at 3f491ab)

604 + fetch: verify we have everything we need before updating our ref

@@ -442,6 +610,8 @@ During a fetch, we verify that the pack stream is self consistent,

610 but did not verify that the refs that are updated are consistent with

611 objects contained in the packstream, and this adds such a check.

612

613 +Will merge to "master" as the first wave.

614 +

615 * jc/receive-verify (2011-09-09) 6 commits

616 (merged to 'next' on 2011-09-12 at 856de78)

617 + receive-pack: check connectivity before concluding "git push"

@@ -456,11 +626,15 @@ While accepting a push, we verify that the pack stream is self consistent,

626 but did not verify that the refs the push updates are consistent with

627 objects contained in the packstream, and this adds such a check.

628

629 +Will merge to "master" as the third wave.

630 +

631 * jn/maint-http-error-message (2011-09-06) 2 commits

632 (merged to 'next' on 2011-09-12 at a843f03)

633 + http: avoid empty error messages for some curl errors

634 + http: remove extra newline in error message

635

636 +Will merge to "master" as the second wave.

637 +

638 * bk/ancestry-path (2011-09-15) 4 commits

639 (merged to 'next' on 2011-09-15 at aa64d04)

640 + t6019: avoid refname collision on case-insensitive systems

@@ -470,6 +644,8 @@ objects contained in the packstream, and this adds such a check.

644 + rev-list: Demonstrate breakage with --ancestry-path --all

645 (this branch is used by jc/request-pull-show-head-4.)

646

647 +Will merge to "master" as the first wave.

648 +

649 * mg/branch-list (2011-09-13) 7 commits

650 (merged to 'next' on 2011-09-14 at 6610a2e)

651 + t3200: clean up checks for file existence

@@ -482,11 +658,15 @@ objects contained in the packstream, and this adds such a check.

658 + git-tag: introduce long forms for the options

659 + t6040: test branch -vv

660

661 +Will merge to "master" as the first wave.

662 +

663 * mm/rebase-i-exec-edit (2011-08-26) 2 commits

664 (merged to 'next' on 2011-09-02 at e75b1b9)

665 + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree

666 + rebase -i: clean error message for --continue after failed exec

667

668 +Will merge to "master" as the first wave.

669 +

670 * mm/mediawiki-as-a-remote (2011-09-28) 6 commits

671 (merged to 'next' on 2011-09-28 at a1c9ae5)

672 + git-remote-mediawiki: allow a domain to be set for authentication

@@ -498,7 +678,7 @@ objects contained in the packstream, and this adds such a check.

678 + git-remote-mediawiki: allow push to set MediaWiki metadata

679 + Add a remote helper to interact with mediawiki (fetch & push)

680

501 -Fun.

681 +Will merge to "master" as the first wave.

682

683 * bc/unstash-clean-crufts (2011-08-27) 4 commits

684 (merged to 'next' on 2011-09-02 at 7bfd66f)

@@ -507,29 +687,34 @@ Fun.

687 + git-stash.sh: fix typo in error message

688 + t/t3905: use the name 'actual' for test output, swap arguments to test_cmp

689

510 -* da/make-auto-header-dependencies (2011-08-30) 1 commit

511 - (merged to 'next' on 2011-09-02 at e04a4af)

512 - + Makefile: Improve compiler header dependency check

513 - (this branch uses fk/make-auto-header-dependencies.)

690 +Will merge to "master" as the first wave.

691

692 * gb/am-hg-patch (2011-08-29) 1 commit

693 (merged to 'next' on 2011-09-02 at 3edfe4c)

694 + am: preliminary support for hg patches

695

696 +Will merge to "master" as the first wave.

697 +

698 * jc/diff-index-unpack (2011-08-29) 3 commits

699 (merged to 'next' on 2011-09-02 at 4206bd9)

700 + diff-index: pass pathspec down to unpack-trees machinery

701 + unpack-trees: allow pruning with pathspec

702 + traverse_trees(): allow pruning with pathspec

703

704 +Will merge to "master" as the first wave.

705 +

706 * nm/grep-object-sha1-lock (2011-08-30) 1 commit

707 (merged to 'next' on 2011-09-02 at 336f57d)

708 + grep: Fix race condition in delta_base_cache

709

710 +Will merge to "master" as the first wave.

711 +

712 * tr/mergetool-valgrind (2011-08-30) 1 commit

713 (merged to 'next' on 2011-09-02 at f5f2c61)

714 + Symlink mergetools scriptlets into valgrind wrappers

715

716 +Will merge to "master" as the first wave.

717 +

718 * fg/submodule-auto-push (2011-09-11) 2 commits

719 (merged to 'next' on 2011-09-11 at 3fc86f7)

720 + submodule.c: make two functions static

@@ -540,6 +725,8 @@ Fun.

725 What the topic aims to achieve may make sense, but the implementation

726 looked somewhat suboptimal.

727

728 +Will kick back to "pu" at least tentatively.

729 +

730 * jc/traverse-commit-list (2011-08-22) 3 commits

731 (merged to 'next' on 2011-08-24 at df50dd7)

732 + revision.c: update show_object_with_name() without using malloc()

@@ -547,11 +734,22 @@ looked somewhat suboptimal.

734 + rev-list: fix finish_object() call

735 (this branch is used by jc/fetch-verify and jc/receive-verify.)

736

737 +Will merge to "master" as the first wave.

738 +

739 * fk/make-auto-header-dependencies (2011-08-18) 1 commit

740 (merged to 'next' on 2011-08-24 at 3da2c25)

741 + Makefile: Use computed header dependencies if the compiler supports it

742 (this branch is used by da/make-auto-header-dependencies.)

743

744 +Will merge to "master" as the first wave.

745 +

746 +* da/make-auto-header-dependencies (2011-08-30) 1 commit

747 + (merged to 'next' on 2011-09-02 at e04a4af)

748 + + Makefile: Improve compiler header dependency check

749 + (this branch uses fk/make-auto-header-dependencies.)

750 +

751 +Will merge to "master" as the first wave.

752 +

753 * mh/iterate-refs (2011-09-11) 7 commits

754 (merged to 'next' on 2011-09-27 at c289699)

755 + refs.c: make create_cached_refs() static

@@ -562,16 +760,15 @@ looked somewhat suboptimal.

760 + Access reference caches only through new function get_cached_refs()

761 + Extract a function clear_cached_refs()

762

565 -I did not see anything fundamentally wrong with this series, but it was

566 -unclear what the benefit of these changes are. If the series were to read

567 -parts of the ref hierarchy (like refs/heads/) lazily, the story would

568 -have been different, though.

763 +Will merge to "master" as the second wave.

764

765 * hv/submodule-update-none (2011-08-11) 2 commits

766 (merged to 'next' on 2011-08-24 at 5302fc1)

767 + add update 'none' flag to disable update of submodule by default

768 + submodule: move update configuration variable further up

769

770 +Will merge to "master" as the second wave.

771 +

772 * jc/lookup-object-hash (2011-08-11) 6 commits

773 (merged to 'next' on 2011-08-24 at 5825411)

774 + object hash: replace linear probing with 4-way cuckoo hashing

@@ -585,14 +782,14 @@ I do not think there is anything fundamentally wrong with this series, but

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

783 particular workload. Will keep it in 'next' at least for one cycle.

784

785 +Will kick back to 'pu'.

786 +

787 * fg/submodule-git-file-git-dir (2011-08-22) 2 commits

788 (merged to 'next' on 2011-08-23 at 762194e)

789 + Move git-dir for submodules

790 + rev-parse: add option --resolve-git-dir <path>

791

593 -I do not think there is anything fundamentally wrong with this series, but

594 -the risk of breakage outweighs any benefit for having this new

595 -feature. Will keep it in 'next' at least for one cycle.

792 +Will merge to "master" as the second wave.

793

794 * jk/http-auth-keyring (2011-09-28) 22 commits

795 (merged to 'next' on 2011-09-28 at 65ce6c2)

@@ -624,6 +821,8 @@ feature. Will keep it in 'next' at least for one cycle.

821 + url: decode buffers that are not NUL-terminated

822 (this branch is tangled with js/cred-macos-x-keychain-2.)

823

824 +Will kick back to 'pu'.

825 +

826 * rr/revert-cherry-pick-continue (2011-09-11) 19 commits

827 (merged to 'next' on 2011-09-11 at 7d78054)

828 + builtin/revert.c: make commit_list_append() static

@@ -647,53 +846,7 @@ feature. Will keep it in 'next' at least for one cycle.

846 + config: Introduce functions to write non-standard file

847 + advice: Introduce error_resolve_conflict

848

650 ---------------------------------------------------

651 -[Discarded]

652 -

653 -* js/cred-macos-x-keychain (2011-09-11) 15 commits

654 - (merged to 'next' on 2011-09-12 at 8d17f94)

655 - + contrib: add a credential helper for Mac OS X's keychain

656 - (merged to 'next' on 2011-09-11 at 491ce6a)

657 - + credentials: make credential_fill_gently() static

658 - (merged to 'next' on 2011-08-03 at b06e80e)

659 - + credentials: add "getpass" helper

660 - + credentials: add "store" helper

661 - + credentials: add "cache" helper

662 - + docs: end-user documentation for the credential subsystem

663 - + http: use hostname in credential description

664 - + allow the user to configure credential helpers

665 - + look for credentials in config before prompting

666 - + http: use credential API to get passwords

667 - + introduce credentials API

668 - + http: retry authentication failures for all http requests

669 - + remote-curl: don't retry auth failures with dumb protocol

670 - + improve httpd auth tests

671 - + url: decode buffers that are not NUL-terminated

672 - (this branch is tangled with jk/http-auth-keyring and js/cred-macos-x-keychain-2.)

673 -

674 -Reverted out of 'next'.

675 -

676 -* jc/reflog-walk-use-only-nsha1 (2011-09-13) 4 commits

677 - . (baloon) teach reflog-walk to look at only new-sha1 field

678 - + environment.c: have_git_dir() has users on Cygwin

679 - (merged to 'next' on 2011-09-11 at 2acb0af)

680 - + vcs-svn: remove unused functions and make some static

681 - + make-static: master

682 - (this branch is tangled with jc/make-static.)

683 -

684 -* hw/maint-abspath-cwd-limit (2011-09-21) 3 commits

685 - (merged to 'next' on 2011-09-21 at 210cf9a)

686 - + Revert 622fea4 (abspath.c: increase array size of cwd variable)

687 - (merged to 'next' on 2011-09-19 at 7d5e921)

688 - + abspath.c: increase array size of cwd variable to PATH_MAX

689 - + path.c: increase array size of cwd variable to PATH_MAX

690 -

691 -Reverted out of 'next'.

692 -

693 -* jc/request-pull-show-head (2011-09-13) 2 commits

694 - (merged to 'next' on 2011-09-13 at c82fb3a)

695 - + Revert "State what commit to expect in request-pull"

696 - (merged to 'next' on 2011-09-12 at c1c7b73)

697 - + State what commit to expect in request-pull

849 +Will merge to "master" as the first wave.

850

699 -Reverted out of 'next'.

851 +Note that generalized sequencer still needs a bit more thought (see the

852 +summary by Ram at $gmane/179613).

What's cooking (2001/10 #01)