3a0d924885 · matheusbsbs/matheus-bagliano

@@ -1,19 +1,17 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2012, #09; Mon, 29)

4 -X-master-at: 9c50374497d5a3259907e32455f228cfbda85ddf

5 -X-next-at: 62af90c6ff5fe91113e2f69a60caae6ef7d54614

3 +Subject: What's cooking in git.git (Nov 2012, #01; Sun, 4)

4 +X-master-at: f07e5551a845b45076bf5c45118e16efa69610c4

5 +X-next-at: 54991f2bb33a966609ff94ac4f8824bf9091ad7d

6

7 -What's cooking in git.git (Oct 2012, #09; Mon, 29)

7 +What's cooking in git.git (Nov 2012, #01; Sun, 4)

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 second batch of topics has graduated to master. Most of the new

15 -topics have been minor bugfixes or documentation updates, so I've merged

16 -a lot of those to master.

14 +The third batch of topics has graduated to master.

15

16 You can find the changes described here in the integration branches of

17 my repository at:

@@ -26,223 +24,193 @@ updated.

24 --------------------------------------------------

25 [New Topics]

26

29 -* fc/completion-test-simplification (2012-10-29) 2 commits

30 - - completion: simplify __gitcomp test helper

31 - - completion: refactor __gitcomp related tests

32 -

33 - Clean up completion tests.

27 +* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit

28 + - commit: fixup misplacement of --no-post-rewrite description

29

30 Will merge to 'next'.

31

32

38 -* fc/remote-testgit-feature-done (2012-10-29) 1 commit

39 - - remote-testgit: properly check for errors

40 -

41 -

42 -* jk/maint-diff-grep-textconv (2012-10-28) 1 commit

43 - - diff_grep: use textconv buffers for add/deleted files

44 - (this branch is used by jk/pickaxe-textconv.)

33 +* fc/remote-bzr (2012-11-04) 3 commits

34 + - remote-bzr: add simple tests

35 + - remote-bzr: add support for pushing

36 + - Add new remote-bzr transport helper

37

46 - Fixes inconsistent use of textconv with "git log -G".

38 + New remote helper for bzr.

39

48 - Will merge to 'next'.

40

41 +* fc/remote-hg (2012-11-04) 16 commits

42 + - remote-hg: the author email can be null

43 + - remote-hg: add option to not track branches

44 + - remote-hg: add extra author test

45 + - remote-hg: add tests to compare with hg-git

46 + - remote-hg: add bidirectional tests

47 + - test-lib: avoid full path to store test results

48 + - remote-hg: add basic tests

49 + - remote-hg: fake bookmark when there's none

50 + - remote-hg: add compat for hg-git author fixes

51 + - remote-hg: add support for hg-git compat mode

52 + - remote-hg: match hg merge behavior

53 + - remote-hg: make sure the encoding is correct

54 + - remote-hg: add support to push URLs

55 + - remote-hg: add support for remote pushing

56 + - remote-hg: add support for pushing

57 + - Add new remote-hg transport helper

58

51 -* jk/pickaxe-textconv (2012-10-28) 2 commits

52 - - pickaxe: use textconv for -S counting

53 - - pickaxe: hoist empty needle check

54 - (this branch uses jk/maint-diff-grep-textconv.)

59 + New remote helper for hg.

60

56 - Use textconv filters when searching with "log -S".

61 + May want to do one more round of review on the list.

62

58 - Waiting for a sanity check and review from Junio.

63 + Most of the discussion so far has been on whether to pursue this versus

64 + what's in msysgit, and not on the specifics of the code. I'd like to

65 + put this in next soon, but it probably makes sense for everybody to

66 + give it a final look-over.

67

68

61 -* km/maint-doc-git-reset (2012-10-29) 1 commit

62 - (merged to 'next' on 2012-10-29 at cdb4e8f)

63 - + doc: git-reset: make "<mode>" optional

69 +* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits

70 + - remote-curl: retry failed requests for auth even with gzip

71 + - remote-curl: hoist gzip buffer size to top of post_rpc

72

65 - Will merge to 'master' in the third batch.

73 + Fixes fetch from servers that ask for auth only during the actual

74 + packing phase. This is not really a recommended configuration, but it

75 + cleans up the code at the same time.

76

77 + Will merge to 'next'.

78

68 -* mh/maint-parse-dirstat-fix (2012-10-29) 1 commit

69 - - parse_dirstat_params(): use string_list to split comma-separated string

79

71 - Cleans up some code and avoids a potential bug.

80 +* js/hp-nonstop (2012-10-30) 1 commit

81 + - fix 'make test' for HP NonStop

82

83 Will merge to 'next'.

84

85

76 -* nd/builtin-to-libgit (2012-10-29) 7 commits

77 - - fetch-pack: move core code to libgit.a

78 - - fetch-pack: remove global (static) configuration variable "args"

79 - - send-pack: move core code to libgit.a

80 - - Move setup_diff_pager to libgit.a

81 - - Move print_commit_list to libgit.a

82 - - Move estimate_bisect_steps to libgit.a

83 - - Move try_merge_command and checkout_fast_forward to libgit.a

84 -

85 - Code cleanups so that libgit.a does not depend on anything in the

86 - builtin/ directory.

86 +* kb/preload-index-more (2012-11-02) 1 commit

87 + - update-index/diff-index: use core.preloadindex to improve performance

88

88 - Some of the code movement is pretty big, but there doesn't seem to be

89 - any conflicts with topics in flight.

89 + Use preloadindex in more places, which has a nice speedup on systems

90 + with slow stat calls (and even on Linux).

91

92 Will merge to 'next'.

93

94

94 -* ph/maint-submodule-status-fix (2012-10-29) 2 commits

95 - - submodule status: remove unused orig_* variables

96 - - t7407: Fix recursive submodule test

95 +* mh/notes-string-list (2012-11-04) 5 commits

96 + - string_list_add_refs_from_colon_sep(): use string_list_split()

97 + - notes: fix handling of colon-separated values

98 + - combine_notes_cat_sort_uniq(): sort and dedup lines all at once

99 + - Initialize sort_uniq_list using named constant

100 + - string_list: add a function string_list_remove_empty_items()

101

98 - Cleans up some leftover bits from an earlier submodule change.

102 + Improve the asymptotic performance of the cat_sort_uniq notes merge

103 + strategy.

104

105 Will merge to 'next'.

106

107

103 -* pp/maint-doc-pager-config (2012-10-29) 1 commit

104 - (merged to 'next' on 2012-10-29 at 434fbd0)

105 - + Documentation: improve the example of overriding LESS via core.pager

108 +* mh/strbuf-split (2012-11-04) 4 commits

109 + - strbuf_split*(): document functions

110 + - strbuf_split*(): rename "delim" parameter to "terminator"

111 + - strbuf_split_buf(): simplify iteration

112 + - strbuf_split_buf(): use ALLOC_GROW()

113

107 - Will merge to 'master' in the third batch.

114 + Cleanups and documentation for strbuf_split.

115

116 + Will merge to 'next'.

117

110 -* rf/maint-mailmap-off-by-one (2012-10-28) 1 commit

111 - (merged to 'next' on 2012-10-29 at 8c2214b)

112 - + mailmap: avoid out-of-bounds memory access

118

114 - Will merge to 'master' in the third batch.

119 +* mm/maint-doc-commit-edit (2012-11-02) 1 commit

120 + - Document 'git commit --no-edit' explicitly

121

122 + Will merge to 'next'.

123

117 -* sz/maint-submodule-reference-arg (2012-10-26) 1 commit

118 - (merged to 'next' on 2012-10-29 at 1aab03c)

119 - + submodule add: fix handling of --reference=<repo> option

120 -

121 - Will merge to 'master' in the third batch.

124

125 +--------------------------------------------------

126 +[Graduated to "master"]

127

124 -* tb/maint-t9200-case-insensitive (2012-10-28) 1 commit

125 - (merged to 'next' on 2012-10-29 at 62af90c)

126 - + Fix t9200 on case insensitive file systems

128 +* gb/maint-doc-svn-log-window-size (2012-10-26) 1 commit

129 + (merged to 'next' on 2012-10-29 at ee50b22)

130 + + Document git-svn fetch --log-window-size parameter

131

132 Will merge to 'master' in the third batch.

133

134

131 -* tj/maint-doc-commit-sign (2012-10-29) 1 commit

132 - (merged to 'next' on 2012-10-29 at 44c61a0)

133 - + Add -S, --gpg-sign option to manpage of "git commit"

135 +* km/maint-doc-git-reset (2012-10-29) 1 commit

136 + (merged to 'next' on 2012-10-29 at cdb4e8f)

137 + + doc: git-reset: make "<mode>" optional

138

139 Will merge to 'master' in the third batch.

140

141

138 ---------------------------------------------------

139 -[Graduated to "master"]

140 -

141 -* jc/grep-pcre-loose-ends (2012-10-09) 7 commits

142 - (merged to 'next' on 2012-10-25 at 2ea9b27)

143 - + log: honor grep.* configuration

144 - + log --grep: accept --basic-regexp and --perl-regexp

145 - + log --grep: use the same helper to set -E/-F options as "git grep"

146 - + revisions: initialize revs->grep_filter using grep_init()

147 - + grep: move pattern-type bits support to top-level grep.[ch]

148 - + grep: move the configuration parsing logic to grep.[ch]

149 - + builtin/grep.c: make configuration callback more reusable

142 +* mm/maint-doc-remote-tracking (2012-10-25) 1 commit

143 + (merged to 'next' on 2012-10-25 at 80f1592)

144 + + Documentation: remote tracking branch -> remote-tracking branch

145

151 - "git log -F -E --grep='<ere>'" failed to use the given <ere>

152 - pattern as extended regular expression, and instead looked for the

153 - string literally. The early part of this series is a fix for it.

146 + We long ago hyphenated "remote-tracking branch"; this

147 + catches some new instances added since then.

148

155 - Will merge to 'master' in the second batch after 1.8.0 ships.

149 + Will merge to 'master' in the third batch.

150

151

158 -* jk/maint-http-init-not-in-result-handler (2012-10-12) 2 commits

159 - (merged to 'next' on 2012-10-25 at 59d3687)

160 - + http: do not set up curl auth after a 401

161 - + remote-curl: do not call run_slot repeatedly

152 +* ph/pull-rebase-detached (2012-10-25) 1 commit

153 + (merged to 'next' on 2012-10-25 at 73d9d14)

154 + + git-pull: Avoid merge-base on detached head

155

163 - Further clean-up to the http codepath that picks up results after

164 - cURL library is done with one request slot.

156 + Avoids spewing error messages when using "pull --rebase" on a

157 + detached HEAD.

158

166 - Will merge to 'master' in the second batch after 1.8.0 ships.

159 + Will merge to 'master' in the third batch.

160

161

169 -* jk/sh-setup-in-filter-branch (2012-10-18) 2 commits

170 - (merged to 'next' on 2012-10-25 at 3879f0e)

171 - + filter-branch: use git-sh-setup's ident parsing functions

172 - + git-sh-setup: refactor ident-parsing functions

162 +* po/maint-refs-replace-docs (2012-10-25) 1 commit

163 + (merged to 'next' on 2012-10-25 at 3874c9d)

164 + + Doc repository-layout: Show refs/replace

165

174 - Will merge to 'master' in the second batch after 1.8.0 ships.

166 + The refs/replace hierarchy was not mentioned in the

167 + repository-layout docs.

168

169 + Will merge to 'master' in the third batch.

170

177 -* jl/submodule-add-by-name (2012-09-30) 2 commits

178 - (merged to 'next' on 2012-10-25 at a322082)

179 - + submodule add: Fail when .git/modules/<name> already exists unless forced

180 - + Teach "git submodule add" the --name option

171

182 - If you remove a submodule, in order to keep the repository so that

183 - "git checkout" to an older commit in the superproject history can

184 - resurrect the submodule, the real repository will stay in $GIT_DIR

185 - of the superproject. A later "git submodule add $path" to add a

186 - different submodule at the same path will fail. Diagnose this case

187 - a bit better, and if the user really wants to add an unrelated

188 - submodule at the same path, give the "--name" option to give it a

189 - place in $GIT_DIR of the superproject that does not conflict with

190 - the original submodule.

172 +* pp/maint-doc-pager-config (2012-10-29) 1 commit

173 + (merged to 'next' on 2012-10-29 at 434fbd0)

174 + + Documentation: improve the example of overriding LESS via core.pager

175

192 - Will merge to 'master' in the second batch after 1.8.0 ships.

176 + Will merge to 'master' in the third batch.

177

178

195 -* jl/submodule-rm (2012-09-29) 1 commit

196 - (merged to 'next' on 2012-10-25 at 0fb5876)

197 - + submodule: teach rm to remove submodules unless they contain a git directory

179 +* rf/maint-mailmap-off-by-one (2012-10-28) 1 commit

180 + (merged to 'next' on 2012-10-29 at 8c2214b)

181 + + mailmap: avoid out-of-bounds memory access

182

199 - "git rm submodule" cannot blindly remove a submodule directory as

200 - its working tree may have local changes, and worse yet, it may even

201 - have its repository embedded in it. Teach it some special cases

202 - where it is safe to remove a submodule, specifically, when there is

203 - no local changes in the submodule working tree, and its repository

204 - is not embedded in its working tree but is elsewhere and uses the

205 - gitfile mechanism to point at it.

183 + Will merge to 'master' in the third batch.

184

207 - Will merge to 'master' in the second batch after 1.8.0 ships.

185

186 +* sl/maint-configure-messages (2012-10-25) 1 commit

187 + (merged to 'next' on 2012-10-25 at e1d7ecd)

188 + + configure: fix some output message

189

210 -* nd/grep-true-path (2012-10-12) 1 commit

211 - (merged to 'next' on 2012-10-25 at 1c7d320)

212 - + grep: stop looking at random places for .gitattributes

190 + Minor message fixes for the configure script.

191

214 - "git grep -e pattern <tree>" asked the attribute system to read

215 - "<tree>:.gitattributes" file in the working tree, which was

216 - nonsense.

192 + Will merge to 'master' in the third batch.

193

218 - Will merge to 'master' in the second batch after 1.8.0 ships.

194

195 +* sz/maint-submodule-reference-arg (2012-10-26) 1 commit

196 + (merged to 'next' on 2012-10-29 at 1aab03c)

197 + + submodule add: fix handling of --reference=<repo> option

198

221 -* nd/status-long (2012-10-18) 1 commit

222 - (merged to 'next' on 2012-10-25 at ff1b3a0)

223 - + status: add --long output format option

199 + Will merge to 'master' in the third batch.

200

225 - Allow an earlier "--short" option on the command line to be

226 - countermanded with the "--long" option for "git status" and "git

227 - commit".

201

229 - Will merge to 'master' in the second batch after 1.8.0 ships.

202 +* tb/maint-t9200-case-insensitive (2012-10-28) 1 commit

203 + (merged to 'next' on 2012-10-29 at 62af90c)

204 + + Fix t9200 on case insensitive file systems

205

206 + Will merge to 'master' in the third batch.

207

232 -* rs/branch-del-symref (2012-10-18) 5 commits

233 - (merged to 'next' on 2012-10-25 at c2cd358)

234 - + branch: show targets of deleted symrefs, not sha1s

235 - + branch: skip commit checks when deleting symref branches

236 - + branch: delete symref branch, not its target

237 - + branch: factor out delete_branch_config()

238 - + branch: factor out check_branch_commit()

239 - (this branch is used by jh/update-ref-d-through-symref.)

208

241 - A symbolic ref refs/heads/SYM was not correctly removed with

242 - "git branch -d SYM"; the command removed the ref pointed by

243 - SYM instead.

209 +* tj/maint-doc-commit-sign (2012-10-29) 1 commit

210 + (merged to 'next' on 2012-10-29 at 44c61a0)

211 + + Add -S, --gpg-sign option to manpage of "git commit"

212

245 - Will merge to 'master' in the second batch after 1.8.0 ships.

213 + Will merge to 'master' in the third batch.

214

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

216 [Stalled]

@@ -376,6 +344,8 @@ updated.

344 pathname we obtain from getcwd(), leading the GIT_DIR discovery

345 logic to escape the ceilings the user thought to have specified.

346

347 + Need to look at v4 which made it to the list.

348 +

349

350 * mo/cvs-server-cleanup (2012-10-26) 11 commits

351 (merged to 'next' on 2012-10-29 at 4e70622)

@@ -450,37 +420,40 @@ updated.

420

421

422 * jc/prettier-pretty-note (2012-10-26) 11 commits

453 - - Doc User-Manual: Patch cover letter, three dashes, and --notes

454 - - Doc format-patch: clarify --notes use case

455 - - Doc notes: Include the format-patch --notes option

456 - - Doc SubmittingPatches: Mention --notes option after "cover letter"

457 - - Documentation: decribe format-patch --notes

458 - - format-patch --notes: show notes after three-dashes

459 - - format-patch: append --signature after notes

460 - - pretty_print_commit(): do not append notes message

461 - - pretty: prepare notes message at a centralized place

462 - - format_note(): simplify API

463 - - pretty: remove reencode_commit_message()

423 + (merged to 'next' on 2012-11-04 at 40e3e48)

424 + + Doc User-Manual: Patch cover letter, three dashes, and --notes

425 + + Doc format-patch: clarify --notes use case

426 + + Doc notes: Include the format-patch --notes option

427 + + Doc SubmittingPatches: Mention --notes option after "cover letter"

428 + + Documentation: decribe format-patch --notes

429 + + format-patch --notes: show notes after three-dashes

430 + + format-patch: append --signature after notes

431 + + pretty_print_commit(): do not append notes message

432 + + pretty: prepare notes message at a centralized place

433 + + format_note(): simplify API

434 + + pretty: remove reencode_commit_message()

435

436 Now that Philip has submitted some documentation updates, this is

437 looking more ready.

438

468 - Will merge to 'next'.

439 + Will merge to master in the fifth batch.

440

441

442 * sz/maint-curl-multi-timeout (2012-10-19) 1 commit

472 - - Fix potential hang in https handshake

443 + (merged to 'next' on 2012-11-04 at f696dd8)

444 + + Fix potential hang in https handshake

445

446 Sometimes curl_multi_timeout() function suggested a wrong timeout

447 value when there is no file descriptors to wait on and the http

448 transport ended up sleeping for minutes in select(2) system call.

449 Detect this and reduce the wait timeout in such a case.

450

479 - Will merge to 'next'.

451 + Will merge to master in the fourth batch.

452

453

482 -* jc/same-encoding (2012-10-18) 1 commit

483 - - reencode_string(): introduce and use same_encoding()

454 +* jc/same-encoding (2012-11-04) 1 commit

455 + (merged to 'next' on 2012-11-04 at 54991f2)

456 + + reencode_string(): introduce and use same_encoding()

457

458 Various codepaths checked if two encoding names are the same using

459 ad-hoc code and some of them ended up asking iconv() to convert

@@ -489,28 +462,32 @@ updated.

462 equated them in some but not all codepaths. Introduce a new helper

463 function to make these codepaths consistent.

464

492 - Will merge to 'next' after fixing up commit message.

465 + will merge to master in the fourth batch.

466

467

468 * nd/tree-walk-enum-cleanup (2012-10-19) 1 commit

496 - - tree-walk: use enum interesting instead of integer

469 + (merged to 'next' on 2012-11-04 at 8ccdf98)

470 + + tree-walk: use enum interesting instead of integer

471

498 - Will merge to 'next'.

472 + Will merge to master in the fourth batch.

473

474

501 -* cr/cvsimport-local-zone (2012-10-16) 1 commit

502 - - git-cvsimport: allow author-specific timezones

475 +* cr/cvsimport-local-zone (2012-11-04) 2 commits

476 + (merged to 'next' on 2012-11-04 at 292f0b4)

477 + + cvsimport: work around perl tzset issue

478 + + git-cvsimport: allow author-specific timezones

479

480 Allows "cvsimport" to read per-author timezone from the author info

481 file.

482

507 - Will merge to 'next'.

483 + Will merge to master in the fifth batch.

484

485

486 * fc/completion-send-email-with-format-patch (2012-10-16) 1 commit

511 - - completion: add format-patch options to send-email

487 + (merged to 'next' on 2012-11-04 at 0a6366e)

488 + + completion: add format-patch options to send-email

489

513 - Will merge to 'next'.

490 + Will merge to master in the fourth batch.

491

492

493 * fc/zsh-completion (2012-10-29) 3 commits

@@ -708,22 +685,24 @@ updated.

685

686

687 * jc/maint-fetch-tighten-refname-check (2012-10-19) 1 commit

711 - - get_fetch_map(): tighten checks on dest refs

688 + (merged to 'next' on 2012-11-04 at eda85ef)

689 + + get_fetch_map(): tighten checks on dest refs

690

691 This was split out from discarded jc/maint-push-refs-all topic.

692

715 - Will merge to 'next'.

693 + Will merge to master in the fifth batch.

694

695

696 * jh/symbolic-ref-d (2012-10-21) 1 commit

719 - - git symbolic-ref --delete $symref

697 + (merged to 'next' on 2012-11-04 at b0762f5)

698 + + git symbolic-ref --delete $symref

699

700 Add "symbolic-ref -d SYM" to delete a symbolic ref SYM.

701

702 It is already possible to remove a symbolic ref with "update-ref -d

703 --no-deref", but it may be a good addition for completeness.

704

726 - Will merge to 'next'.

705 + Will merge to master in the fifth batch.

706

707

708 * jh/update-ref-d-through-symref (2012-10-21) 2 commits

@@ -734,13 +713,6 @@ updated.

713 that points to it did not remove it correctly.

714

715

737 -* gb/maint-doc-svn-log-window-size (2012-10-26) 1 commit

738 - (merged to 'next' on 2012-10-29 at ee50b22)

739 - + Document git-svn fetch --log-window-size parameter

740 -

741 - Will merge to 'master' in the third batch.

742 -

743 -

716 * jk/config-ignore-duplicates (2012-10-29) 9 commits

717 (merged to 'next' on 2012-10-29 at 67fa0a2)

718 + builtin/config.c: Fix a sparse warning

@@ -761,51 +733,88 @@ updated.

733 Will cook in 'next'.

734

735

764 -* mm/maint-doc-remote-tracking (2012-10-25) 1 commit

765 - (merged to 'next' on 2012-10-25 at 80f1592)

766 - + Documentation: remote tracking branch -> remote-tracking branch

736 +* ph/submodule-sync-recursive (2012-10-29) 2 commits

737 + (merged to 'next' on 2012-11-04 at a000f78)

738 + + Add tests for submodule sync --recursive

739 + + Teach --recursive to submodule sync

740

768 - We long ago hyphenated "remote-tracking branch"; this

769 - catches some new instances added since then.

741 + Adds "--recursive" option to submodule sync.

742

771 - Will merge to 'master' in the third batch.

743 + Will merge to master in the fifth batch.

744

745

774 -* ph/pull-rebase-detached (2012-10-25) 1 commit

775 - (merged to 'next' on 2012-10-25 at 73d9d14)

776 - + git-pull: Avoid merge-base on detached head

746 +* fc/completion-test-simplification (2012-10-29) 2 commits

747 + - completion: simplify __gitcomp test helper

748 + - completion: refactor __gitcomp related tests

749

778 - Avoids spewing error messages when using "pull --rebase" on a

779 - detached HEAD.

750 + Clean up completion tests.

751

781 - Will merge to 'master' in the third batch.

752 + There were some comments on the list.

753

754 + Expecting a re-roll.

755

784 -* ph/submodule-sync-recursive (2012-10-29) 2 commits

785 - - Add tests for submodule sync --recursive

786 - - Teach --recursive to submodule sync

756

788 - Adds "--recursive" option to submodule sync.

757 +* fc/remote-testgit-feature-done (2012-10-29) 1 commit

758 + - remote-testgit: properly check for errors

759

790 - Will merge to 'next'.

760 + Needs review.

761

762

793 -* po/maint-refs-replace-docs (2012-10-25) 1 commit

794 - (merged to 'next' on 2012-10-25 at 3874c9d)

795 - + Doc repository-layout: Show refs/replace

763 +* jk/maint-diff-grep-textconv (2012-10-28) 1 commit

764 + (merged to 'next' on 2012-11-04 at 790337b)

765 + + diff_grep: use textconv buffers for add/deleted files

766 + (this branch is used by jk/pickaxe-textconv.)

767

797 - The refs/replace hierarchy was not mentioned in the

798 - repository-layout docs.

768 + Fixes inconsistent use of textconv with "git log -G".

769

800 - Will merge to 'master' in the third batch.

770 + Will merge to 'master' in the fifth batch.

771

772

803 -* sl/maint-configure-messages (2012-10-25) 1 commit

804 - (merged to 'next' on 2012-10-25 at e1d7ecd)

805 - + configure: fix some output message

773 +* jk/pickaxe-textconv (2012-10-28) 2 commits

774 + - pickaxe: use textconv for -S counting

775 + - pickaxe: hoist empty needle check

776 + (this branch uses jk/maint-diff-grep-textconv.)

777

807 - Minor message fixes for the configure script.

778 + Use textconv filters when searching with "log -S".

779

809 - Will merge to 'master' in the third batch.

780 + Waiting for a sanity check and review from Junio.

781 +

782 +

783 +* mh/maint-parse-dirstat-fix (2012-10-29) 1 commit

784 + (merged to 'next' on 2012-11-04 at 852d609)

785 + + parse_dirstat_params(): use string_list to split comma-separated string

786 +

787 + Cleans up some code and avoids a potential bug.

788 +

789 + Will merge master in the fourth batch.

790 +

791 +

792 +* nd/builtin-to-libgit (2012-10-29) 7 commits

793 + (merged to 'next' on 2012-11-04 at 06cbf9b)

794 + + fetch-pack: move core code to libgit.a

795 + + fetch-pack: remove global (static) configuration variable "args"

796 + + send-pack: move core code to libgit.a

797 + + Move setup_diff_pager to libgit.a

798 + + Move print_commit_list to libgit.a

799 + + Move estimate_bisect_steps to libgit.a

800 + + Move try_merge_command and checkout_fast_forward to libgit.a

801 +

802 + Code cleanups so that libgit.a does not depend on anything in the

803 + builtin/ directory.

804 +

805 + Some of the code movement is pretty big, but there doesn't seem to be

806 + any conflicts with topics in flight.

807 +

808 + Will merge to master in the fourth batch.

809 +

810 +

811 +* ph/maint-submodule-status-fix (2012-10-29) 2 commits

812 + (merged to 'next' on 2012-11-04 at d700e02)

813 + + submodule status: remove unused orig_* variables

814 + + t7407: Fix recursive submodule test

815 +

816 + Cleans up some leftover bits from an earlier submodule change.

817 +

818 + Will merge to master in the fourth batch.

819

820

What's cooking (2012/11 #01)