90e9a614c2 · matheusbsbs/matheus-bagliano

@@ -1,23 +1,16 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jun 2014, #06; Thu, 26)

4 -X-master-at: ea0e524ebd60f87546a9998e447d307d3f51a3e3

5 -X-next-at: 2fd69c3c8efbb671c0151b34525ef25f1f782297

3 +Subject: What's cooking in git.git (Jul 2014, #01; Tue, 8)

4 +X-master-at: 72c779457cd72928e36f2bc43c3ff7f3ae7b77c3

5 +X-next-at: 35b839c24c6ee47bec1710eabfa8653925462638

6

7 -What's cooking in git.git (Jun 2014, #06; Thu, 26)

7 +What's cooking in git.git (Jul 2014, #01; Tue, 8)

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 -Fixes accumulated on the 'master' front made into 2.0.1. The topics

15 -in flight continue to separate into two distinct layers (i.e.

16 -stalled-and-need-to-be-rerolld vs sure-to-graduate-soon).

17 -

18 -Four mingw series are still in limbo--are they in good enough shape

19 -for Windows folks who wanted to upstream them?

20 -

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

15 of the repositories listed at

16

@@ -26,129 +19,210 @@ of the repositories listed at

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

20 [Graduated to "master"]

21

29 -* ep/avoid-test-a-o (2014-06-19) 20 commits

30 - (merged to 'next' on 2014-06-20 at c47322b)

31 - + git-submodule.sh: avoid "echo" path-like values

32 - + git-submodule.sh: avoid "test <cond> -a/-o <cond>"

33 - + t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"

34 - + t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"

35 - + t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"

36 - + t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"

37 - + t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"

38 - + t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"

39 - + t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"

40 - + t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"

41 - + t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"

42 - + git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"

43 - + git-mergetool.sh: avoid "test <cond> -a/-o <cond>"

44 - + git-bisect.sh: avoid "test <cond> -a/-o <cond>"

45 - + contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"

46 - + contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"

47 - + contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"

48 - + contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"

49 - + contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"

50 - + check_bindir: avoid "test <cond> -a/-o <cond>"

22 +* bc/fix-rebase-merge-skip (2014-06-16) 1 commit

23 + (merged to 'next' on 2014-06-20 at 01f81f5)

24 + + rebase--merge: fix --skip with two conflicts in a row

25

52 - Update tests and scripts to avoid "test ... -a ...", which is often

53 - more error-prone than "test ... && test ...".

26 + "git rebase --skip" did not work well when it stopped due to a

27 + conflict twice in a row.

28

55 - Squashed misconversion fix-up into git-submodule.sh updates.

29

30 +* dt/refs-check-refname-component-sse (2014-06-18) 1 commit

31 + (merged to 'next' on 2014-06-20 at d286027)

32 + + refs.c: SSE2 optimizations for check_refname_component

33

58 -* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit

59 - (merged to 'next' on 2014-06-16 at 29734cc)

60 - + sequencer: signal failed ff as an aborted, not a conflicted merge

34 + Further micro-optimization of a leaf-function.

35

36

63 -* jk/repack-pack-keep-objects (2014-06-10) 3 commits

64 - (merged to 'next' on 2014-06-16 at 89716c9)

65 - + repack: s/write_bitmap/&s/ in code

66 - + repack: respect pack.writebitmaps

67 - + repack: do not accidentally pack kept objects by default

68 - (this branch is used by jk/repack-pack-writebitmaps-config.)

37 +* jk/commit-buffer-length (2014-06-13) 18 commits

38 + (merged to 'next' on 2014-06-16 at b2d2d7b)

39 + + reuse cached commit buffer when parsing signatures

40 + + commit: record buffer length in cache

41 + + commit: convert commit->buffer to a slab

42 + + commit-slab: provide a static initializer

43 + + use get_commit_buffer everywhere

44 + + convert logmsg_reencode to get_commit_buffer

45 + + use get_commit_buffer to avoid duplicate code

46 + + use get_cached_commit_buffer where appropriate

47 + + provide helpers to access the commit buffer

48 + + provide a helper to set the commit buffer

49 + + provide a helper to free commit buffer

50 + + sequencer: use logmsg_reencode in get_message

51 + + logmsg_reencode: return const buffer

52 + + do not create "struct commit" with xcalloc

53 + + commit: push commit_index update into alloc_commit_node

54 + + alloc: include any-object allocations in alloc_report

55 + + replace dangerous uses of strbuf_attach

56 + + commit_tree: take a pointer/len pair rather than a const strbuf

57

70 - Recent updates to "git repack" started to duplicate objects that

71 - are in packfiles marked with .keep flag into the new packfile by

72 - mistake.

58 + Move "commit->buffer" out of the in-core commit object and keep

59 + track of their lengths. Use this to optimize the code paths to

60 + validate GPG signatures in commit objects.

61

62

75 -* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits

76 - (merged to 'next' on 2014-06-16 at 777005d)

77 - + t7700: drop explicit --no-pack-kept-objects from .keep test

78 - + repack: introduce repack.writeBitmaps config option

79 - + repack: simplify handling of --write-bitmap-index

80 - + pack-objects: stop respecting pack.writebitmaps

81 - (this branch uses jk/repack-pack-keep-objects.)

63 +* ye/http-extract-charset (2014-06-17) 1 commit

64 + (merged to 'next' on 2014-06-20 at 9492bae)

65 + + http: fix charset detection of extract_content_type()

66

67 +--------------------------------------------------

68 +[New Topics]

69

84 -* jm/dedup-name-compare (2014-06-20) 2 commits

85 - + cleanup duplicate name_compare() functions

86 - + name-hash.c: replace cache_name_compare() with memcmp(3)

70 +* cc/replace-edit (2014-06-25) 3 commits

71 + - replace: use argv_array in export_object

72 + - avoid double close of descriptors handed to run_command

73 + - replace: replace spaces with tabs in indentation

74 + (this branch is used by jk/replace-edit-raw.)

75

76 + Will merge to 'next'.

77

89 -* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit

90 - (merged to 'next' on 2014-06-20 at 04815e3)

91 - + submodule: document "sync --recursive"

78

79 +* ep/submodule-code-cleanup (2014-06-30) 1 commit

80 + - submodule.c: use the ARRAY_SIZE macro

81

94 -* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit

95 - (merged to 'next' on 2014-06-16 at 3c05e19)

96 - + git-p4: fix submit in non --prepare-p4-only mode

82 + Will merge to 'next'.

83

84

99 -* nd/init-restore-env (2014-06-10) 1 commit

100 - (merged to 'next' on 2014-06-16 at ecbbfca)

101 - + git potty: restore environments after alias expansion

85 +* jk/replace-edit-raw (2014-06-25) 1 commit

86 + - replace: add a --raw mode for --edit

87 + (this branch uses cc/replace-edit.)

88

89 + Will merge to 'next'.

90

104 -* pb/trim-trailing-spaces (2014-06-13) 1 commit

105 - (merged to 'next' on 2014-06-20 at 6985153)

106 - + t0008: do not depend on 'echo' handling backslashes specially

91

92 +* jk/strip-suffix (2014-06-30) 9 commits

93 + - prepare_packed_git_one: refactor duplicate-pack check

94 + - verify-pack: use strbuf_strip_suffix

95 + - strbuf: implement strbuf_strip_suffix

96 + - index-pack: use strip_suffix to avoid magic numbers

97 + - use strip_suffix instead of ends_with in simple cases

98 + - replace has_extension with ends_with

99 + - implement ends_with via strip_suffix

100 + - add strip_suffix function

101 + - sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()

102

109 -* rs/blame-refactor (2014-06-13) 2 commits

110 - (merged to 'next' on 2014-06-20 at ddaa722)

111 - + blame: simplify prepare_lines()

112 - + blame: factor out get_next_line()

103 + Will merge to 'next'.

104

105

115 -* sp/complete-ext-alias (2014-06-13) 1 commit

116 - (merged to 'next' on 2014-06-16 at 399679e)

117 - + completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

106 +* jk/tag-contains (2014-06-30) 8 commits

107 + - perf: add tests for tag --contains

108 + - tag: use commit_contains

109 + - commit: provide a fast multi-tip contains function

110 + - string-list: add pos to iterator callback

111 + - add functions for memory-efficient bitmaps

112 + - paint_down_to_common: use prio_queue

113 + - tag: factor out decision to stream tags

114 + - tag: allow --sort with -n

115

116 + Expecting a reroll.

117

120 -* tb/unicode-7.0-display-width (2014-06-18) 1 commit

121 - (merged to 'next' on 2014-06-20 at 111b246)

122 - + Update of unicode_width.h to Unicode Version 7.0

118

119 +* mg/fix-log-mergetag-color (2014-06-30) 1 commit

120 + - log: correctly identify mergetag signature verification status

121

125 -* ye/doc-http-proto (2014-06-16) 1 commit

126 - (merged to 'next' on 2014-06-20 at 24f347d)

127 - + http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

122 + Will merge to 'next'.

123

129 ---------------------------------------------------

130 -[New Topics]

124

132 -* jc/fix-clone-single-starting-at-a-tag (2014-06-23) 1 commit

133 - - builtin/clone.c: detect a clone starting at a tag correctly

125 +* mk/merge-incomplete-files (2014-06-30) 2 commits

126 + - git-merge-file: do not add LF at EOF while applying unrelated change

127 + - t6023-merge-file.sh: fix and mark as broken invalid tests

128

129 Will merge to 'next'.

130

137 ---------------------------------------------------

138 -[Stalled]

131

140 -* cc/replace-graft (2014-06-09) 5 commits

141 - - DONTMERGE: wise to wait for peff's commit->buffer length series

142 - - contrib: add convert-grafts-to-replace-refs.sh

143 - - Documentation: replace: add --graft option

144 - - replace: add test for --graft

145 - - replace: add --graft option

132 +* rs/status-code-clean-up (2014-06-29) 2 commits

133 + (merged to 'next' on 2014-07-08 at db67965)

134 + + wt-status: simplify building of summary limit argument

135 + + wt-status: use argv_array for environment

136

147 - "git replace" learned a "--graft" option to rewrite parents of a

148 - commit.

137 + Will merge to 'master'.

138 +

139 +

140 +* tb/crlf-tests (2014-07-08) 2 commits

141 + (merged to 'next' on 2014-07-08 at 40764b7)

142 + + t0027: combinations of core.autocrlf, core.eol and text

143 + + t0025: rename the test files

144 +

145 + Will merge to 'master'.

146 +

147 +

148 +* ak/profile-feedback-build (2014-07-08) 4 commits

149 + - Fix profile feedback with -jN and add profile-fast

150 + - Run the perf test suite for profile feedback too

151 + - Don't define away __attribute__ on gcc

152 + - Use BASIC_FLAGS for profile feedback

153 +

154 + Will merge to 'next'.

155 +

156 +

157 +* cb/filter-branch-prune-empty-degenerate-merges (2014-07-01) 1 commit

158 + - filter-branch: eliminate duplicate mapped parents

159 +

160 + Will merge to 'next'.

161 +

162 +

163 +* cc/for-each-mergetag (2014-07-07) 1 commit

164 + - commit: add for_each_mergetag()

165 + (this branch is used by cc/replace-graft.)

166 +

167 + Will merge to 'next'.

168 +

169 +

170 +* dt/cache-tree-repair (2014-07-08) 4 commits

171 + - cache-tree: write updated cache-tree after commit

172 + - cache-tree: subdirectory tests

173 + - test-dump-cache-tree: invalid trees are not errors

174 + - cache-tree: create/update cache-tree on checkout

175 +

176 + Reviews seen; waiting for a response.

177 +

178 +

179 +* jl/test-lint-scripts (2014-07-07) 3 commits

180 + - DONTMERGE: missing sign-off

181 + - t/Makefile: always test all lint targets when running tests

182 + - t/Makefile: check helper scripts for non-portable shell commands too

183 +

184 +

185 +* kb/hashmap-updates (2014-07-07) 4 commits

186 + - hashmap: add string interning API

187 + - hashmap: add simplified hashmap_get_from_hash() API

188 + - hashmap: improve struct hashmap member documentation

189 + - hashmap: factor out getting a hash code from a SHA1

190 +

191 + Reviews sent; waiting for a response.

192 +

193 +

194 +* kb/path-max-must-go (2014-07-07) 2 commits

195 + (merged to 'next' on 2014-07-08 at 4d41c18)

196 + + dir: remove PATH_MAX limitation

197 + + symlinks: remove PATH_MAX limitation

198 +

199 + Will merge to 'master'.

200 +

201 +

202 +* rs/fix-alt-odb-path-comparison (2014-07-01) 1 commit

203 + (merged to 'next' on 2014-07-08 at f9c69e5)

204 + + sha1_file: avoid overrunning alternate object base string

205 +

206 + Will merge to 'master'.

207 +

208 +

209 +* rs/simplify-archive-tests (2014-07-07) 1 commit

210 + (merged to 'next' on 2014-07-08 at c46cfac)

211 + + t5000, t5003: simplify commit

212 +

213 + Will merge to 'master'.

214

150 - Expecting a reroll on top of jk/commit-buffer-length.

215

216 +* zk/log-graph-showsig (2014-07-08) 1 commit

217 + - log: fix indentation for --graph --show-signature

218 +

219 + The "--show-signature" option did not pay much attention to

220 + "--graph".

221 +

222 + Will merge to 'next'.

223 +

224 +--------------------------------------------------

225 +[Stalled]

226

227 * ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits

228 - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks

@@ -441,31 +515,49 @@ of the repositories listed at

515 --------------------------------------------------

516 [Cooking]

517

444 -* mg/verify-commit (2014-06-23) 5 commits

445 - - t7510: test verify-commit

446 - - t7510: exit for loop with test result

447 - - verify-commit: scriptable commit signature verification

448 - - gpg-interface: provide access to the payload

449 - - gpg-interface: provide clear helper for struct signature_check

518 +* cc/replace-graft (2014-07-07) 9 commits

519 + - replace: add test for --graft with a mergetag

520 + - replace: check mergetags when using --graft

521 + - replace: add test for --graft with signed commit

522 + - replace: remove signature when using --graft

523 + - contrib: add convert-grafts-to-replace-refs.sh

524 + - Documentation: replace: add --graft option

525 + - replace: add test for --graft

526 + - replace: add --graft option

527 + - replace: cleanup redirection style in tests

528 + (this branch uses cc/for-each-mergetag.)

529

451 - Add 'verify-commit' to be used in a way similar to 'verify-tag' is

452 - used. Further work on verifying the mergetags might be needed.

530 + "git replace" learned a "--graft" option to rewrite parents of a

531 + commit.

532

454 - Will merge to 'next'.

533

534 +* jc/fix-clone-single-starting-at-a-tag (2014-06-23) 1 commit

535 + (merged to 'next' on 2014-07-02 at cc0c4b1)

536 + + builtin/clone.c: detect a clone starting at a tag correctly

537

457 -* dt/refs-check-refname-component-sse (2014-06-18) 1 commit

458 - (merged to 'next' on 2014-06-20 at d286027)

459 - + refs.c: SSE2 optimizations for check_refname_component

538 + Will merge to 'master'.

539

461 - Further micro-optimization of a leaf-function.

540 +

541 +* mg/verify-commit (2014-06-23) 5 commits

542 + (merged to 'next' on 2014-07-02 at 6d77bcf)

543 + + t7510: test verify-commit

544 + + t7510: exit for loop with test result

545 + + verify-commit: scriptable commit signature verification

546 + + gpg-interface: provide access to the payload

547 + + gpg-interface: provide clear helper for struct signature_check

548 +

549 + Add 'verify-commit' to be used in a way similar to 'verify-tag' is

550 + used. Further work on verifying the mergetags might be needed.

551

552 Will merge to 'master'.

553

554

466 -* ye/http-extract-charset (2014-06-17) 1 commit

467 - (merged to 'next' on 2014-06-20 at 9492bae)

468 - + http: fix charset detection of extract_content_type()

555 +* dt/refs-check-refname-component-sse-fix (2014-07-08) 2 commits

556 + (merged to 'next' on 2014-07-08 at 35b839c)

557 + + refs: fix valgrind suppression file

558 + + refs.c: handle REFNAME_REFSPEC_PATTERN at end of page

559 +

560 + Fixes to a topic that is already in 'master'.

561

562 Will merge to 'master'.

563

@@ -512,44 +604,36 @@ of the repositories listed at

604 Will merge to 'master'.

605

606

515 -* kb/perf-trace (2014-06-20) 11 commits

607 +* kb/perf-trace (2014-07-07) 17 commits

608 + - progress: simplify performance measurement by using getnanotime()

609 + - wt-status: simplify performance measurement by using getnanotime()

610 - git: add performance tracing for git's main() function to debug scripts

611 - trace: add trace_performance facility to debug performance issues

612 - trace: add high resolution timer function to debug performance issues

613 - trace: add 'file:line' to all trace output

614 - trace: move code around, in preparation to file:line output

615 - trace: add current timestamp to all trace output

616 + - trace: disable additional trace output for unit tests

617 - trace: add infrastructure to augment trace output with additional info

523 - - trace: factor out printing to the trace file

618 + - sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API

619 + - Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables

620 + - trace.h: suppress some sparse warnings and errors

621 + - trace: improve trace performance

622 - trace: remove redundant printf format attribute

623 - trace: consistently name the format parameter

624 - trace: move trace declarations from cache.h to new trace.h

625

528 - Expecting a reroll.

626 + Will merge to 'next'.

627

628

531 -* hv/submodule-config (2014-06-13) 6 commits

532 - - SQUASH compilation fix

629 +* hv/submodule-config (2014-06-30) 4 commits

630 - do not die on error of parsing fetchrecursesubmodules option

631 - use new config API for worktree configurations of submodules

632 - extract functions for submodule config set and lookup

633 - implement submodule config cache for lookup of submodule names

537 - - hashmap: add enum for hashmap free_entries option

538 -

539 - Expecting a reroll.

634

635

542 -* bc/fix-rebase-merge-skip (2014-06-16) 1 commit

543 - (merged to 'next' on 2014-06-20 at 01f81f5)

544 - + rebase--merge: fix --skip with two conflicts in a row

545 -

546 - "git rebase --skip" did not work well when it stopped due to a

547 - conflict twice in a row.

548 -

549 - Will merge to 'master'.

550 -

551 -

552 -* jl/submodule-tests (2014-06-20) 15 commits

636 +* jl/submodule-tests (2014-07-07) 14 commits

637 - revert: add t3513 for submodule updates

638 - stash: add t3906 for submodule updates

639 - am: add t4255 for submodule updates

@@ -562,11 +646,10 @@ of the repositories listed at

646 - read-tree: add t1013 for submodule updates

647 - apply: add t4137 for submodule updates

648 - checkout: call the new submodule update test framework

565 - - SQUASH???

566 - - submodules: Add the lib-submodule-update.sh test library

649 + - submodules: add the lib-submodule-update.sh test library

650 - test-lib: add test_dir_is_empty()

651

569 - Expecting a reroll.

652 + Will merge to 'next'.

653

654

655 * po/error-message-style (2014-06-16) 1 commit

@@ -625,11 +708,10 @@ of the repositories listed at

708 - refs.c: ref_transaction_commit should not free the transaction

709 - refs.c: remove ref_transaction_rollback

710

628 - Updated in response to review comments from Michael.

629 -

711 Portability workaround may be needed on top ($gmane/252496).

631 - Will merge to 'next'.

632 -

712 + Updates in response to review comments from Michael ($gmane/253033)

713 + may be needed for later parts, but the earlier parts look ready

714 + for 'next'.

715

716

717 * jk/pretty-G-format-fixes (2014-06-25) 6 commits

@@ -646,40 +728,46 @@ of the repositories listed at

728

729

730 * nd/split-index (2014-06-13) 32 commits

649 - - t1700: new tests for split-index mode

650 - - t2104: make sure split index mode is off for the version test

651 - - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX

652 - - read-tree: note about dropping split-index mode or index version

653 - - read-tree: force split-index mode off on --index-output

654 - - rev-parse: add --shared-index-path to get shared index path

655 - - update-index --split-index: do not split if $GIT_DIR is read only

656 - - update-index: new options to enable/disable split index mode

657 - - split-index: strip pathname of on-disk replaced entries

658 - - split-index: do not invalidate cache-tree at read time

659 - - split-index: the reading part

660 - - split-index: the writing part

661 - - read-cache: mark updated entries for split index

662 - - read-cache: save deleted entries in split index

663 - - read-cache: mark new entries for split index

664 - - read-cache: split-index mode

665 - - read-cache: save index SHA-1 after reading

666 - - entry.c: update cache_changed if refresh_cache is set in checkout_entry()

667 - - cache-tree: mark istate->cache_changed on prime_cache_tree()

668 - - cache-tree: mark istate->cache_changed on cache tree update

669 - - cache-tree: mark istate->cache_changed on cache tree invalidation

670 - - unpack-trees: be specific what part of the index has changed

671 - - resolve-undo: be specific what part of the index has changed

672 - - update-index: be specific what part of the index has changed

673 - - read-cache: be specific what part of the index has changed

674 - - read-cache: be strict about "changed" in remove_marked_cache_entries()

675 - - read-cache: store in-memory flags in the first 12 bits of ce_flags

676 - - read-cache: relocate and unexport commit_locked_index()

677 - - read-cache: new API write_locked_index instead of write_index/write_cache

678 - - sequencer: do not update/refresh index if the lock cannot be held

679 - - ewah: delete unused ewah_read_mmap_native declaration

680 - - ewah: fix constness of ewah_read_mmap

681 -

682 - What's the doneness of this one?

731 + (merged to 'next' on 2014-07-08 at 49325ef)

732 + + t1700: new tests for split-index mode

733 + + t2104: make sure split index mode is off for the version test

734 + + read-cache: force split index mode with GIT_TEST_SPLIT_INDEX

735 + + read-tree: note about dropping split-index mode or index version

736 + + read-tree: force split-index mode off on --index-output

737 + + rev-parse: add --shared-index-path to get shared index path

738 + + update-index --split-index: do not split if $GIT_DIR is read only

739 + + update-index: new options to enable/disable split index mode

740 + + split-index: strip pathname of on-disk replaced entries

741 + + split-index: do not invalidate cache-tree at read time

742 + + split-index: the reading part

743 + + split-index: the writing part

744 + + read-cache: mark updated entries for split index

745 + + read-cache: save deleted entries in split index

746 + + read-cache: mark new entries for split index

747 + + read-cache: split-index mode

748 + + read-cache: save index SHA-1 after reading

749 + + entry.c: update cache_changed if refresh_cache is set in checkout_entry()

750 + + cache-tree: mark istate->cache_changed on prime_cache_tree()

751 + + cache-tree: mark istate->cache_changed on cache tree update

752 + + cache-tree: mark istate->cache_changed on cache tree invalidation

753 + + unpack-trees: be specific what part of the index has changed

754 + + resolve-undo: be specific what part of the index has changed

755 + + update-index: be specific what part of the index has changed

756 + + read-cache: be specific what part of the index has changed

757 + + read-cache: be strict about "changed" in remove_marked_cache_entries()

758 + + read-cache: store in-memory flags in the first 12 bits of ce_flags

759 + + read-cache: relocate and unexport commit_locked_index()

760 + + read-cache: new API write_locked_index instead of write_index/write_cache

761 + + sequencer: do not update/refresh index if the lock cannot be held

762 + + ewah: delete unused ewah_read_mmap_native declaration

763 + + ewah: fix constness of ewah_read_mmap

764 +

765 + An experiment to use two files (the base file and incremental

766 + changes relative to it) to represent the index to reduce I/O cost

767 + of rewriting a large index when only small part of the working tree

768 + changes.

769 +

770 + Will merge to 'master'.

771

772

773 * jc/test-lazy-prereq (2014-06-13) 1 commit

@@ -690,75 +778,51 @@ of the repositories listed at

778 Will hold.

779

780

693 -* jk/commit-buffer-length (2014-06-13) 18 commits

694 - (merged to 'next' on 2014-06-16 at b2d2d7b)

695 - + reuse cached commit buffer when parsing signatures

696 - + commit: record buffer length in cache

697 - + commit: convert commit->buffer to a slab

698 - + commit-slab: provide a static initializer

699 - + use get_commit_buffer everywhere

700 - + convert logmsg_reencode to get_commit_buffer

701 - + use get_commit_buffer to avoid duplicate code

702 - + use get_cached_commit_buffer where appropriate

703 - + provide helpers to access the commit buffer

704 - + provide a helper to set the commit buffer

705 - + provide a helper to free commit buffer

706 - + sequencer: use logmsg_reencode in get_message

707 - + logmsg_reencode: return const buffer

708 - + do not create "struct commit" with xcalloc

709 - + commit: push commit_index update into alloc_commit_node

710 - + alloc: include any-object allocations in alloc_report

711 - + replace dangerous uses of strbuf_attach

712 - + commit_tree: take a pointer/len pair rather than a const strbuf

713 -

714 - Move "commit->buffer" out of the in-core commit object and keep

715 - track of their lengths. Use this to optimize the code paths to

716 - validate GPG signatures in commit objects.

717 -

718 - Will merge to 'master'.

719 -

720 -

781 * sk/mingw-unicode-spawn-args (2014-06-16) 6 commits

722 - - Win32: Unicode arguments (incoming)

723 - - Win32: Unicode arguments (outgoing)

724 - - MinGW: disable CRT command line globbing

725 - - Win32: fix potential multi-threading issue

726 - - Win32: simplify internal mingw_spawn* APIs

727 - - Win32: let mingw_execve() return an int

782 + (merged to 'next' on 2014-06-30 at c8f79d0)

783 + + Win32: Unicode arguments (incoming)

784 + + Win32: Unicode arguments (outgoing)

785 + + MinGW: disable CRT command line globbing

786 + + Win32: fix potential multi-threading issue

787 + + Win32: simplify internal mingw_spawn* APIs

788 + + Win32: let mingw_execve() return an int

789 (this branch uses sk/mingw-main and sk/mingw-uni-console.)

790

730 - Are Windows folks happy with all four mingw topics?

791 + Will merge to 'master'.

792

793

794 * sk/mingw-dirent (2014-06-09) 5 commits

734 - - Win32 dirent: improve dirent implementation

735 - - Win32 dirent: clarify #include directives

736 - - Win32 dirent: change FILENAME_MAX to MAX_PATH

737 - - Win32 dirent: remove unused dirent.d_reclen member

738 - - Win32 dirent: remove unused dirent.d_ino member

795 + (merged to 'next' on 2014-06-30 at ae9e2d6)

796 + + Win32 dirent: improve dirent implementation

797 + + Win32 dirent: clarify #include directives

798 + + Win32 dirent: change FILENAME_MAX to MAX_PATH

799 + + Win32 dirent: remove unused dirent.d_reclen member

800 + + Win32 dirent: remove unused dirent.d_ino member

801

740 - Are Windows folks happy with all four mingw topics?

802 + Will merge to 'master'.

803

804

805 * sk/mingw-main (2014-06-10) 2 commits

744 - - mingw: avoid const warning

745 - - Win32: move main macro to a function

806 + (merged to 'next' on 2014-06-30 at 447cb50)

807 + + mingw: avoid const warning

808 + + Win32: move main macro to a function

809 (this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)

810

748 - Are Windows folks happy with all four mingw topics?

811 + Will merge to 'master'.

812

813

814 * sk/mingw-uni-console (2014-06-16) 7 commits

752 - - Win32: reliably detect console pipe handles

753 - - Win32: fix broken pipe detection

754 - - Win32: Thread-safe windows console output

755 - - Win32: add Unicode conversion functions

756 - - Win32: warn if the console font doesn't support Unicode

757 - - Win32: detect console streams more reliably

758 - - Win32: support Unicode console output

815 + (merged to 'next' on 2014-06-30 at f4fbc41)

816 + + Win32: reliably detect console pipe handles

817 + + Win32: fix broken pipe detection

818 + + Win32: Thread-safe windows console output

819 + + Win32: add Unicode conversion functions

820 + + Win32: warn if the console font doesn't support Unicode

821 + + Win32: detect console streams more reliably

822 + + Win32: support Unicode console output

823 (this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)

824

761 - Are Windows folks happy with all four mingw topics?

825 + Will merge to 'master'.

826

827

828 * mt/patch-id-stable (2014-06-10) 1 commit

@@ -770,19 +834,3 @@ of the repositories listed at

834 is left out of 'master' for now.

835

836 Will hold.

773 -

774 ---------------------------------------------------

775 -[Discarded]

776 -

777 -* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit

778 - . git-gui: show staged submodules regardless of ignore config

779 -

780 - Merged to the upstream.

781 -

782 -

783 -* jl/gitk-show-added-submodule-changes (2014-04-15) 1 commit

784 - . gitk: show staged submodules regardless of ignore config

785 -

786 - Merged to the upstream.

787 -

788 -

What's cooking (2014/07 #01)