fd6042e861 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jan 2013, #06; Mon, 14)

3 +Subject: What's cooking in git.git (Jan 2013, #07; Thu, 17)

4 X-master-at: eacf0117752780bf418d352a6ad2f033aeda1cce

5 -X-next-at: 6b4d555ffede903f47d5e5fa51348b27b331f791

5 +X-next-at: 99bfae2c22d58cfa0db9262c774d3f61a8d0dc1a

6

7 -What's cooking in git.git (Jan 2013, #06; Mon, 14)

7 +What's cooking in git.git (Jan 2013, #07; Thu, 17)

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

9

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

@@ -22,212 +22,172 @@ repositories listed at

22 --------------------------------------------------

23 [New Topics]

24

25 -* jc/cvsimport-upgrade (2013-01-14) 8 commits

26 - - t9600: adjust for new cvsimport

27 - - t9600: further prepare for sharing

28 - - cvsimport-3: add a sample test

29 - - cvsimport: make tests reusable for cvsimport-3

30 - - cvsimport: start adding cvsps 3.x support

31 - - cvsimport: introduce a version-switch wrapper

32 - - cvsimport: allow setting a custom cvsps (2.x) program name

33 - - Makefile: add description on PERL/PYTHON_PATH

25 +* fc/remote-hg-fixup-url (2013-01-15) 1 commit

26 + (merged to 'next' on 2013-01-15 at d2acb2d)

27 + + remote-hg: store converted URL

28

35 - The most important part of this series is the addition of the new

36 - cvsimport by Eric Raymond that works with cvsps 3.x. Given some

37 - distros have inertia to be conservative, Git with cvsimport that

38 - does not work with both 3.x will block adoption of cvsps 3.x by

39 - them, and shipping Git with cvsimport that does not work with cvsps

40 - 2.x will block such a version of Git, so we'll do the proven "both

41 - old and new are available, but we aim to deprecate and remove the

42 - old one in due time" strategy that we used successfully in the

43 - past.

29 + Update to the Hg remote helper (in contrib/).

30

31 + Will merge to 'master'.

32

46 -* as/pre-push-hook (2013-01-14) 3 commits

47 - - Add sample pre-push hook script

48 - - push: Add support for pre-push hooks

49 - - hooks: Add function to check if a hook exists

33

51 - Add an extra hook so that "git push" that is run without making

52 - sure what is being pushed is sane can be checked and rejected (as

53 - opposed to the user deciding not pushing).

34 +* mh/remote-hg-mode-bits-fix (2013-01-15) 1 commit

35 + (merged to 'next' on 2013-01-15 at ad57d9f)

36 + + remote-hg: fix handling of file perms when pushing

37

38 + Update to the Hg remote helper (in contrib/).

39

56 -* dl/am-hg-locale (2013-01-14) 1 commit

57 - - am: invoke perl's strftime in C locale

40 + Will merge to 'master'.

41

59 - Datestamp recorded in "Hg" format patch was reformatted incorrectly

60 - to an e-mail looking date using locale dependant strftime, causing

61 - patch application to fail.

42

43 +* jc/valgrind-memcmp-bsearch (2013-01-14) 1 commit

44 + - ignore memcmp() overreading in bsearch() callback

45

64 -* jk/config-parsing-cleanup (2013-01-14) 7 commits

65 - - [DONTMERGE] reroll coming

66 - - submodule: simplify memory handling in config parsing

67 - - submodule: use match_config_key when parsing config

68 - - userdiff: drop parse_driver function

69 - - convert some config callbacks to match_config_key

70 - - archive-tar: use match_config_key when parsing config

71 - - config: add helper function for parsing key names

46 + Squelch false positive in valgrind tests

47

73 - Expecting a reroll.

48 + Will discard.

49

75 -* mp/diff-algo-config (2013-01-14) 3 commits

76 - - diff: Introduce --diff-algorithm command line option

77 - - config: Introduce diff.algorithm variable

78 - - git-completion.bash: Autocomplete --minimal and --histogram for git-diff

50

80 - Add diff.algorithm configuration so that the user does not type

81 - "diff --histogram".

51 +* mh/imap-send-shrinkage (2013-01-15) 14 commits

52 + - imap-send.c: simplify logic in lf_to_crlf()

53 + - imap-send.c: fold struct store into struct imap_store

54 + - imap-send.c: remove unused field imap_store::uidvalidity

55 + - imap-send.c: use struct imap_store instead of struct store

56 + - imap-send.c: remove unused field imap_store::trashnc

57 + - imap-send.c: remove namespace fields from struct imap

58 + - imap-send.c: remove struct imap argument to parse_imap_list_l()

59 + - imap-send.c: inline parse_imap_list() in parse_list()

60 + - imap-send.c: remove some unused fields from struct store

61 + - imap-send.c: remove struct message

62 + - imap-send.c: remove struct store_conf

63 + - iamp-send.c: remove unused struct imap_store_conf

64 + - imap-send.c: remove struct msg_data

65 + - imap-send.c: remove msg_data::flags, which was always zero

66 +

67 + Remove a lot of unused code from "git imap-send".

68

69 + With a further comment fixup in patch #6, this seems ready for

70 + 'next'.

71 Expecting a reroll.

72

85 -* ph/rebase-preserve-all-merges (2013-01-14) 1 commit

86 - - rebase --preserve-merges: keep all merge commits including empty ones

73

88 - An earlier change to add --keep-empty option broke "git rebase

89 - --preserve-merges" and lost merge commits that end up being the

90 - same as its parent.

74 +* nd/attr-debug-fix (2013-01-15) 1 commit

75 + (merged to 'next' on 2013-01-15 at 8460acf)

76 + + attr: make it build with DEBUG_ATTR again

77

92 - Will merge to 'next'.

78 + Fix debugging support that was broken in earlier change.

79

94 -* rs/archive-tar-config-parsing-fix (2013-01-14) 1 commit

95 - - archive-tar: fix sanity check in config parsing

80 + Will merge to 'master'.

81

97 - Configuration parsing for tar.* configuration variables were

98 - broken; Peff's config parsing clean-up topic will address the same

99 - breakage, so this may be superseded by that other topic.

100 -

101 -

102 -* rs/pretty-use-prefixcmp (2013-01-14) 1 commit

103 - - pretty: use prefixcmp instead of memcmp on NUL-terminated strings

104 -

105 - Will merge to 'next'.

82

107 ---------------------------------------------------

108 -[Graduated to "master"]

83 +* nd/fix-directory-attrs-off-by-one (2013-01-16) 2 commits

84 + (merged to 'next' on 2013-01-16 at bd63e61)

85 + + attr: avoid calling find_basename() twice per path

86 + (merged to 'next' on 2013-01-15 at e0a0129)

87 + + attr: fix off-by-one directory component length calculation

88

110 -* ap/status-ignored-in-ignored-directory (2013-01-07) 3 commits

111 - (merged to 'next' on 2013-01-10 at 20f7476)

112 - + status: always report ignored tracked directories

113 - (merged to 'next' on 2013-01-07 at 2a20b19)

114 - + git-status: Test --ignored behavior

115 - + dir.c: Make git-status --ignored more consistent

89 + Fix performance regression introduced by an earlier change to let

90 + attributes apply to directories.

91

117 - Output from "git status --ignored" showed an unexpected interaction

118 - with "--untracked".

92 + Will merge to 'master'.

93

94

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

122 - (merged to 'next' on 2013-01-10 at 3132a60)

123 - + remote-testgit: properly check for errors

95 +* nd/fix-perf-parameters-in-tests (2013-01-15) 1 commit

96 + (merged to 'next' on 2013-01-15 at fedbdb9)

97 + + test-lib.sh: unfilter GIT_PERF_*

98

125 - In the longer term, tightening rules is a good thing to do, and

126 - because nobody who has worked in the remote helper area seems to be

127 - interested in reviewing this, I would assume they do not think

128 - such a retroactive tightening will affect their remote helpers. So

129 - let's advance this topic to see what happens.

99 + Allow GIT_PERF_* environment variables to be passed through the

100 + test framework.

101

102 + Will merge to 'master'.

103

132 -* jc/blame-no-follow (2012-09-21) 2 commits

133 - (merged to 'next' on 2013-01-10 at 201c7f4)

134 - + blame: pay attention to --no-follow

135 - + diff: accept --no-follow option

104

137 - Teaches "--no-follow" option to "git blame" to disable its

138 - whole-file rename detection.

105 +* pw/p4-branch-fixes (2013-01-15) 14 commits

106 + (merged to 'next' on 2013-01-15 at 1ee379e)

107 + + git p4: fix submit when no master branch

108 + + git p4 test: keep P4CLIENT changes inside subshells

109 + + git p4: fix sync --branch when no master branch

110 + + git p4: fail gracefully on sync with no master branch

111 + + git p4: rearrange self.initialParent use

112 + + git p4: allow short ref names to --branch

113 + + git p4 doc: fix branch detection example

114 + + git p4: clone --branch should checkout master

115 + + git p4: verify expected refs in clone --bare test

116 + + git p4: create p4/HEAD on initial clone

117 + + git p4: inline listExistingP4GitBranches

118 + + git p4: add comments to p4BranchesInGit

119 + + git p4: rearrange and simplify hasOrigin handling

120 + + git p4: test sync/clone --branch behavior

121

122 + Fix "git p4" around branch handling.

123

141 -* jc/format-patch-reroll (2013-01-03) 9 commits

142 - (merged to 'next' on 2013-01-07 at 0e007e6)

143 - + format-patch: give --reroll-count a short synonym -v

144 - + format-patch: document and test --reroll-count

145 - + format-patch: add --reroll-count=$N option

146 - + get_patch_filename(): split into two functions

147 - + get_patch_filename(): drop "just-numbers" hack

148 - + get_patch_filename(): simplify function signature

149 - + builtin/log.c: stop using global patch_suffix

150 - + builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()

151 - + builtin/log.c: drop unused "numbered" parameter from make_cover_letter()

124 + Will merge to 'master'.

125

153 - Originally merged to 'next' on 2013-01-04

126

155 - Teach "format-patch" to prefix v4- to its output files for the

156 - fourth iteration of a patch series, to make it easier for the

157 - submitter to keep separate copies for iterations.

127 +* ss/help-htmlpath-config-doc (2013-01-15) 1 commit

128 + (merged to 'next' on 2013-01-17 at 99bfae2)

129 + + config.txt: Document help.htmlpath config parameter

130

131 + Add missing doc.

132

160 -* jc/merge-blobs (2012-12-26) 5 commits

161 - (merged to 'next' on 2013-01-08 at 582ca38)

162 - + merge-tree: fix d/f conflicts

163 - + merge-tree: add comments to clarify what these functions are doing

164 - + merge-tree: lose unused "resolve_directories"

165 - + merge-tree: lose unused "flags" from merge_list

166 - + Which merge_file() function do you mean?

133 + Will merge to 'master'.

134

168 - Update the disused merge-tree proof-of-concept code.

135

136 +* cr/push-force-tag-update (2013-01-16) 1 commit

137 + - push: fix "refs/tags/ hierarchy cannot be updated without --force"

138

171 -* jk/maint-fast-import-doc-reorder (2013-01-09) 2 commits

172 - (merged to 'next' on 2013-01-10 at 9f3950d)

173 - + git-fast-import(1): reorganise options

174 - + git-fast-import(1): combine documentation of --[no-]relative-marks

139 + Regression fix.

140

141 + Will merge to 'next' and then to 'master' soonish.

142

177 -* jk/shortlog-no-wrap-doc (2013-01-09) 1 commit

178 - (merged to 'next' on 2013-01-10 at c79898a)

179 - + git-shortlog(1): document behaviour of zero-width wrap

143

144 +* jk/suppress-clang-warning (2013-01-16) 1 commit

145 + - fix clang -Wunused-value warnings for error functions

146

182 -* jk/unify-exit-code-by-receiving-signal (2013-01-06) 1 commit

183 - (merged to 'next' on 2013-01-08 at 5ebf940)

184 - + run-command: encode signal death as a positive integer

147 + Will merge to 'next'.

148

186 - The internal logic had to deal with two representations of a death

187 - of a child process by a signal.

149

150 +* rs/clarify-entry-cmp-sslice (2013-01-16) 1 commit

151 + - refs: use strncmp() instead of strlen() and memcmp()

152

190 -* jn/xml-depends-on-asciidoc-conf (2013-01-06) 1 commit

191 - (merged to 'next' on 2013-01-08 at 4faf8d4)

192 - + docs: manpage XML depends on asciidoc.conf

153 + Will merge to 'next'.

154

155

195 -* nd/upload-pack-shallow-must-be-commit (2013-01-08) 1 commit

196 - (merged to 'next' on 2013-01-10 at a8b3ba5)

197 - + upload-pack: only accept commits from "shallow" line

156 +* ch/add-auto-submitted-in-sample-post-receive-email (2013-01-17) 1 commit

157 + - Add Auto-Submitted header to post-receive-email

158

199 - A minor consistency check patch that does not have much relevance

200 - to the real world.

159 + Will merge to 'next'.

160

161

203 -* nz/send-email-headers-are-case-insensitive (2013-01-06) 1 commit

204 - (merged to 'next' on 2013-01-10 at cf4c9c9)

205 - + git-send-email: treat field names as case-insensitively

162 +* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

163 + - simplify-merges: drop merge from irrelevant side branch

164

207 - When user spells "cc:" in lowercase in the fake "header" in the

208 - trailer part, send-email failed to pick up the addresses from

209 - there. As e-mail headers field names are case insensitive, this

210 - script should follow suit and treat "cc:" and "Cc:" the same way.

165 + The --simplify-merges logic did not cull irrelevant parents from a

166 + merge that is otherwise not interesting with respect to the paths

167 + we are following.

168

169 + As this touches a fairly core part of the revision traversal

170 + infrastructure, it is appreciated to have an extra set of eyes for

171 + sanity check.

172

213 -* rs/zip-tests (2013-01-07) 4 commits

214 - (merged to 'next' on 2013-01-08 at 8e37423)

215 - + t5003: check if unzip supports symlinks

216 - + t5000, t5003: move ZIP tests into their own script

217 - + t0024, t5000: use test_lazy_prereq for UNZIP

218 - + t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead

173 + Waiting for comments.

174

220 - Updates zip tests to skip some that cannot be handled on platform

221 - unzip.

175

176 +* jk/remote-helpers-in-python-3 (2013-01-17) 8 commits

177 + - git-remote-testpy: call print as a function

178 + - git-remote-testpy: don't do unbuffered text I/O

179 + - git-remote-testpy: hash bytes explicitly

180 + - svn-fe: allow svnrdump_sim.py to run with Python 3

181 + - git_remote_helpers: use 2to3 if building with Python 3

182 + - git_remote_helpers: force rebuild if python version changes

183 + - git_remote_helpers: fix input when running under Python 3

184 + - git_remote_helpers: allow building with Python 3

185

224 -* rs/zip-with-uncompressed-size-in-the-header (2013-01-06) 1 commit

225 - (merged to 'next' on 2013-01-08 at d9ec30e)

226 - + archive-zip: write uncompressed size into header even with streaming

186 + Except for one instance of <user-generated-string>.encode('utf-8'),

187 + nothing looked wrong. People who have worked on git_remote_helpers

188 + should review and Ack, though.

189

228 - Improve compatibility of our zip output to fill uncompressed size

229 - in the header, which we can do without seeking back (even though it

230 - should not be necessary).

190 + Waiting for further comments.

191

192 --------------------------------------------------

193 [Stalled]

@@ -340,56 +300,172 @@ repositories listed at

300 --------------------------------------------------

301 [Cooking]

302

303 +* jc/cvsimport-upgrade (2013-01-14) 8 commits

304 + - t9600: adjust for new cvsimport

305 + - t9600: further prepare for sharing

306 + - cvsimport-3: add a sample test

307 + - cvsimport: make tests reusable for cvsimport-3

308 + - cvsimport: start adding cvsps 3.x support

309 + - cvsimport: introduce a version-switch wrapper

310 + - cvsimport: allow setting a custom cvsps (2.x) program name

311 + - Makefile: add description on PERL/PYTHON_PATH

312 +

313 + The most important part of this series is the addition of the new

314 + cvsimport by Eric Raymond that works with cvsps 3.x. Given some

315 + distros have inertia to be conservative, Git with cvsimport that

316 + does not work with both 3.x will block adoption of cvsps 3.x by

317 + them, and shipping Git with cvsimport that does not work with cvsps

318 + 2.x will block such a version of Git, so we'll do the proven "both

319 + old and new are available, but we aim to deprecate and remove the

320 + old one in due time" strategy that we used successfully in the

321 + past.

322 +

323 + Both folks on the Git side and Chris Rorvick (contributor to cvsps

324 + 3.0 and new cvsimport) seem happy with the new layout, so let's

325 + wait for a few days to see how it evolves and merge it to 'next'.

326 +

327 + Waiting for Eric to say something, but otherwise will merge to 'next'.

328 +

329 +

330 +* as/pre-push-hook (2013-01-14) 4 commits

331 + - Add sample pre-push hook script

332 + - [SQUASH???] t5571 sample hooks should consume their input

333 + - push: Add support for pre-push hooks

334 + - hooks: Add function to check if a hook exists

335 +

336 + Add an extra hook so that "git push" that is run without making

337 + sure what is being pushed is sane can be checked and rejected (as

338 + opposed to the user deciding not pushing).

339 +

340 + Will merge to 'next' after squashing the fix in.

341 +

342 +

343 +* dl/am-hg-locale (2013-01-14) 1 commit

344 + - am: invoke perl's strftime in C locale

345 +

346 + Datestamp recorded in "Hg" format patch was reformatted incorrectly

347 + to an e-mail looking date using locale dependant strftime, causing

348 + patch application to fail.

349 +

350 + This is an original "everything in C locale" version; the later one

351 + that uses LC_TIME may technically be more correct, so I may replace

352 + this with it later ($gmane/213660).

353 +

354 +

355 +* jk/config-parsing-cleanup (2013-01-14) 7 commits

356 + - [DONTMERGE] reroll coming

357 + - submodule: simplify memory handling in config parsing

358 + - submodule: use match_config_key when parsing config

359 + - userdiff: drop parse_driver function

360 + - convert some config callbacks to match_config_key

361 + - archive-tar: use match_config_key when parsing config

362 + - config: add helper function for parsing key names

363 +

364 + Expecting a reroll.

365 +

366 +

367 +* mp/diff-algo-config (2013-01-16) 3 commits

368 + - diff: Introduce --diff-algorithm command line option

369 + - config: Introduce diff.algorithm variable

370 + - git-completion.bash: Autocomplete --minimal and --histogram for git-diff

371 +

372 + Add diff.algorithm configuration so that the user does not type

373 + "diff --histogram".

374 +

375 + Looking better; may want tests to protect it from future breakages,

376 + but otherwise it looks ready for 'next'.

377 +

378 +

379 +* ph/rebase-preserve-all-merges (2013-01-14) 1 commit

380 + (merged to 'next' on 2013-01-15 at 3a67878)

381 + + rebase --preserve-merges: keep all merge commits including empty ones

382 +

383 + An earlier change to add --keep-empty option broke "git rebase

384 + --preserve-merges" and lost merge commits that end up being the

385 + same as its parent.

386 +

387 + Will merge to 'master'.

388 +

389 +

390 +* rs/archive-tar-config-parsing-fix (2013-01-14) 1 commit

391 + - archive-tar: fix sanity check in config parsing

392 +

393 + Configuration parsing for tar.* configuration variables were

394 + broken; Peff's config parsing clean-up topic will address the same

395 + breakage, so this may be superseded by that other topic.

396 +

397 +

398 +* rs/pretty-use-prefixcmp (2013-01-14) 1 commit

399 + (merged to 'next' on 2013-01-15 at d76452d)

400 + + pretty: use prefixcmp instead of memcmp on NUL-terminated strings

401 +

402 + Will merge to 'master'.

403 +

404 +

405 * rt/commit-cleanup-config (2013-01-10) 1 commit

344 - - commit: make default of "cleanup" option configurable

406 + (merged to 'next' on 2013-01-15 at c4742ae)

407 + + commit: make default of "cleanup" option configurable

408

409 Add a configuration variable to set default clean-up mode other

410 than "strip".

411

349 - Will merge to 'next'.

412 + Will merge to 'master'.

413

414

352 -* jc/custom-comment-char (2013-01-10) 1 commit

415 +* jc/custom-comment-char (2013-01-16) 1 commit

416 - Allow custom "comment char"

417

418 An illustration to show codepaths that need to be touched to change

419 the hint lines in the edited text to begin with something other

420 than '#'.

421

422 + This is half my work and half by Ralf Thielow. There may still be

423 + leftover '#' lurking around, though. My "git grep" says C code

424 + should be already fine, but git-rebase--interactive.sh could be

425 + converted (it should not matter, as the file is not really a

426 + free-form text).

427

360 -* jn/maint-trim-vim-contrib (2013-01-10) 1 commit

361 - - contrib/vim: simplify instructions for old vim support

428 + I don't know how useful this will be in real life, though.

429

363 - Will merge to 'next'.

430 + Waiting for bug reports and user feedback.

431

432

366 -* mz/reset-misc (2013-01-10) 22 commits

367 - - reset [--mixed]: use diff-based reset whether or not pathspec was given

368 - - [SQUASH???] script portability fixes

369 - - reset: allow reset on unborn branch

370 - - reset $sha1 $pathspec: require $sha1 only to be treeish

371 - - reset [--mixed] --quiet: don't refresh index

372 - - reset.c: finish entire cmd_reset() whether or not pathspec is given

373 - - reset [--mixed]: don't write index file twice

374 - - reset.c: move lock, write and commit out of update_index_refresh()

375 - - reset.c: move update_index_refresh() call out of read_from_tree()

376 - - reset: avoid redundant error message

377 - - reset --keep: only write index file once

378 - - reset.c: replace switch by if-else

379 - - reset.c: share call to die_if_unmerged_cache()

380 - - [SQUASH???] style fixes

381 - - reset.c: extract function for updating {ORIG,}HEAD

382 - - reset.c: remove unnecessary variable 'i'

383 - - [SQUASH???] style fix

384 - - reset.c: extract function for parsing arguments

385 - - reset: don't allow "git reset -- $pathspec" in bare repo

386 - - reset.c: pass pathspec around instead of (prefix, argv) pair

387 - - reset $pathspec: exit with code 0 if successful

388 - - reset $pathspec: no need to discard index

433 +* jn/maint-trim-vim-contrib (2013-01-10) 1 commit

434 + (merged to 'next' on 2013-01-15 at ad80a9d)

435 + + contrib/vim: simplify instructions for old vim support

436 +

437 + Will merge to 'master'.

438 +

439 +

440 +* mz/reset-misc (2013-01-16) 20 commits

441 + (merged to 'next' on 2013-01-16 at 937bc20)

442 + + reset: update documentation to require only tree-ish with paths

443 + (merged to 'next' on 2013-01-15 at a93b394)

444 + + reset [--mixed]: use diff-based reset whether or not pathspec was given

445 + + reset: allow reset on unborn branch

446 + + reset $sha1 $pathspec: require $sha1 only to be treeish

447 + + reset.c: inline update_index_refresh()

448 + + reset.c: finish entire cmd_reset() whether or not pathspec is given

449 + + reset [--mixed]: only write index file once

450 + + reset.c: move lock, write and commit out of update_index_refresh()

451 + + reset.c: move update_index_refresh() call out of read_from_tree()

452 + + reset.c: replace switch by if-else

453 + + reset: avoid redundant error message

454 + + reset --keep: only write index file once

455 + + reset.c: share call to die_if_unmerged_cache()

456 + + reset.c: extract function for updating {ORIG_,}HEAD

457 + + reset.c: remove unnecessary variable 'i'

458 + + reset.c: extract function for parsing arguments

459 + + reset: don't allow "git reset -- $pathspec" in bare repo

460 + + reset.c: pass pathspec around instead of (prefix, argv) pair

461 + + reset $pathspec: exit with code 0 if successful

462 + + reset $pathspec: no need to discard index

463

464 Various 'reset' optimizations and clean-ups, followed by a change

465 to allow "git reset" to work even on an unborn branch.

466

467 + Will merge to 'master'.

468 +

469

470 * pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit

471 (merged to 'next' on 2013-01-14 at 6b4d555)

@@ -401,39 +477,46 @@ repositories listed at

477 variable; the documentation implied that it is stronger than the

478 configuration like $GIT_COMMITTER_EMAIL is, which is wrong.

479

480 + Will merge to 'master'.

481 +

482

483 * ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit

406 - - git-completion.bash: silence "not a valid object" errors

484 + (merged to 'next' on 2013-01-15 at 7542d21)

485 + + git-completion.bash: silence "not a valid object" errors

486

487 An internal ls-tree call made by completion code only to probe if

488 a path exists in the tree recorded in a commit object leaked error

489 messages when the path is not there. It is not an error at all and

490 should not be shown to the end user.

491

413 - Will merge to 'next'.

492 + Will merge to 'master'.

493

494

495 * nd/fetch-depth-is-broken (2013-01-11) 3 commits

417 - - fetch: elaborate --depth action

418 - - upload-pack: fix off-by-one depth calculation in shallow clone

419 - - fetch: add --unshallow for turning shallow repo into complete one

496 + (merged to 'next' on 2013-01-15 at 70a5ca7)

497 + + fetch: elaborate --depth action

498 + + upload-pack: fix off-by-one depth calculation in shallow clone

499 + + fetch: add --unshallow for turning shallow repo into complete one

500

501 "git fetch --depth" was broken in at least three ways. The

502 resulting history was deeper than specified by one commit, it was

503 unclear how to wipe the shallowness of the repository with the

504 command, and documentation was misleading.

505

426 - Will merge to 'next'.

506 + Will cook in 'next'.

507

508

509 * jc/no-git-config-in-clone (2013-01-11) 1 commit

430 - - clone: do not export and unexport GIT_CONFIG

510 + (merged to 'next' on 2013-01-15 at feeffe1)

511 + + clone: do not export and unexport GIT_CONFIG

512

513 We stopped paying attention to $GIT_CONFIG environment that points

514 at a single configuration file from any command other than "git config"

515 quite a while ago, but "git clone" internally set, exported, and

516 then unexported the variable during its operation unnecessarily.

517

518 + Will cook in 'next'.

519 +

520

521 * mk/complete-tcsh (2013-01-07) 1 commit

522 (merged to 'next' on 2013-01-11 at b8b30b1)

@@ -442,6 +525,8 @@ repositories listed at

525 Update tcsh command line completion so that an unwanted space is

526 not added to a single directory name.

527

528 + Will merge to 'master'.

529 +

530

531 * dg/subtree-fixes (2013-01-08) 7 commits

532 - contrib/subtree: mkdir the manual directory if needed

@@ -452,9 +537,10 @@ repositories listed at

537 - contrib/subtree: use %B for split Subject/Body

538 - t7900: remove test number comments

539

455 - contrib/subtree updates.

540 + contrib/subtree updates; there are a few more from T. Zheng that

541 + were posted separately, with an overlap.

542

457 - Rerolled?

543 + Expecting a reroll.

544

545

546 * ap/log-mailmap (2013-01-10) 11 commits

@@ -474,8 +560,14 @@ repositories listed at

560 Teach commands in the "log" family to optionally pay attention to

561 the mailmap.

562

563 + Will merge to 'master'.

564

478 -* jc/push-2.0-default-to-simple (2013-01-08) 11 commits

565 +

566 +* jc/push-2.0-default-to-simple (2013-01-16) 14 commits

567 + (merged to 'next' on 2013-01-16 at 23f5df2)

568 + + t5570: do not assume the "matching" push is the default

569 + + t5551: do not assume the "matching" push is the default

570 + + t5550: do not assume the "matching" push is the default

571 (merged to 'next' on 2013-01-09 at 74c3498)

572 + doc: push.default is no longer "matching"

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

@@ -493,9 +585,12 @@ repositories listed at

585

586

587 * nd/clone-no-separate-git-dir-with-bare (2013-01-10) 1 commit

496 - - clone: forbid --bare --separate-git-dir <dir>

588 + (merged to 'next' on 2013-01-15 at 64f441a)

589 + + clone: forbid --bare --separate-git-dir <dir>

590

498 - Will merge to 'next'.

591 + Forbid a useless combination of options to "git clone".

592 +

593 + Will merge to 'master'.

594

595

596 * nd/parse-pathspec (2013-01-11) 20 commits

@@ -562,7 +657,8 @@ repositories listed at

657 Will cook in 'next' for a while to see if anybody screams.

658

659

565 -* as/check-ignore (2013-01-10) 12 commits

660 +* as/check-ignore (2013-01-16) 13 commits

661 + - clean.c, ls-files.c: respect encapsulation of exclude_list_groups

662 (merged to 'next' on 2013-01-14 at 9df2afc)

663 + t0008: avoid brace expansion

664 + add git-check-ignore sub-command

@@ -580,6 +676,11 @@ repositories listed at

676 Add a new command "git check-ignore" for debugging .gitignore

677 files.

678

679 + The variable names may want to get cleaned up but that can be done

680 + in-tree.

681 +

682 + Will merge to 'next'.

683 +

684

685 * nd/retire-fnmatch (2013-01-01) 7 commits

686 (merged to 'next' on 2013-01-07 at ab31f9b)

@@ -608,14 +709,15 @@ repositories listed at

709

710

711 * zk/clean-report-failure (2013-01-14) 1 commit

611 - - git-clean: Display more accurate delete messages

712 + (merged to 'next' on 2013-01-15 at 5b31614)

713 + + git-clean: Display more accurate delete messages

714

715 "git clean" states what it is going to remove and then goes on to

716 remove it, but sometimes it only discovers things that cannot be

717 removed after recursing into a directory, which makes the output

718 confusing and even wrong.

719

618 - Will merge to 'next'.

720 + Will merge to 'master'.

721

722

723 * bc/append-signed-off-by (2013-01-01) 12 commits

What's cooking (2013/01 #07)