8da898b146 · matheusbsbs/matheus-bagliano

@@ -1,28 +1,22 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Feb 2014, #06; Wed, 19)

3 +Subject: What's cooking in git.git (Feb 2014, #07; Tue, 25)

4 X-master-at: 5f95c9f850b19b368c43ae399cc831b17a26a5ac

5 -X-next-at: dc9e3eb950a3fce88e01983170c37200a6d34d8f

5 +X-next-at: 473e14350eeb6a6a233c48229514a6c604e92ae2

6

7 -What's cooking in git.git (Feb 2014, #06; Wed, 19)

7 +What's cooking in git.git (Feb 2014, #07; Tue, 25)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -The tip of 'next' hasn't been rewound, and none of the topics that

15 -have been cooking there has graduated, yet. Hopefully that can

16 -start happening to open the new development cycle later this week,

17 -at which time I'll be also updating tinyurl.com/gitCal and also

18 -annotate the topics listed in this file with the course of action

19 -(i.e. if you run "Meta/cook -w", many are listed as Undecided right

20 -now, which I need to fix).

21 -

22 -There are many stalled topics; I think some of them do deserve to be

23 -discarded as marked, but others do solve (or at least attempt to)

24 -real issues and it would be nice to see people help unblock them

25 -(one reason for blockage would be that they introduce regressions).

14 +The tip of 'next' has been rewound. There are healthy number of

15 +topics in there that have been well-cooked during the 1.9.0

16 +development cycle that can graduate to 'master' (see the announce in

17 +http://article.gmane.org/gmane.comp.version-control.git/242658).

18 +After they are merged to 'master', I'm planning to go back to the

19 +list archive to pick up patches I may have missed in the meantime.

20

21 You can find the changes described here in the integration branches

22 of the repositories listed at

@@ -32,106 +26,103 @@ of the repositories listed at

26 --------------------------------------------------

27 [New Topics]

28

35 -* bc/blame-crlf-test (2014-02-18) 1 commit

36 - - blame: add a failing test for a CRLF issue.

29 +* ak/gitweb-fit-image (2014-02-20) 1 commit

30 + - gitweb: Avoid overflowing page body frame with large images

31

32 + Instead of allowing an <img> to be shown in whatever size, force

33 + scaling it to fit on the page with max-height/max-width css style

34 + attributes.

35

39 -* jk/http-no-curl-easy (2014-02-18) 1 commit

40 - - http: never use curl_easy_perform

36 + Will merge to 'next'.

37

38

43 -* jk/janitorial-fixes (2014-02-18) 5 commits

44 - - open_istream(): do not dereference NULL in the error case

45 - - builtin/mv: don't use memory after free

46 - - utf8: use correct type for values in interval table

47 - - utf8: fix iconv error detection

48 - - notes-utils: handle boolean notes.rewritemode correctly

39 +* da/difftool-git-files (2014-02-24) 1 commit

40 + - difftool: support repositories with .git-files

41

42 + "git difftool" misbehaved when the repository is bound to the

43 + working tree with the ".git file" mechanism, where a textual

44 + file ".git" tells us where it is.

45

51 -* ks/config-file-stdin (2014-02-18) 4 commits

52 - - config: teach "git config --file -" to read from the standard input

53 - - config: change git_config_with_options() interface

54 - - builtin/config.c: rename check_blob_write() -> check_write()

55 - - config: disallow relative include paths from blobs

46 + Will merge to 'next'.

47

48

58 -* lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit

59 - - git-contacts: do not fail parsing of good diffs

49 +* jk/commit-dates-parsing-fix (2014-02-24) 5 commits

50 + - log: do not segfault on gmtime errors

51 + - log: handle integer overflow in timestamps

52 + - date: check date overflow against time_t

53 + - fsck: report integer overflow in author timestamps

54 + - t4212: test bogus timestamps with git-log

55

56 + Will merge to 'next'.

57

62 -* mh/replace-refs-variable-rename (2014-02-18) 1 commit

63 - - Rename read_replace_refs to check_replace_refs

58

59 +* jk/diff-filespec-cleanup (2014-02-24) 1 commit

60 + - diffcore.h: be explicit about the signedness of is_binary

61

66 -* nd/commit-editor-cleanup (2014-02-18) 3 commits

67 - - commit: add --cleanup=scissors

68 - - wt-status.c: move cut-line print code out to wt_status_add_cut_line

69 - - wt-status.c: make cut_line[] const to shrink .data section a bit

62 + Will merge to 'next' and then to 'master' and 'maint'.

63

64

72 -* nd/no-more-fnmatch (2014-02-18) 4 commits

73 - - Actually remove compat fnmatch source code

74 - - Stop using fnmatch (either native or compat)

75 - - Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"

76 - - Use wildmatch() directly without fnmatch() wrapper

65 +* jk/remote-pushremote-config-reading (2014-02-24) 1 commit

66 + - remote: handle pushremote config in any order

67

68 + Will merge to 'next'.

69

79 -* nd/reset-setup-worktree (2014-02-18) 1 commit

80 - - reset: optionally setup worktree and refresh index on --mixed

70

71 +* jk/repack-pack-keep-objects (2014-02-24) 1 commit

72 + - repack: add `repack.packKeepObjects` config var

73 + (this branch uses jk/pack-bitmap.)

74

83 -* po/git-help-user-manual (2014-02-18) 1 commit

84 - - Provide a 'git help user-manual' route to the docbook

75 + Names?

76

77

87 -* rt/links-for-asciidoctor (2014-02-18) 1 commit

88 - - Fix documentation AsciiDoc links for external urls

78 +* jm/stash-doc-k-for-keep (2014-02-24) 1 commit

79 + - stash doc: mention short form -k in save description

80

81 + Will merge to 'next'.

82

91 -* tg/index-v4-format (2014-02-18) 5 commits

92 - - read-cache: add index.version config variable

93 - - FIXUP

94 - - test-lib: allow setting the index format version

95 - - FIXUP

96 - - introduce GIT_INDEX_VERSION environment variable

83

84 +* jn/am-doc-hooks (2014-02-24) 1 commit

85 + - am doc: add a pointer to relevant hooks

86

99 -* tr/diff-submodule-no-reuse-worktree (2014-02-18) 2 commits

100 - - diff: refactor reuse_worktree_file()

101 - - diff: do not reuse_worktree_file for submodules

87 + Will merge to 'next'.

88

89

104 -* nd/multiple-work-trees (2014-02-19) 26 commits

105 - - FIXUP???

106 - - gc: support prune --repos

107 - - prune: strategies for linked checkouts

108 - - checkout: detach if the branch is already checked out elsewhere

109 - - checkout: clean up half-prepared directories in --to mode

110 - - checkout: support checking out into a new working directory

111 - - use new wrapper write_file() for simple file writing

112 - - wrapper.c: wrapper to open a file, fprintf then close

113 - - setup.c: support multi-checkout repo setup

114 - - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

115 - - setup.c: convert check_repository_format_gently to use strbuf

116 - - setup.c: detect $GIT_COMMON_DIR in is_git_directory()

117 - - setup.c: convert is_git_directory() to use strbuf

118 - - git-stash: avoid hardcoding $GIT_DIR/logs/....

119 - - *.sh: avoid hardcoding $GIT_DIR/hooks/...

120 - - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

121 - - Add new environment variable $GIT_COMMON_DIR

122 - - commit: use SEQ_DIR instead of hardcoding "sequencer"

123 - - fast-import: use git_path() for accessing .git dir instead of get_git_dir()

124 - - reflog: avoid constructing .lock path with git_path

125 - - *.sh: respect $GIT_INDEX_FILE

126 - - Make git_path() aware of file relocation in $GIT_DIR

127 - - path.c: group git_path(), git_pathdup() and strbuf_git_path() together

128 - - path.c: rename vsnpath() to do_git_path()

129 - - Convert git_snpath() to strbuf_git_path()

130 - - path.c: make get_pathname() return strbuf instead of static buffer

90 +* mh/object-code-cleanup (2014-02-24) 4 commits

91 + - sha1_file.c: document a bunch of functions defined in the file

92 + - sha1_file_name(): declare to return a const string

93 + - find_pack_entry(): document last_found_pack

94 + - replace_object: use struct members instead of an array

95 +

96 + Will merge to 'next'.

97 +

98 +

99 +* nd/i18n-progress (2014-02-24) 1 commit

100 + - i18n: mark all progress lines for translation

101 +

102 + Will merge to 'next'.

103 +

104 +

105 +* nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit

106 + - sha1_file: fix delta_stack memory leak in unpack_entry

107 +

108 + Will merge to 'next' and then to 'master' and 'maint'.

109 +

110 +

111 +* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit

112 + - demonstrate git-commit --dry-run exit code behaviour

113

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

115 [Stalled]

116

117 +* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit

118 + - hashmap.h: make sure map entries are tightly packed

119 + (this branch uses kb/fast-hashmap.)

120 +

121 + I am inclined to drop this; an alternative is to replace it with

122 + the "more portable" one that uses #pragma, which I am willing to

123 + try doing so on 'pu', though.

124 +

125 +

126 * po/everyday-doc (2014-01-27) 1 commit

127 - Make 'git help everyday' work

128

@@ -192,24 +183,6 @@ of the repositories listed at

183 This was primarily a RFH ($gmane/239580).

184

185

195 -* fc/transport-helper-fixes (2013-12-09) 6 commits

196 - - remote-bzr: support the new 'force' option

197 - - test-hg.sh: tests are now expected to pass

198 - - transport-helper: check for 'forced update' message

199 - - transport-helper: add 'force' to 'export' helpers

200 - - transport-helper: don't update refs in dry-run

201 - - transport-helper: mismerge fix

202 -

203 - Updates transport-helper, fast-import and fast-export to allow the

204 - ref mapping and ref deletion in a way similar to the natively

205 - supported transports.

206 -

207 - Reported to break t5541, and has been stalled for a while without

208 - fixes.

209 -

210 - Will discard.

211 -

212 -

186 * fc/completion (2013-12-09) 1 commit

187 - completion: fix completion of certain aliases

188

@@ -252,38 +225,6 @@ of the repositories listed at

225 Waiting for a reroll.

226

227

255 -* kb/fast-hashmap (2014-01-03) 19 commits

256 - - hashmap.h: make sure map entries are tightly packed

257 - (merged to 'next' on 2014-01-03 at dc85001)

258 - + name-hash: retire unused index_name_exists()

259 - + hashmap.h: Use 'unsigned int' for hash-codes everywhere

260 - (merged to 'next' on 2013-12-16 at bff99b1)

261 - + Drop unnecessary #includes from test-hashmap

262 - + Add test-hashmap to .gitignore

263 - (merged to 'next' on 2013-12-06 at f90be3d)

264 - + read-cache.c: fix memory leaks caused by removed cache entries

265 - + builtin/update-index.c: cleanup update_one

266 - + fix 'git update-index --verbose --again' output

267 - + remove old hash.[ch] implementation

268 - + name-hash.c: remove cache entries instead of marking them CE_UNHASHED

269 - + name-hash.c: use new hash map implementation for cache entries

270 - + name-hash.c: remove unreferenced directory entries

271 - + name-hash.c: use new hash map implementation for directories

272 - + diffcore-rename.c: use new hash map implementation

273 - + diffcore-rename.c: simplify finding exact renames

274 - + diffcore-rename.c: move code around to prepare for the next patch

275 - + buitin/describe.c: use new hash map implementation

276 - + add a hashtable implementation that supports O(1) removal

277 - + submodule: don't access the .gitmodules cache entry after removing it

278 -

279 - Improvements to our hash table to get it to meet the needs of the

280 - msysgit fscache project, with some nice performance improvements.

281 -

282 - The tip one does not seem to have reached concensus (yet).

283 -

284 - Will hold.

285 -

286 -

228 * jc/create-directories-microopt (2013-11-11) 1 commit

229 - checkout: most of the time we have good leading directories

230

@@ -375,7 +316,7 @@ of the repositories listed at

316 The changes themselves are probably good, but it is unclear what

317 basic setting needs to be read for which exact operation.

318

378 - Waiting for clarification.

319 + Will discard, tired of waiting for clarification.

320 $gmane/228294

321

322

@@ -416,7 +357,194 @@ of the repositories listed at

357 --------------------------------------------------

358 [Cooking]

359

419 -* ks/tree-diff-nway (2014-02-14) 2 commits

360 +* fc/transport-helper-fixes (2014-02-24) 7 commits

361 + - remote-bzr: support the new 'force' option

362 + - test-hg.sh: tests are now expected to pass

363 + - transport-helper.c: do not overwrite forced bit

364 + - transport-helper: check for 'forced update' message

365 + - transport-helper: add 'force' to 'export' helpers

366 + - transport-helper: don't update refs in dry-run

367 + - transport-helper: mismerge fix

368 +

369 + Updates transport-helper, fast-import and fast-export to allow the

370 + ref mapping and ref deletion in a way similar to the natively

371 + supported transports.

372 +

373 + Will merge to 'next'.

374 +

375 +

376 +* kb/fast-hashmap (2014-02-24) 18 commits

377 + (merged to 'next' on 2014-02-25 at 88a98e6)

378 + + name-hash: retire unused index_name_exists()

379 + + hashmap.h: use 'unsigned int' for hash-codes everywhere

380 + + test-hashmap.c: drop unnecessary #includes

381 + + .gitignore: test-hashmap is a generated file

382 + + read-cache.c: fix memory leaks caused by removed cache entries

383 + + builtin/update-index.c: cleanup update_one

384 + + fix 'git update-index --verbose --again' output

385 + + remove old hash.[ch] implementation

386 + + name-hash.c: remove cache entries instead of marking them CE_UNHASHED

387 + + name-hash.c: use new hash map implementation for cache entries

388 + + name-hash.c: remove unreferenced directory entries

389 + + name-hash.c: use new hash map implementation for directories

390 + + diffcore-rename.c: use new hash map implementation

391 + + diffcore-rename.c: simplify finding exact renames

392 + + diffcore-rename.c: move code around to prepare for the next patch

393 + + buitin/describe.c: use new hash map implementation

394 + + add a hashtable implementation that supports O(1) removal

395 + + submodule: don't access the .gitmodules cache entry after removing it

396 + (this branch is used by kb/fast-hashmap-pack-struct.)

397 +

398 + Originally merged to 'next' on 2014-01-03

399 +

400 + Improvements to our hash table to get it to meet the needs of the

401 + msysgit fscache project, with some nice performance improvements.

402 +

403 + Will merge to 'master'.

404 +

405 +

406 +* bc/blame-crlf-test (2014-02-18) 1 commit

407 + - blame: add a failing test for a CRLF issue.

408 +

409 + I have a feeling that a fix for this should be fairly isolated and

410 + trivial (it should be just the matter of paying attention to the

411 + crlf settings when synthesizing the fake commit)---perhaps somebody

412 + can squash in a fix to this?

413 +

414 +

415 +* jk/http-no-curl-easy (2014-02-18) 1 commit

416 + - http: never use curl_easy_perform

417 +

418 + Avoid use of the curl-easy family of functions, which interferes

419 + with connection reuse in a negative way.

420 +

421 + Will merge to 'next'.

422 +

423 +

424 +* jk/janitorial-fixes (2014-02-18) 5 commits

425 + - open_istream(): do not dereference NULL in the error case

426 + - builtin/mv: don't use memory after free

427 + - utf8: use correct type for values in interval table

428 + - utf8: fix iconv error detection

429 + - notes-utils: handle boolean notes.rewritemode correctly

430 +

431 + Will merge to 'next'.

432 +

433 +

434 +* ks/config-file-stdin (2014-02-18) 4 commits

435 + - config: teach "git config --file -" to read from the standard input

436 + - config: change git_config_with_options() interface

437 + - builtin/config.c: rename check_blob_write() -> check_write()

438 + - config: disallow relative include paths from blobs

439 +

440 + Will merge to 'next'.

441 +

442 +

443 +* lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit

444 + - git-contacts: do not fail parsing of good diffs

445 +

446 + Will merge to 'next'.

447 +

448 +

449 +* mh/replace-refs-variable-rename (2014-02-20) 1 commit

450 + - rename read_replace_refs to check_replace_refs

451 +

452 + Will merge to 'next'.

453 +

454 +

455 +* nd/commit-editor-cleanup (2014-02-25) 3 commits

456 + - commit: add --cleanup=scissors

457 + - wt-status.c: move cut-line print code out to wt_status_add_cut_line

458 + - wt-status.c: make cut_line[] const to shrink .data section a bit

459 +

460 + "git commit --cleanup=<mode>" learned a new mode, scissors.

461 +

462 +

463 +* nd/no-more-fnmatch (2014-02-20) 4 commits

464 + - actually remove compat fnmatch source code

465 + - stop using fnmatch (either native or compat)

466 + - Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"

467 + - use wildmatch() directly without fnmatch() wrapper

468 +

469 + We started using wildmatch() in place of fnmatch(3); complete the

470 + process and stop using fnmatch(3).

471 +

472 + Will merge to 'next'.

473 +

474 +

475 +* nd/reset-setup-worktree (2014-02-18) 1 commit

476 + - reset: optionally setup worktree and refresh index on --mixed

477 +

478 + "git reset" needs to refresh the index when working in a working

479 + tree (it can also be used to match the index to the HEAD in an

480 + otherwise bare repository), but it failed to set up the working

481 + tree properly, causing GIT_WORK_TREE to be ignored.

482 +

483 + Will merge to 'next'.

484 +

485 +

486 +* po/git-help-user-manual (2014-02-18) 1 commit

487 + - Provide a 'git help user-manual' route to the docbook

488 +

489 + I am not sure if this is even needed.

490 +

491 +

492 +* rt/links-for-asciidoctor (2014-02-20) 1 commit

493 + - Documentation: fix documentation AsciiDoc links for external urls

494 +

495 + Will merge to 'next'.

496 +

497 +

498 +* tg/index-v4-format (2014-02-24) 3 commits

499 + - read-cache: add index.version config variable

500 + - test-lib: allow setting the index format version

501 + - introduce GIT_INDEX_VERSION environment variable

502 +

503 + Will merge to 'next'.

504 +

505 +

506 +* tr/diff-submodule-no-reuse-worktree (2014-02-18) 1 commit

507 + - diff: do not reuse_worktree_file for submodules

508 +

509 + "git diff --external-diff" incorrectly fed the submodule directory

510 + in the working tree to the external diff driver when it knew it is

511 + the same as one of the versions being compared.

512 +

513 + Will merge to 'next'.

514 +

515 +

516 +* nd/multiple-work-trees (2014-02-19) 26 commits

517 + - FIXUP???

518 + - gc: support prune --repos

519 + - prune: strategies for linked checkouts

520 + - checkout: detach if the branch is already checked out elsewhere

521 + - checkout: clean up half-prepared directories in --to mode

522 + - checkout: support checking out into a new working directory

523 + - use new wrapper write_file() for simple file writing

524 + - wrapper.c: wrapper to open a file, fprintf then close

525 + - setup.c: support multi-checkout repo setup

526 + - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

527 + - setup.c: convert check_repository_format_gently to use strbuf

528 + - setup.c: detect $GIT_COMMON_DIR in is_git_directory()

529 + - setup.c: convert is_git_directory() to use strbuf

530 + - git-stash: avoid hardcoding $GIT_DIR/logs/....

531 + - *.sh: avoid hardcoding $GIT_DIR/hooks/...

532 + - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

533 + - Add new environment variable $GIT_COMMON_DIR

534 + - commit: use SEQ_DIR instead of hardcoding "sequencer"

535 + - fast-import: use git_path() for accessing .git dir instead of get_git_dir()

536 + - reflog: avoid constructing .lock path with git_path

537 + - *.sh: respect $GIT_INDEX_FILE

538 + - Make git_path() aware of file relocation in $GIT_DIR

539 + - path.c: group git_path(), git_pathdup() and strbuf_git_path() together

540 + - path.c: rename vsnpath() to do_git_path()

541 + - Convert git_snpath() to strbuf_git_path()

542 + - path.c: make get_pathname() return strbuf instead of static buffer

543 +

544 + The tip commit needs to be dropped; the series needs a serious review.

545 +

546 +

547 +* ks/tree-diff-nway (2014-02-24) 2 commits

548 - combine-diff: speed it up, by using multiparent diff

549 - tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

550 (this branch uses ks/combine-diff, ks/tree-diff-more and ks/tree-diff-walk.)

@@ -431,37 +559,46 @@ of the repositories listed at

559 Promising, but unfortunately the implementation seems a bit too

560 unportable for such a core part of the system.

561

562 + Reroll is there, but have run out of time to pick it up this round.

563 +

564

565 * al/docs (2014-02-11) 4 commits

436 - (merged to 'next' on 2014-02-13 at 4157cf3)

566 + (merged to 'next' on 2014-02-25 at 0c1a734)

567 + docs/git-blame: explain more clearly the example pickaxe use

568 + docs/git-clone: clarify use of --no-hardlinks option

569 + docs/git-remote: capitalize first word of initial blurb

570 + docs/merge-strategies: remove hyphen from mis-merges

571

572 + Originally merged to 'next' on 2014-02-13

573 +

574 A handful of documentation updates, all trivially harmless.

575

444 - Will cook in 'next'.

576 + Will merge to 'master'.

577

578

579 * jk/test-ports (2014-02-10) 2 commits

448 - (merged to 'next' on 2014-02-13 at cbedcb2)

580 + (merged to 'next' on 2014-02-25 at 86ce2e4)

581 + tests: auto-set git-daemon port

582 + tests: auto-set LIB_HTTPD_PORT from test name

583 (this branch is tangled with nd/http-fetch-shallow-fix.)

584

585 + Originally merged to 'next' on 2014-02-13

586 +

587 Avoid having to assign port number to be used in tests manually.

588

455 - Will cook in 'next'.

589 + Will merge to 'master'.

590

591

592 * nd/daemonize-gc (2014-02-10) 2 commits

459 - - gc: config option for running --auto in background

460 - - daemon: move daemonize() to libgit.a

593 + (merged to 'next' on 2014-02-25 at f592335)

594 + + gc: config option for running --auto in background

595 + + daemon: move daemonize() to libgit.a

596 +

597 + Originally merged to 'next' on 2014-02-20

598

599 Allow running "gc --auto" in the background.

600

464 - Will merge to 'next'.

601 + Will merge to 'master'.

602

603

604 * nd/gitignore-trailing-whitespace (2014-02-10) 2 commits

@@ -471,16 +608,26 @@ of the repositories listed at

608 Warn and then ignore trailing whitespaces in .gitignore files,

609 unless they are quoted for fnmatch(3), e.g. "path\ ".

610

611 + Will merge to 'next'.

612 +

613

614 * nd/log-show-linear-break (2014-02-10) 1 commit

615 - log: add --show-linear-break to help see non-linear history

616

617 + Attempts to show where a single-strand-of-pearls break in "git log"

618 + output.

619 +

620 + "git log --no-merges --show-linear-break" does not seem to work

621 + well (tried on range "pu~10..pu" or something like that).

622 +

623

624 * ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit

625 - completion: teach --recurse-submodules to fetch, pull and push

626

627 + Will merge to 'next'.

628 +

629

483 -* ks/tree-diff-more (2014-02-13) 15 commits

630 +* ks/tree-diff-more (2014-02-24) 15 commits

631 - tree-diff: reuse base str(buf) memory on sub-tree recursion

632 - tree-diff: no need to call "full" diff_tree_sha1 from show_path()

633 - tree-diff: rework diff_tree interface to be sha1 based

@@ -498,17 +645,28 @@ of the repositories listed at

645 - combine-diff: move show_log_first logic/action out of paths scanning

646 (this branch is used by ks/tree-diff-nway; uses ks/combine-diff and ks/tree-diff-walk.)

647

648 + Code refactoring.

649

502 -* jh/note-trees-record-blobs (2014-02-12) 1 commit

503 - - notes: Disallow reusing non-blob as a note object

650 + Will merge to 'next'.

651 +

652 +

653 +* jh/note-trees-record-blobs (2014-02-20) 1 commit

654 + - notes: disallow reusing non-blob as a note object

655 +

656 + "git notes -C <blob>" should not take an object that is not a blob.

657 +

658 + Will merge to 'next'.

659

660

661 * jk/run-network-tests-by-default (2014-02-14) 1 commit

507 - - tests: turn on network daemon tests by default

662 + (merged to 'next' on 2014-02-25 at 62a8ad0)

663 + + tests: turn on network daemon tests by default

664 +

665 + Originally merged to 'next' on 2014-02-20

666

667 Teach "make test" to run networking tests when possible by default.

668

511 - Will merge to and then cook in 'next'.

669 + Will merge to 'master'.

670

671

672 * jc/check-attr-honor-working-tree (2014-02-06) 2 commits

@@ -526,9 +684,11 @@ of the repositories listed at

684 want to also fix "check-ignore", which refuses to work in a bare

685 repository, to also operate in a bare one.

686

687 + Will merge to 'next'.

688 +

689

690 * nd/http-fetch-shallow-fix (2014-02-13) 7 commits

531 - (merged to 'next' on 2014-02-13 at 7ec3c2f)

691 + (merged to 'next' on 2014-02-25 at ad4e9c9)

692 + t5537: move http tests out to t5539

693 + fetch-pack: fix deepen shallow over smart http with no-done cap

694 + protocol-capabilities.txt: document no-done

@@ -538,13 +698,15 @@ of the repositories listed at

698 + tests: auto-set LIB_HTTPD_PORT from test name

699 (this branch is tangled with jk/test-ports.)

700

701 + Originally merged to 'next' on 2014-02-13

702 +

703 Attempting to deepen a shallow repository by fetching over smart

704 HTTP transport failed in the protocol exchange, when no-done

705 extension was used. The fetching side waited for the list of

706 shallow boundary commits after the sending end stopped talking to

707 it.

708

547 - Will cook in 'next'.

709 + Will merge to 'master'.

710

711

712 * jk/makefile (2014-02-05) 16 commits

@@ -572,39 +734,36 @@ of the repositories listed at

734 Expecting a reroll.

735

736

575 -* ks/tree-diff-walk (2014-02-06) 5 commits

576 - (merged to 'next' on 2014-02-06 at d56a3be)

577 - + Finally switch over tree descriptors to contain a pre-parsed entry

737 +* ks/tree-diff-walk (2014-02-24) 5 commits

738 + (merged to 'next' on 2014-02-25 at 17e594f)

739 + + tree-walk: finally switch over tree descriptors to contain a pre-parsed entry

740 + revision: convert to using diff_tree_sha1()

741 + line-log: convert to using diff_tree_sha1()

742 + tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL

743 + tree-diff: allow diff_tree_sha1 to accept NULL sha1

744 (this branch is used by ks/combine-diff, ks/tree-diff-more and ks/tree-diff-nway.)

745

584 - Will cook in 'next'.

746 + Originally merged to 'next' on 2014-02-06

747 +

748 + Will merge to 'master'.

749

750

751 * nd/reset-intent-to-add (2014-02-05) 1 commit

588 - (merged to 'next' on 2014-02-07 at 3497008)

752 + (merged to 'next' on 2014-02-25 at 0c48245)

753 + reset: support "--mixed --intent-to-add" mode

754

591 - Will cook in 'next'.

755 + Originally merged to 'next' on 2014-02-07

756 +

757 + Will merge to 'master'.

758

759

760 * nd/test-rename-reset (2014-02-04) 1 commit

595 - (merged to 'next' on 2014-02-06 at ca188bd)

761 + (merged to 'next' on 2014-02-25 at 7b25711)

762 + t7101, t7014: rename test files to indicate what that file is for

763

598 - Will cook in 'next'.

599 -

764 + Originally merged to 'next' on 2014-02-06

765

601 -* tb/repack-fix-renames (2014-02-05) 1 commit

602 - - repack.c: rename a few variables

603 -

604 - Perhaps unneeded, as the longer-term plan is to drop the codeblock

605 - this change touches.

606 -

607 - Will discard.

766 + Will merge to 'master'.

767

768

769 * tr/remerge-diff (2014-02-05) 6 commits

@@ -625,18 +784,20 @@ of the repositories listed at

784

785

786 * bs/stdio-undef-before-redef (2014-01-31) 1 commit

628 - (merged to 'next' on 2014-01-31 at 9874918)

787 + (merged to 'next' on 2014-02-25 at 77c4b5f)

788 + git-compat-util.h: #undef (v)snprintf before #define them

789

790 + Originally merged to 'next' on 2014-01-31

791 +

792 When we replace broken macros from stdio.h in git-compat-util.h,

793 #undef them to avoid re-definition warnings from the C

794 preprocessor.

795

635 - Will cook in 'next'.

796 + Will merge to 'master'.

797

798

799 * ep/varscope (2014-01-31) 7 commits

639 - (merged to 'next' on 2014-01-31 at d198f5d)

800 + (merged to 'next' on 2014-02-25 at e967c7e)

801 + builtin/gc.c: reduce scope of variables

802 + builtin/fetch.c: reduce scope of variable

803 + builtin/commit.c: reduce scope of variables

@@ -645,14 +806,16 @@ of the repositories listed at

806 + builtin/apply.c: reduce scope of variables

807 + bisect.c: reduce scope of variable

808

809 + Originally merged to 'next' on 2014-01-31

810 +

811 Shrink lifetime of variables by moving their definitions to an

812 inner scope where appropriate.

813

651 - Will cook in 'next'.

814 + Will merge to 'master'.

815

816

817 * mw/symlinks (2014-02-04) 6 commits

655 - (merged to 'next' on 2014-02-06 at 3d6df37)

818 + (merged to 'next' on 2014-02-25 at 15dc036)

819 + setup: don't dereference in-tree symlinks for absolute paths

820 + setup: add abspath_part_inside_repo() function

821 + t0060: add tests for prefix_path when path begins with work tree

@@ -660,33 +823,37 @@ of the repositories listed at

823 + t0060: add test for prefix_path on symlinks via absolute paths

824 + t3004: add test for ls-files on symlinks via absolute paths

825

826 + Originally merged to 'next' on 2014-02-06

827 +

828 All subcommands that take pathspecs mishandled an in-tree symbolic

829 link when given it as a full path from the root (which arguably is

830 a sick way to use pathspecs). "git ls-files -s $(pwd)/RelNotes" in

831 our tree is an easy reproduction recipe.

832

668 - Will cook in 'next'.

833 + Will merge to 'master'.

834

835

671 -* ks/combine-diff (2014-02-12) 6 commits

672 - - tests: add checking that combine-diff emits only correct paths

673 - - combine-diff: simplify intersect_paths() further

674 - - combine-diff: combine_diff_path.len is not needed anymore

675 - - combine-diff: optimize combine_diff_path sets intersection

676 - - diff test: add tests for combine-diff with orderfile

677 - - diffcore-order: export generic ordering interface

836 +* ks/combine-diff (2014-02-24) 6 commits

837 + (merged to 'next' on 2014-02-25 at 69e5a87)

838 + + tests: add checking that combine-diff emits only correct paths

839 + + combine-diff: simplify intersect_paths() further

840 + + combine-diff: combine_diff_path.len is not needed anymore

841 + + combine-diff: optimize combine_diff_path sets intersection

842 + + diff test: add tests for combine-diff with orderfile

843 + + diffcore-order: export generic ordering interface

844 (this branch is used by ks/tree-diff-more and ks/tree-diff-nway; uses ks/tree-diff-walk.)

845

680 - By avoiding running full two-way diff between the resulting

681 - revision and each of its N parents, combine-diff can be sped up

682 - significantly.

846 + Originally merged to 'next' on 2014-02-20

847

684 - Will merge to 'next' after reading it over one more time.

685 - Help in reviewing the series is very much appreciated.

848 + Teach combine-diff to honour the path-output-order imposed by

849 + diffcore-order, and optimize how matching paths are found in

850 + the N-way diffs made with parents.

851 +

852 + Will merge to 'master'.

853

854

855 * bc/gpg-sign-everywhere (2014-02-11) 9 commits

689 - (merged to 'next' on 2014-02-13 at 390376c)

856 + (merged to 'next' on 2014-02-25 at 7db014c)

857 + pull: add the --gpg-sign option.

858 + rebase: add the --gpg-sign option

859 + rebase: parse options in stuck-long mode

@@ -697,62 +864,57 @@ of the repositories listed at

864 + git-sh-setup.sh: add variable to use the stuck-long mode

865 + cherry-pick, revert: add the --gpg-sign option

866

700 - Teach "--gpg-sign" option to many commands that create commits.

867 + Originally merged to 'next' on 2014-02-13

868

702 - Changes to some scripted Porcelains use unsafe variable

703 - substitutions and still need to be tightened.

869 + Teach "--gpg-sign" option to many commands that create commits.

870

705 - Will cook in 'next'.

871 + Will merge to 'master'.

872

873

874 * ds/rev-parse-required-args (2014-01-28) 1 commit

709 - (merged to 'next' on 2014-01-31 at 73b7514)

875 + (merged to 'next' on 2014-02-25 at bba6e79)

876 + rev-parse: check i before using argv[i] against argc

877

878 + Originally merged to 'next' on 2014-01-31

879 +

880 "git rev-parse --default" without the required option argument did

881 not diagnose it as an error.

882

715 - Will cook in 'next'.

883 + Will merge to 'master'.

884

885

886 * jk/config-path-include-fix (2014-01-28) 2 commits

719 - (merged to 'next' on 2014-01-31 at 8550a9e)

887 + (merged to 'next' on 2014-02-25 at 3604f75)

888 + handle_path_include: don't look at NULL value

889 + expand_user_path: do not look at NULL path

890

891 + Originally merged to 'next' on 2014-01-31

892 +

893 include.path variable (or any variable that expects a path that can

894 use ~username expansion) in the configuration file is not a

895 boolean, but the code failed to check it.

896

727 - Will cook in 'next'.

897 + Will merge to 'master'.

898

899

730 -* jk/repack-honor-pack-keep (2014-02-12) 1 commit

731 - - repack: add `repack.honorpackkeep` config var

732 - (this branch uses jk/pack-bitmap.)

733 -

734 - Optionally allow "git repack" to include objects that exist in kept

735 - packs in newly created packfiles.

736 -

737 - Waiting for response to review comments.

738 -

739 -

740 -* nd/submodule-pathspec-ending-with-slash (2014-01-27) 8 commits

741 - (merged to 'next' on 2014-01-31 at cfddaa5)

900 +* nd/submodule-pathspec-ending-with-slash (2014-02-24) 8 commits

901 + (merged to 'next' on 2014-02-25 at 954b7a2)

902 + clean: use cache_name_is_other()

903 + clean: replace match_pathspec() with dir_path_match()

744 - + Pass directory indicator to match_pathspec_item()

904 + + pathspec: pass directory indicator to match_pathspec_item()

905 + match_pathspec: match pathspec "foo/" against directory "foo"

906 + dir.c: prepare match_pathspec_item for taking more flags

747 - + Rename match_pathspec_depth() to match_pathspec()

748 - + Convert some match_pathspec_depth() to dir_path_match()

749 - + Convert some match_pathspec_depth() to ce_path_match()

907 + + pathspec: rename match_pathspec_depth() to match_pathspec()

908 + + pathspec: convert some match_pathspec_depth() to dir_path_match()

909 + + pathspec: convert some match_pathspec_depth() to ce_path_match()

910 +

911 + Originally merged to 'next' on 2014-01-31

912

913 Allow "git cmd path/", when the 'path' is where a submodule is

914 bound to the top-level working tree, to match 'path', despite the

915 extra and unnecessary trailing slash.

916

755 - Will cook in 'next'.

917 + Will merge to 'master'.

918

919

920 * lt/request-pull (2014-01-31) 4 commits

@@ -764,32 +926,36 @@ of the repositories listed at

926 Waiting for the updates to settle.

927

928

767 -* bk/refresh-missing-ok-in-merge-recursive (2014-01-27) 4 commits

768 - (merged to 'next' on 2014-01-29 at 614c158)

769 - + merge-recursive.c: Tolerate missing files while refreshing index

770 - + read-cache.c: Extend make_cache_entry refresh flag with options

771 - + read-cache.c: Refactor --ignore-missing implementation

772 - + t3030-merge-recursive: Test known breakage with empty work tree

929 +* bk/refresh-missing-ok-in-merge-recursive (2014-02-24) 4 commits

930 + (merged to 'next' on 2014-02-25 at 2651cb0)

931 + + merge-recursive.c: tolerate missing files while refreshing index

932 + + read-cache.c: extend make_cache_entry refresh flag with options

933 + + read-cache.c: refactor --ignore-missing implementation

934 + + t3030-merge-recursive: test known breakage with empty work tree

935

774 - Allows "merge-recursive" to work in an empty (temporary) working

936 + Originally merged to 'next' on 2014-01-29

937 +

938 + Allow "merge-recursive" to work in an empty (temporary) working

939 tree again when there are renames involved, correcting an old

940 regression in 1.7.7 era.

941

778 - Will cook in 'next'.

942 + Will merge to 'master'.

943

944

781 -* nd/diff-quiet-stat-dirty (2014-01-27) 2 commits

782 - (merged to 'next' on 2014-01-31 at 8b6e35d)

945 +* nd/diff-quiet-stat-dirty (2014-02-24) 2 commits

946 + (merged to 'next' on 2014-02-25 at 7cad1d3)

947 + diff: do not quit early on stat-dirty files

784 - + Move diffcore_skip_stat_unmatch core logic out for reuse later

948 + + diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later

949 +

950 + Originally merged to 'next' on 2014-01-31

951

952 "git diff --quiet -- pathspec1 pathspec2" sometimes did not return

953 correct status value.

954

789 - Will cook in 'next'.

955 + Will merge to 'master'.

956

957

792 -* cc/interpret-trailers (2014-02-06) 14 commits

958 +* cc/interpret-trailers (2014-02-20) 14 commits

959 - Documentation: add documentation for 'git interpret-trailers'

960 - trailer: add tests for commands using env variables

961 - trailer: set author and committer env variables

@@ -803,35 +969,25 @@ of the repositories listed at

969 - trailer: process command line trailer arguments

970 - trailer: read and process config information

971 - trailer: process trailers from file and arguments

806 - - Add data structures and basic functions for commit trailers

972 + - trailer: add data structures and basic functions for commit trailers

973

974 + Waiting for a reroll.

975 + Hopefully ready for 'next'.

976

809 -* dk/blame-janitorial (2014-02-12) 4 commits

810 - (merged to 'next' on 2014-02-13 at cc6f7eb)

977 +

978 +* dk/blame-janitorial (2014-02-25) 5 commits

979 + (merged to 'next' on 2014-02-25 at d5faeb2)

980 + + builtin/blame.c::find_copy_in_blob: no need to scan for region end

981 + blame.c: prepare_lines should not call xrealloc for every line

812 - (merged to 'next' on 2014-02-11 at 4af3ebd)

982 + builtin/blame.c::prepare_lines: fix allocation size of sb->lineno

814 - (merged to 'next' on 2014-01-29 at 0b7ea97)

815 - + Eliminate same_suspect function in builtin/blame.c

983 + + builtin/blame.c: eliminate same_suspect()

984 + builtin/blame.c: struct blame_entry does not need a prev link

985

818 - Code clean-up.

819 -

820 - Will cook in 'next'.

821 -

986 + Originally merged to 'next' on 2014-02-13

987

823 -* ks/diff-c-with-diff-order (2014-02-03) 5 commits

824 - (merged to 'next' on 2014-02-04 at 24a8b2e)

825 - + combine-diff: simplify intersect_paths() further

826 - + combine-diff: combine_diff_path.len is not needed anymore

827 - + combine-diff: optimize combine_diff_path sets intersection

828 - + diff test: add tests for combine-diff with orderfile

829 - + diffcore-order: export generic ordering interface

830 -

831 - Teach combine-diff to honour the path-output-order imposed by

832 - diffcore-order.

988 + Code clean-up.

989

834 - Will cook in 'next'.

990 + Will merge to 'master'.

991

992

993 * bl/blame-full-history (2014-01-14) 1 commit

@@ -851,28 +1007,32 @@ of the repositories listed at

1007

1008

1009 * da/pull-ff-configuration (2014-01-15) 2 commits

854 - (merged to 'next' on 2014-01-22 at 2686b09)

1010 + (merged to 'next' on 2014-02-25 at b9e4f61)

1011 + pull: add --ff-only to the help text

1012 + pull: add pull.ff configuration

1013

1014 + Originally merged to 'next' on 2014-01-22

1015 +

1016 "git pull" learned to pay attention to pull.ff configuration

1017 variable.

1018

861 - Will cook in 'next'.

1019 + Will merge to 'master'.

1020 +

1021

1022 +* wk/submodule-on-branch (2014-02-24) 4 commits

1023 + (merged to 'next' on 2014-02-25 at c6d9fef)

1024 + + Documentation: describe 'submodule update --remote' use case

1025 + + submodule: explicit local branch creation in module_clone

1026 + + submodule: document module_clone arguments in comments

1027 + + submodule: make 'checkout' update_module mode more explicit

1028

864 -* wk/submodule-on-branch (2014-01-27) 4 commits

865 - (merged to 'next' on 2014-02-06 at 03dc3fd)

866 - + Documentation: Describe 'submodule update --remote' use case

867 - + submodule: Explicit local branch creation in module_clone

868 - + submodule: Document module_clone arguments in comments

869 - + submodule: Make 'checkout' update_module explicit

1029 + Originally merged to 'next' on 2014-02-06

1030

871 - Makes sure 'submodule update' modes that do not detach HEADs can

1031 + Make sure 'submodule update' modes that do not detach HEADs can

1032 be used more pleasantly by checking out a concrete branch when

1033 cloning them to prime the well.

1034

875 - Will cook in 'next'.

1035 + Will merge to 'master'.

1036

1037

1038 * jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits

@@ -894,15 +1054,12 @@ of the repositories listed at

1054

1055

1056 * jk/pack-bitmap (2014-02-12) 26 commits

897 - (merged to 'next' on 2014-02-13 at 591b040)

1057 + (merged to 'next' on 2014-02-25 at 5f65d26)

1058 + ewah: unconditionally ntohll ewah data

899 - (merged to 'next' on 2014-01-27 at 0b1dcb5)

1059 + ewah: support platforms that require aligned reads

1060 + read-cache: use get_be32 instead of hand-rolled ntoh_l

1061 + block-sha1: factor out get_be and put_be wrappers

903 - (merged to 'next' on 2014-01-16 at ddac2d2)

1062 + do not discard revindex when re-preparing packfiles

905 - (merged to 'next' on 2014-01-10 at bdbe0a4)

1063 + pack-bitmap: implement optional name_hash cache

1064 + t/perf: add tests for pack bitmaps

1065 + t: add basic bitmap functionality tests

@@ -924,43 +1081,51 @@ of the repositories listed at

1081 + pack-objects: factor out name_hash

1082 + pack-objects: refactor the packing list

1083 + revindex: export new APIs

927 - (this branch is used by jk/repack-honor-pack-keep.)

1084 + (this branch is used by jk/repack-pack-keep-objects.)

1085 +

1086 + Originally merged to 'next' on 2014-02-13

1087

929 - Borrows the bitmap index into packfiles from JGit to speed up

1088 + Borrow the bitmap index into packfiles from JGit to speed up

1089 enumeration of objects involved in a commit range without having to

1090 fully traverse the history.

1091

933 - Will cook in 'next'.

1092 + Will merge to 'master'.

1093

1094

936 -* nv/commit-gpgsign-config (2013-12-17) 3 commits

937 - (merged to 'next' on 2014-01-03 at 9780cbb)

1095 +* nv/commit-gpgsign-config (2014-02-24) 3 commits

1096 + (merged to 'next' on 2014-02-25 at 0baefa2)

1097 + test the commit.gpgsign config option

1098 + commit-tree: add and document --no-gpg-sign

940 - + Add the commit.gpgsign option to sign all commits

1099 + + commit-tree: add the commit.gpgsign option to sign all commits

1100 +

1101 + Originally merged to 'next' on 2014-01-03

1102

1103 Introduce commit.gpgsign configuration variable to force every

1104 commit to be GPG signed. The variable cannot be overriden from the

1105 command line of some of the commands that create commits except for

1106 "git commit" and "git commit-tree", but I am not convinced that it

946 - is a good idea to sprinkle support for --no-gpg-sign everywhere.

1107 + is a good idea to sprinkle support for --no-gpg-sign everywhere,

1108 + which in turn means that this configuration variable may not be

1109 + such a good idea.

1110

948 - Will cook in 'next'.

1111 + Will merge to 'master'.

1112

1113

1114 * cc/starts-n-ends-with-endgame (2013-12-05) 1 commit

952 - (merged to 'next' on 2014-01-07 at 4cdf8d0)

1115 + (merged to 'next' on 2014-02-25 at 473e143)

1116 + strbuf: remove prefixcmp() and suffixcmp()

1117

1118 + Originally merged to 'next' on 2014-01-07

1119 +

1120 Endgame for the cc/starts-n-ends-with topic; this needs to be

1121 evil-merged with other topics that introduce new uses of

1122 prefix/suffix-cmp functions.

1123

959 - Will cook in 'next' until Git 2.0.

1124 + Will merge to 'master' for 2.0.0

1125

1126

1127 * gj/push-more-verbose-advice (2013-11-13) 1 commit

963 - (merged to 'next' on 2013-12-06 at 574b18a)

1128 + (merged to 'next' on 2014-02-25 at 1cd10b0)

1129 + push: switch default from "matching" to "simple"

1130

1131 Originally merged to 'next' on 2013-11-21

@@ -969,7 +1134,7 @@ of the repositories listed at

1134 topmost patch is a rebase of jc/push-2.0-default-to-simple on top

1135 of it.

1136

972 - Will cook in 'next' until Git 2.0.

1137 + Will merge to 'master' for 2.0.0

1138

1139

1140 * tr/merge-recursive-index-only (2014-02-05) 3 commits

@@ -982,38 +1147,69 @@ of the repositories listed at

1147

1148

1149 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit

985 - (merged to 'next' on 2013-12-06 at ead2ec8)

1150 + (merged to 'next' on 2014-02-25 at 9e5c0d2)

1151 + git add: -u/-A now affects the entire working tree

1152

988 - Will cook in 'next' until Git 2.0.

1153 + Originally merged to 'next' on 2013-12-06

1154 +

1155 + Will merge to 'master' for 2.0.0

1156

1157

1158 * jc/core-checkstat-2.0 (2013-05-06) 1 commit

992 - (merged to 'next' on 2013-12-06 at ae18007)

1159 + (merged to 'next' on 2014-02-25 at 62f6aeb)

1160 + core.statinfo: remove as promised in Git 2.0

1161

995 - Will cook in 'next' until Git 2.0.

1162 + Originally merged to 'next' on 2013-12-06

1163 +

1164 + Will merge to 'master' for 2.0.0

1165

1166

1167 * jc/push-2.0-default-to-simple (2013-06-18) 1 commit

999 - (merged to 'next' on 2013-12-06 at 6fad61c)

1168 + (merged to 'next' on 2014-02-25 at 1f0e178)

1169 + push: switch default from "matching" to "simple"

1170

1002 - Will cook in 'next' until Git 2.0.

1171 + Originally merged to 'next' on 2013-12-06

1172 +

1173 + Will merge to 'master' for 2.0.0

1174

1175

1176 * jc/add-2.0-ignore-removal (2013-04-22) 1 commit

1006 - (merged to 'next' on 2013-12-06 at fbaa75a)

1177 + (merged to 'next' on 2014-02-25 at a0d018a)

1178 + git add <pathspec>... defaults to "-A"

1179

1180 + Originally merged to 'next' on 2013-12-06

1181 +

1182 Updated endgame for "git add <pathspec>" that defaults to "--all"

1183 aka "--no-ignore-removal".

1184

1012 - Will cook in 'next' until Git 2.0.

1185 + Will merge to 'master' for 2.0.0

1186

1187

1188 * jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit

1016 - (merged to 'next' on 2013-12-06 at 083d67c)

1189 + (merged to 'next' on 2014-02-25 at ccfff88)

1190 + diff: remove "diff-files -q" in a version of Git in a distant future

1191

1192 + Originally merged to 'next' on 2013-12-06

1193 +

1194 + Remove deprecated "-q" option "git diff-files".

1195 +

1196 Will cook in 'next' until a distant future.

1197 +

1198 +--------------------------------------------------

1199 +[Discarded]

1200 +

1201 +* tb/repack-fix-renames (2014-02-05) 1 commit

1202 + . repack.c: rename a few variables

1203 +

1204 + Perhaps unneeded, as the longer-term plan is to drop the codeblock

1205 + this change touches.

1206 +

1207 +

1208 +* ks/diff-c-with-diff-order (2014-02-03) 5 commits

1209 + . combine-diff: simplify intersect_paths() further

1210 + . combine-diff: combine_diff_path.len is not needed anymore

1211 + . combine-diff: optimize combine_diff_path sets intersection

1212 + . diff test: add tests for combine-diff with orderfile

1213 + . diffcore-order: export generic ordering interface

1214 +

1215 + Now part of ks/combine-diff topic.

What's cooking (2014/02 #07)