3f6258e80e · matheusbsbs/matheus-bagliano

@@ -1,20 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2012, #08; Thu, 25)

4 -X-master-at: 2cfceefaca16d64baecf0ba9bcd4e05229d9c31b

5 -X-next-at: 73d9d14c037055c674779c1538fc7bfddf428db0

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

4 +X-master-at: 9c50374497d5a3259907e32455f228cfbda85ddf

5 +X-next-at: 62af90c6ff5fe91113e2f69a60caae6ef7d54614

6

7 -What's cooking in git.git (Oct 2012, #08; Thu, 25)

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

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 -Now that 1.8.0 is out, I've graduated the first batch of topics to

15 -master. I've also picked up some topics from the list, mostly

16 -documentation fixes that went straight to next. I haven't yet moved any

17 -of the cooking topics up to next.

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.

17

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

19 my repository at:

@@ -27,166 +26,230 @@ updated.

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

27 [New Topics]

28

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

31 - - Document git-svn fetch --log-window-size parameter

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

30 + - completion: simplify __gitcomp test helper

31 + - completion: refactor __gitcomp related tests

32

33 -Looks good to me, but I'd like to get an ack from svn folks.

33 + Clean up completion tests.

34

35 + Will merge to 'next'.

36

36 -* jk/config-ignore-duplicates (2012-10-24) 8 commits

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

38 - + git-config: use git_config_with_options

39 - + git-config: do not complain about duplicate entries

40 - + git-config: collect values instead of immediately printing

41 - + git-config: fix regexp memory leaks on error conditions

42 - + git-config: remove memory leak of key regexp

43 - + t1300: test "git config --get-all" more thoroughly

44 - + t1300: remove redundant test

45 - + t1300: style updates

37

47 -Drop duplicate detection from git-config; this lets it

48 -better match the internal config callbacks, which clears up

49 -some corner cases with includes.

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

39 + - remote-testgit: properly check for errors

40

41

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

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

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

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.)

45

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

57 -catches some new instances added since then.

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

47

48 + Will merge to 'next'.

49

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

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

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

50

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

65 -detached HEAD.

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.)

55

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

57

68 -* ph/submodule-sync-recursive (2012-10-24) 2 commits

69 - - Add tests for submodule sync --recursive

70 - - Teach --recursive to submodule sync

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

59

72 -I'd like review from submodule folks on this one.

60

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

64

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

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

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

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

66

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

80 -repository-layout docs.

67

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

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

70

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

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

85 - + configure: fix some output message

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

72 +

73 + Will merge to 'next'.

74 +

75 +

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.

87 +

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

89 + any conflicts with topics in flight.

90 +

91 + Will merge to 'next'.

92 +

93 +

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

95 + - submodule status: remove unused orig_* variables

96 + - t7407: Fix recursive submodule test

97 +

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

99 +

100 + Will merge to 'next'.

101 +

102 +

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

106 +

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

108 +

109 +

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

113 +

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

115 +

116 +

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.

122 +

123 +

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

127 +

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

129 +

130 +

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"

134 +

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

136

87 -Minor message fixes for the configure script.

137

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

139 [Graduated to "master"]

140

92 -* bw/config-lift-variable-name-length-limit (2012-10-01) 1 commit

93 - (merged to 'next' on 2012-10-08 at 69f54f4)

94 - + Remove the hard coded length limit on variable names in config files

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

150

96 - The configuration parser had an unnecessary hardcoded limit on

97 - variable names that was not checked consistently. Lift the limit.

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.

154 +

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

156 +

157 +

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

162

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

164 + cURL library is done with one request slot.

165

100 -* da/mergetools-p4 (2012-10-11) 1 commit

101 - (merged to 'next' on 2012-10-12 at 16f5c06)

102 - + mergetools/p4merge: Handle "/dev/null"

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

167

168

105 -* fa/remote-svn (2012-10-07) 16 commits

106 - (merged to 'next' on 2012-10-07 at 7b90cf4)

107 - + Add a test script for remote-svn

108 - + remote-svn: add marks-file regeneration

109 - + Add a svnrdump-simulator replaying a dump file for testing

110 - + remote-svn: add incremental import

111 - + remote-svn: Activate import/export-marks for fast-import

112 - + Create a note for every imported commit containing svn metadata

113 - + vcs-svn: add fast_export_note to create notes

114 - + Allow reading svn dumps from files via file:// urls

115 - + remote-svn, vcs-svn: Enable fetching to private refs

116 - + When debug==1, start fast-import with "--stats" instead of "--quiet"

117 - + Add documentation for the 'bidi-import' capability of remote-helpers

118 - + Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability

119 - + Add argv_array_detach and argv_array_free_detached

120 - + Add svndump_init_fd to allow reading dumps from arbitrary FDs

121 - + Add git-remote-testsvn to Makefile

122 - + Implement a remote helper for svn in C

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

173 +

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

175

124 - A GSoC project.

176

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

181

127 -* jc/test-say-color-avoid-echo-escape (2012-10-11) 1 commit

128 - (merged to 'next' on 2012-10-11 at 639036d)

129 - + test-lib: Fix say_color () not to interpret \a\b\c in the message

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.

191

131 - Recent nd/wildmatch series was the first to reveal this ancient bug

132 - in the test scaffolding.

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

193

194

135 -* jk/no-more-pre-exec-callback (2012-06-05) 1 commit

136 - (merged to 'next' on 2012-10-12 at 69fed45)

137 - + pager: drop "wait for output to run less" hack

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

198

139 - (Originally merged to 'next' on 2012-07-23)

140 - Removes a workaround for buggy version of less older than version

141 - 406.

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.

206

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

208

144 -* jk/peel-ref (2012-10-04) 4 commits

145 - (merged to 'next' on 2012-10-08 at 4adfa2f)

146 - + upload-pack: use peel_ref for ref advertisements

147 - + peel_ref: check object type before loading

148 - + peel_ref: do not return a null sha1

149 - + peel_ref: use faster deref_tag_noverify

209

151 - Speeds up "git upload-pack" (what is invoked by "git fetch" on the

152 - other side of the connection) by reducing the cost to advertise the

153 - branches and tags that are available in the repository.

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

213

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

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

216 + nonsense.

217

156 -* jk/strbuf-detach-always-non-null (2012-10-18) 1 commit

157 - (merged to 'next' on 2012-10-18 at 54561c7)

158 - + strbuf: always return a non-NULL value from strbuf_detach

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

219

220

161 -* jm/diff-context-config (2012-10-02) 2 commits

162 - (merged to 'next' on 2012-10-02 at e57700a)

163 - + t4055: avoid use of sed 'a' command

164 - (merged to 'next' on 2012-10-01 at 509a558)

165 - + diff: diff.context configuration gives default to -U

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

224

167 - Teaches a new configuration variable to "git diff" Porcelain and

168 - its friends.

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".

228

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

230

171 -* js/mingw-fflush-errno (2012-10-17) 1 commit

172 - (merged to 'next' on 2012-10-18 at 43d6ebb)

173 - + maybe_flush_or_die: move a too-loose Windows specific error

231

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.)

240

176 -* nd/attr-match-optim (2012-10-05) 2 commits

177 - (merged to 'next' on 2012-10-08 at bfbdd8a)

178 - + attr: avoid searching for basename on every match

179 - + attr: avoid strlen() on every match

180 - (this branch is used by as/check-ignore, nd/attr-match-optim-more and nd/wildmatch.)

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.

244

182 - Trivial and obvious optimization for finding attributes that match

183 - a given path.

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

246

247 --------------------------------------------------

248 [Stalled]

249

250 * rc/maint-complete-git-p4 (2012-09-24) 1 commit

189 - - Teach git-completion about git p4

251 + (merged to 'next' on 2012-10-29 at af52cef)

252 + + Teach git-completion about git p4

253

254 Comment from Pete will need to be addressed in a follow-up patch.

255

@@ -299,9 +362,9 @@ Minor message fixes for the configure script.

362 --------------------------------------------------

363 [Cooking]

364

302 -* mh/ceiling (2012-10-21) 8 commits

365 +* mh/ceiling (2012-10-29) 8 commits

366 - string_list_longest_prefix(): remove function

304 - - normalize_ceiling_entry(): resolve symlinks

367 + - setup_git_directory_gently_1(): resolve symlinks in ceiling paths

368 - longest_ancestor_length(): require prefix list entries to be normalized

369 - longest_ancestor_length(): take a string_list argument for prefixes

370 - longest_ancestor_length(): use string_list_split()

@@ -314,7 +377,9 @@ Minor message fixes for the configure script.

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

378

379

317 -* mo/cvs-server-cleanup (2012-10-16) 10 commits

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

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

382 + + Use character class for sed expression instead of \s

383 (merged to 'next' on 2012-10-25 at c70881d)

384 + cvsserver status: provide real sticky info

385 + cvsserver: cvs add: do not expand directory arguments

@@ -326,10 +391,14 @@ Minor message fixes for the configure script.

391 + cvsserver: add comments about database schema/usage

392 + cvsserver: removed unused sha1Or-k mode from kopts_from_path

393 + cvsserver t9400: add basic 'cvs log' test

329 - (this branch is used by mo/cvs-server-updates.)

394 + (this branch is tangled with mo/cvs-server-updates.)

395

396 + Cleanups to prepare for mo/cvs-server-updates.

397

332 -* mo/cvs-server-updates (2012-10-16) 10 commits

398 + Will merge to 'master' in the fourth batch.

399 +

400 +

401 +* mo/cvs-server-updates (2012-10-16) 20 commits

402 - cvsserver Documentation: new cvs ... -r support

403 - cvsserver: add t9402 to test branch and tag refs

404 - cvsserver: support -r and sticky tags for most operations

@@ -340,7 +409,20 @@ Minor message fixes for the configure script.

409 - cvsserver: define a tag name character escape mechanism

410 - cvsserver: cleanup extra slashes in filename arguments

411 - cvsserver: factor out git-log parsing logic

343 - (this branch uses mo/cvs-server-cleanup.)

412 + (merged to 'next' on 2012-10-25 at c70881d)

413 + + cvsserver status: provide real sticky info

414 + + cvsserver: cvs add: do not expand directory arguments

415 + + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix

416 + + cvsserver: split up long lines in req_{status,diff,log}

417 + + cvsserver: clean up client request handler map comments

418 + + cvsserver: remove unused functions _headrev and gethistory

419 + + cvsserver update: comment about how we shouldn't remove a user-modified file

420 + + cvsserver: add comments about database schema/usage

421 + + cvsserver: removed unused sha1Or-k mode from kopts_from_path

422 + + cvsserver t9400: add basic 'cvs log' test

423 + (this branch is tangled with mo/cvs-server-cleanup.)

424 +

425 + Needs review by folks interested in cvsserver.

426

427

428 * ta/doc-cleanup (2012-10-25) 6 commits

@@ -354,6 +436,8 @@ Minor message fixes for the configure script.

436 Misapplication of a patch fixed; the ones near the tip needs to

437 update the links to point at the html files, though.

438

439 + Needs follow-up on Junio's comment above.

440 +

441

442 * lt/diff-stat-show-0-lines (2012-10-17) 1 commit

443 - Fix "git diff --stat" for interesting - but empty - file changes

@@ -362,8 +446,10 @@ Minor message fixes for the configure script.

446 permission bit was modified, or (worse yet) a new file without any

447 content in the "git diff --stat" output.

448

449 + Needs some test updates.

450 +

451

366 -* jc/prettier-pretty-note (2012-10-25) 11 commits

452 +* 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

@@ -376,42 +462,10 @@ Minor message fixes for the configure script.

462 - format_note(): simplify API

463 - pretty: remove reencode_commit_message()

464

379 - Needs updates to the placeholder documentation.

380 -

381 -

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

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

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

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

386 -

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

388 -

389 -

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

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

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

393 -

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

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

396 - commit".

397 -

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

399 -

400 -

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

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

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

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

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

406 - + branch: factor out delete_branch_config()

407 - + branch: factor out check_branch_commit()

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

409 -

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

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

412 - SYM instead.

465 + Now that Philip has submitted some documentation updates, this is

466 + looking more ready.

467

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

468 + Will merge to 'next'.

469

470

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

@@ -422,6 +476,8 @@ Minor message fixes for the configure script.

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

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

478

479 + Will merge to 'next'.

480 +

481

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

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

@@ -433,31 +489,13 @@ Minor message fixes for the configure script.

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

490 function to make these codepaths consistent.

491

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

493 +

494

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

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

497

440 -

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

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

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

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

445 -

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

447 - cURL library is done with one request slot.

448 -

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

450 -

451 -

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

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

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

455 -

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

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

458 - nonsense.

459 -

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

498 + Will merge to 'next'.

499

500

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

@@ -466,15 +504,21 @@ Minor message fixes for the configure script.

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

505 file.

506

507 + Will merge to 'next'.

508 +

509

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

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

512

513 + Will merge to 'next'.

514 +

515

474 -* fc/zsh-completion (2012-10-15) 3 commits

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

517 - completion: add new zsh completion

476 - - tests: use __gitcompadd to simplify completion tests

518 - completion: add new __gitcompadd helper

519 + - completion: get rid of empty COMPREPLY assignments

520 +

521 + Needs comments from completion folks.

522

523

524 * jc/apply-trailing-blank-removal (2012-10-12) 1 commit

@@ -510,8 +554,10 @@ Minor message fixes for the configure script.

554 SYM, it incorrectly locked the underlying reference pointed by SYM,

555 not the symbolic ref itself.

556

557 + Will merge to 'master' in the fourth batch.

558 +

559

514 -* as/check-ignore (2012-10-19) 13 commits

560 +* as/check-ignore (2012-10-29) 13 commits

561 - Documentation/check-ignore: we show the deciding match, not the first

562 - Add git-check-ignore sub-command

563 - dir.c: provide free_directory() for reclaiming dir_struct memory

@@ -529,6 +575,8 @@ Minor message fixes for the configure script.

575

576 Duy helped to reroll this.

577

578 + Expecting another re-roll.

579 +

580

581 * js/format-2047 (2012-10-18) 7 commits

582 (merged to 'next' on 2012-10-25 at 76d91fe)

@@ -542,12 +590,15 @@ Minor message fixes for the configure script.

590

591 Fixes many rfc2047 quoting issues in the output from format-patch.

592

593 + Will merge to 'master' in the fourth batch.

594 +

595

596 * km/send-email-compose-encoding (2012-10-25) 5 commits

547 - - git-send-email: add rfc2047 quoting for "=?"

548 - - git-send-email: introduce quote_subject()

549 - - git-send-email: skip RFC2047 quoting for ASCII subjects

550 - - git-send-email: use compose-encoding for Subject

597 + (merged to 'next' on 2012-10-29 at d7d2bb4)

598 + + git-send-email: add rfc2047 quoting for "=?"

599 + + git-send-email: introduce quote_subject()

600 + + git-send-email: skip RFC2047 quoting for ASCII subjects

601 + + git-send-email: use compose-encoding for Subject

602 (merged to 'next' on 2012-10-25 at 5447367)

603 + git-send-email: introduce compose-encoding

604

@@ -555,7 +606,9 @@ Minor message fixes for the configure script.

606 cover letter message, but there was not a way to mark it with

607 appropriate content type before sending it out.

608

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

609 + Further updates fix subject quoting.

610 +

611 + Will merge to 'master' in the fourth batch.

612

613

614 * so/prompt-command (2012-10-17) 4 commits

@@ -569,6 +622,8 @@ Minor message fixes for the configure script.

622 instead of being used for command substitution in $PS1, to embed

623 color escape sequences in its output.

624

625 + Will 'cook' in next.

626 +

627

628 * aw/rebase-am-failure-detection (2012-10-11) 1 commit

629 - rebase: Handle cases where format-patch fails

@@ -604,6 +659,8 @@ Minor message fixes for the configure script.

659 commits that touch Documentation/git.txt, which would be confusing

660 to the users.

661

662 + Will cook in 'next'.

663 +

664

665 * jk/lua-hackery (2012-10-07) 6 commits

666 - pretty: fix up one-off format_commit_message calls

@@ -632,55 +689,7 @@ Minor message fixes for the configure script.

689 Start laying the foundation to build the "wildmatch" after we can

690 agree on its desired semantics.

691

635 -

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

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

638 - + log: honor grep.* configuration

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

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

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

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

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

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

645 -

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

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

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

649 -

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

651 -

652 -

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

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

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

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

657 -

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

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

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

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

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

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

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

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

666 - the original submodule.

667 -

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

669 -

670 -

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

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

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

674 -

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

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

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

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

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

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

681 - gitfile mechanism to point at it.

682 -

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

692 + Will merge to 'master' in the fourth batch.

693

694

695 * nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits

@@ -703,6 +712,8 @@ Minor message fixes for the configure script.

712

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

714

715 + Will merge to 'next'.

716 +

717

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

719 - git symbolic-ref --delete $symref

@@ -712,104 +723,89 @@ Minor message fixes for the configure script.

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

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

725

726 + Will merge to 'next'.

727 +

728

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

730 - Fix failure to delete a packed ref through a symref

731 - t1400-update-ref: Add test verifying bug with symrefs in delete_ref()

719 - (this branch uses rs/branch-del-symref.)

732

733 "update-ref -d --deref SYM" to delete a ref through a symbolic ref

734 that points to it did not remove it correctly.

735

736

725 ---------------------------------------------------

726 -[Discarded]

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

728 -* fa/vcs-svn (2012-10-07) 4 commits

729 - - vcs-svn: remove repo_tree

730 - - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()

731 - - vcs-svn/svndump: restructure node_ctx, rev_ctx handling

732 - - svndump: move struct definitions to .h

733 - (this branch uses fa/remote-svn.)

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

742

735 - A follow-up to a GSoC project, but seems not quite ready.

743

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

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

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

747 + (merged to 'next' on 2012-10-25 at 233df08)

748 + + git-config: use git_config_with_options

749 + + git-config: do not complain about duplicate entries

750 + + git-config: collect values instead of immediately printing

751 + + git-config: fix regexp memory leaks on error conditions

752 + + git-config: remove memory leak of key regexp

753 + + t1300: test "git config --get-all" more thoroughly

754 + + t1300: remove redundant test

755 + + t1300: style updates

756

738 -* ph/credential-refactor (2012-09-02) 5 commits

739 - - wincred: port to generic credential helper

740 - - Merge branch 'ef/win32-cred-helper' into ph/credential-refactor

741 - - osxkeychain: port to generic credential helper implementation

742 - - gnome-keyring: port to generic helper implementation

743 - - contrib: add generic credential helper

757 + Drop duplicate detection from git-config; this lets it

758 + better match the internal config callbacks, which clears up

759 + some corner cases with includes.

760

745 - Attempts to refactor to share code among OSX keychain, Gnome keyring

746 - and Win32 credential helpers. Turns out that the sharing wasn't

747 - big enough to worth the churn.

761 + Will cook in 'next'.

762

763

750 -* ms/contrib-thunderbird-updates (2012-08-31) 2 commits

751 - - [SQUASH] minimum fixup

752 - - Thunderbird: fix appp.sh format problems

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

767

754 - Update helper to send out format-patch output using Thunderbird.

755 - Seems to have design regression for silent users.

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

769 + catches some new instances added since then.

770

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

772

758 -* jx/test-real-path (2012-08-27) 1 commit

759 - - test: set the realpath of CWD as TRASH_DIRECTORY

773

761 - Running tests with the "trash" directory elsewhere with the "--root"

762 - option did not work well if the directory was specified by a symbolic

763 - link pointing at it.

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

777

765 - Seems broken as it makes $(pwd) and TRASH_DIRECTORY inconsistent.

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

779 + detached HEAD.

780 +

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

782 +

783 +

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

785 + - Add tests for submodule sync --recursive

786 + - Teach --recursive to submodule sync

787 +

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

789 +

790 + Will merge to 'next'.

791 +

792 +

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

796 +

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

798 + repository-layout docs.

799 +

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

801 +

802 +

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

806 +

807 + Minor message fixes for the configure script.

808 +

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

810

811

768 -* jc/maint-push-refs-all (2012-08-27) 2 commits

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

770 - - [BROKEN] fetch/push: allow refs/*:refs/*

771 -

772 - This is broken (see the log message there). "git fetch/push

773 - $there 'refs/*:refs/*'" already propagates heads, tags, notes,

774 - etc. hierarchies; an attempt to propagate refs/stash will fail

775 - against an older version of the other side and is not worth

776 - supporting.

777 -

778 -

779 -* tx/relative-in-the-future (2012-08-16) 2 commits

780 - - date: show relative dates in the future

781 - - date: refactor the relative date logic from presentation

782 -

783 - Not my itch; rewritten an earlier submission by Tom Xue into

784 - somewhat more maintainable form, though it breaks existing i18n.

785 -

786 - Was waiting for a voluteer to fix it up, which never happend.

787 -

788 -

789 -* jc/split-blob (2012-04-03) 6 commits

790 - - chunked-object: streaming checkout

791 - - chunked-object: fallback checkout codepaths

792 - - bulk-checkin: support chunked-object encoding

793 - - bulk-checkin: allow the same data to be multiply hashed

794 - - new representation types in the packstream

795 - - packfile: use varint functions

796 -

797 - I finished the streaming checkout codepath, but as explained in

798 - 127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),

799 - these are still early steps of a long and painful journey. At least

800 - pack-objects and fsck need to learn the new encoding for the series

801 - to be usable locally, and then index-pack/unpack-objects needs to

802 - learn it to be used remotely.

803 -

804 - Given that I heard a lot of noise that people want large files, and

805 - that I was asked by somebody at GitTogether'11 privately for an

806 - advice on how to pay developers (not me) to help adding necessary

807 - support, I am somewhat disappointed that the original patch series

808 - that was sent long time ago still remains here without much comments

809 - and updates from the developer community. I even made the interface

810 - to the logic that decides where to split chunks easily replaceable,

811 - and I deliberately made the logic in the original patch extremely

812 - stupid to entice others, especially the "bup" fanbois, to come up

813 - with a better logic, thinking that giving people an easy target to

814 - shoot for, they may be encouraged to help out. The plan is not

815 - working :-<.

What's cooking (2012/10 #09)