e48b8fba13 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Nov 2009, #06; Wed, 25)

3 -X-master-at: ad7ace714d353ef49045bc37c1363e8fc904792d

4 -X-next-at: 71380f5fbda0088bc2b94876e2a3b3bf74d6651f

2 +Subject: What's cooking in git.git (Nov 2009, #07; Sun, 29)

3 +X-master-at: 66abce05dd5b9da9c889034781dc3de38b6e231b

4 +X-next-at: c4469778c3a4538c370b02fd190f6ed5a8139b58

5

6 -What's cooking in git.git (Nov 2009, #06; Wed, 25)

6 +What's cooking in git.git (Nov 2009, #07; Sun, 29)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -56,95 +56,54 @@ backward compatible. Currently planned changes are:

56

57 http://thread.gmane.org/gmane.comp.version-control.git/133256

58

59 ---------------------------------------------------

60 -[Graduated to "master"]

61 -

62 -* bg/fetch-multi (2009-11-10) 9 commits.

63 - (merged to 'next' on 2009-11-21 at 282f464)

64 - + Re-implement 'git remote update' using 'git fetch'

65 - + builtin-fetch: add --dry-run option

66 - + builtin-fetch: add --prune option

67 - + teach warn_dangling_symref to take a FILE argument

68 - + remote: refactor some logic into get_stale_heads()

69 - + Add missing test for 'git remote update --prune'

70 - + Add the configuration option skipFetchAll

71 - + Teach the --multiple option to 'git fetch'

72 - + Teach the --all option to 'git fetch'

73 -

74 -* bg/apply-doc (2009-11-22) 4 commits

75 - (merged to 'next' on 2009-11-22 at b42fece)

76 - + apply: Use the term "working tree" consistently

77 - + apply: Format all options using back-quotes

78 - + apply: apply works outside a repository

79 - + Clarify and correct -z

80 -

81 -* cc/replace (2009-11-19) 3 commits

82 - (merged to 'next' on 2009-11-21 at 2aaf84b)

83 - + Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS

84 - + Documentation: fix typos and spelling in replace documentation

85 - + replace: use a GIT_NO_REPLACE_OBJECTS env variable

86 -

87 -* mm/maint-hint-failed-merge (2009-11-22) 2 commits.

88 - (merged to 'next' on 2009-11-22 at c0f64c2)

89 - + user-manual: Document that "git merge" doesn't like uncommited changes.

90 - + merge-recursive: point the user to commit when file would be overwritten.

91 -

92 -* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.

93 - (merged to 'next' on 2009-11-22 at 4ba5880)

94 - + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)

95 - + git-count-objects: Fix a disk-space under-estimate on Cygwin

96 -

97 -* rs/color-escape-has-zero-width (2009-11-23) 1 commit

98 - + Teach %w() that color escape codes have zero width

99 -

100 -* jc/log-stdin (2009-11-23) 5 commits

101 - (merged to 'next' on 2009-11-23 at ea71363)

102 - + Add trivial tests for --stdin option to log family

103 - (merged to 'next' on 2009-11-21 at c3e2e52)

104 - + Make --stdin option to "log" family read also pathspecs

105 - + setup_revisions(): do not call get_pathspec() too early

106 - + Teach --stdin option to "log" family

107 - + read_revision_from_stdin(): use strbuf

108 -

109 -* mr/gitweb-snapshot (2009-11-07) 4 commits.

110 - (merged to 'next' on 2009-11-21 at e825ad9)

111 - + gitweb: Smarter snapshot names

112 - + gitweb: Document current snapshot rules via new tests

113 - + t/gitweb-lib.sh: Split gitweb output into headers and body

114 - (merged to 'next' on 2009-10-11 at 22ba047)

115 - + gitweb: check given hash before trying to create snapshot

116 -

117 -* rs/work-around-grep-opt-insanity (2009-11-23) 2 commits.

118 - (merged to 'next' on 2009-11-25 at bf972d8)

119 - + Protect scripted Porcelains from GREP_OPTIONS insanity

120 - + mergetool--lib: simplify guess_merge_tool()

121 -

59 --------------------------------------------------

60 [New Topics]

61

125 -* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits

126 - (merged to 'next' on 2009-11-25 at 8aa62a0)

127 - + Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"

128 - (merged to 'next' on 2009-11-22 at 4ba5880)

129 - + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)

62 +* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.

63 + - format-patch: add test for parsing of "--"

64 + - format-patch: fix parsing of "--" on the command line

65

131 -This is a revert of the tip one I merged prematurely to 'next'. The real

132 -fix from Ramsay is already in 'master'.

66 +* bw/diff-color-hunk-header (2009-11-27) 2 commits

67 + (merged to 'next' on 2009-11-29 at c446977)

68 + + Give the hunk comment its own color

69 + (merged to 'next' on 2009-11-27 at 42ab131)

70 + + emit_line(): don't emit an empty <SET><RESET> followed by a newline

71

134 -* jc/grep-full-tree (2009-11-24) 1 commit.

135 - - grep: --full-tree

72 +* jc/maint-am-keep (2009-11-27) 1 commit.

73 + (merged to 'next' on 2009-11-27 at 7663874)

74 + + Remove dead code from "git am"

75

137 -We probably would want test, doc and a configuration variable to make it

138 -default (or non-default) before we can merge it to 'master'.

76 +* tr/http-updates (2009-11-27) 2 commits

77 + - Add an option for using any HTTP authentication scheme, not only basic

78 + - http: maintain curl sessions

79

140 -* uk/maint-shortlog-encoding (2009-11-25) 1 commit.

141 - - shortlog: respect commit encoding

80 +* jc/diff-whitespace-prepare (2009-11-28) 2 commits

81 + - diff: flip the default diff.bwoutputonly to true

82 + - diff: optionally allow traditional "-b/-w affects only output" semantics

83 + (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)

84

143 -The fix is a maint material but the patch was against next, so I

144 -back-rebased it myself. I tried to be careful but please double check the

145 -result.

85 +This is to redo the two -b/-w semantic changes to prepare the migration of

86 +existing users before 1.7.0 happens.

87

147 -Perhaps merge it to 'master' before 1.6.6-rc1?

88 +* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits

89 + - diff: disable diff.bwoutputonly warning

90 + - diff: flip the diff.bwoutputonly default to false

91 + (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)

92 +

93 +And this is to actually flip the default and eventually remove the warning.

94 +

95 +* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit

96 + - prepare send-email for smoother change of --chain-reply-to default

97 + (this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)

98 +

99 +Similarly, this is to start warning about the change to --no-chain-reply-to

100 +in 1.7.0 for smoother transition.

101 +

102 +* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit

103 + - send-email: make --no-chain-reply-to the default

104 + (this branch uses ns/send-email-no-chain-reply-to.)

105 +

106 +And this is to actually flip the default in 1.7.0.

107

108 --------------------------------------------------

109 [Stalled]

@@ -159,33 +118,11 @@ the message is sent) of this feature, but the feature itself needs its own

118 test to verify the negative case (i.e. does it correctly stop if the user

119 says "no"?)

120

162 -* fc/send-email-envelope (2009-11-22) 1 commit.

163 - - t9001: test --envelope-sender option of send-email

164 -

165 -The new feature itself looked promising; this is just an unrelated test

166 -patch.

167 -

121 * jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit

122 - git-pull.sh --rebase: overhaul error handling when no candidates are found

123

124 I heard this needs at least retitling among other changes?

125

173 -* sr/vcs-helper (2009-11-18) 12 commits

174 - - Add Python support library for remote helpers

175 - - Basic build infrastructure for Python scripts

176 - - Allow helpers to report in "list" command that the ref is unchanged

177 - - Fix various memory leaks in transport-helper.c

178 - - Allow helper to map private ref names into normal names

179 - - Add support for "import" helper command

180 - - Allow specifying the remote helper in the url

181 - - Add a config option for remotes to specify a foreign vcs

182 - - Allow fetch to modify refs

183 - - Use a function to determine whether a remote is valid

184 - - Allow programs to not depend on remotes having urls

185 - - Fix memory leak in helper method for disconnect

186 -

187 -Replaced again, and looking good. Perhaps Daniel has some comments?

188 -

126 * jh/notes (2009-11-20) 10 commits

127 - Add more testcases to test fast-import of notes

128 - Rename t9301 to t9350, to make room for more fast-import tests

@@ -237,6 +174,44 @@ Sverre is working on a re-roll to address comments from Shawn.

174 --------------------------------------------------

175 [Cooking]

176

177 +* sr/vcs-helper (2009-11-18) 12 commits

178 + (merged to 'next' on 2009-11-27 at 83268ab)

179 + + Add Python support library for remote helpers

180 + + Basic build infrastructure for Python scripts

181 + + Allow helpers to report in "list" command that the ref is unchanged

182 + + Fix various memory leaks in transport-helper.c

183 + + Allow helper to map private ref names into normal names

184 + + Add support for "import" helper command

185 + + Allow specifying the remote helper in the url

186 + + Add a config option for remotes to specify a foreign vcs

187 + + Allow fetch to modify refs

188 + + Use a function to determine whether a remote is valid

189 + + Allow programs to not depend on remotes having urls

190 + + Fix memory leak in helper method for disconnect

191 +

192 +* jc/grep-full-tree (2009-11-24) 1 commit.

193 + - grep: --full-tree

194 +

195 +The interaction with this option and pathspecs need to be worked out

196 +better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from

197 +all the header files in the tree, for example.

198 +

199 +* uk/maint-shortlog-encoding (2009-11-25) 1 commit.

200 + - shortlog: respect commit encoding

201 +

202 +The fix is a maint material but the patch was against next, so I

203 +back-rebased it myself. I tried to be careful but please double check the

204 +result.

205 +

206 +Perhaps merge it to 'master' before 1.6.6-rc1?

207 +

208 +* fc/send-email-envelope (2009-11-26) 2 commits.

209 + (merged to 'next' on 2009-11-27 at 2d0257d)

210 + + send-email: automatic envelope sender

211 + + t9001: test --envelope-sender option of send-email

212 +

213 +Perhaps merge it to 'master' before 1.6.6-rc1?

214 +

215 * jc/mailinfo-remove-brackets (2009-07-15) 1 commit.

216 (merged to 'next' on 2009-11-25 at 09d498f)

217 + mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker

@@ -291,10 +266,8 @@ end users, but I think the code and feature is solid.

266 Perhaps merge it to 'master' before 1.6.6-rc1?

267

268 * cc/bisect-doc (2009-11-08) 1 commit

294 - - Documentation: add "Fighting regressions with git bisect" article

295 -

296 -Nobody seems to think this should go to Documentation/technical instead,

297 -so unless I hear otherwise, we will have it as-is in 'next' shortly.

269 + (merged to 'next' on 2009-11-27 at c46d648)

270 + + Documentation: add "Fighting regressions with git bisect" article

271

272 Perhaps merge it to 'master' before 1.6.6-rc1?

273

@@ -323,15 +296,18 @@ Perhaps merge it to 'master' before 1.6.6-rc1?

296 + update-index: refactor mark_valid() in preparation for new options

297

298 * jc/pretty-lf (2009-10-04) 1 commit.

326 - - Pretty-format: %[+-]x to tweak inter-item newlines

299 + (merged to 'next' on 2009-11-27 at 73651c4)

300 + + Pretty-format: %[+-]x to tweak inter-item newlines

301

328 -Perhaps drop the "%-x" part and merge it to 'next' and to 'master' before

329 -1.6.6?

302 +Perhaps merge it to 'master' before 1.6.6-rc1?

303

304 --------------------------------------------------

305 [For 1.7.0]

306

334 -* jk/1.7.0-status (2009-09-05) 5 commits.

307 +* jk/1.7.0-status (2009-11-27) 7 commits.

308 + (merged to 'next' on 2009-11-27 at 91691ec)

309 + + t7508-status.sh: Add tests for status -s

310 + + status -s: respect the status.relativePaths option

311 (merged to 'next' on 2009-11-21 at 884bb56)

312 + docs: note that status configuration affects only long format

313 (merged to 'next' on 2009-10-11 at 65c8513)

@@ -344,6 +320,10 @@ Perhaps drop the "%-x" part and merge it to 'next' and to 'master' before

320 Gives the --short output format to post 1.7.0 "git commit --dry-run" that

321 is similar to that of post 1.7.0 "git status".

322

323 +Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a

324 +few commits at the tip, as "docs: affects only long format" describes a

325 +limitation that will disappear soon.

326 +

327 * jc/1.7.0-status (2009-09-05) 4 commits.

328 (merged to 'next' on 2009-10-11 at 9558627)

329 + status: typo fix in usage

@@ -364,20 +344,49 @@ With this, "git status" is no longer "git commit --dry-run".

344 + Make test case number unique

345 + diff: Rename QUIET internal option to QUICK

346 + diff: change semantics of "ignore whitespace" options

347 + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

348

349 This changes exit code from "git diff --ignore-whitespace" and friends

369 -when there is no actual output. It is a backward incompatible change, but

370 -we could argue that it is a bugfix.

350 +when there is no actual output. It is a backward incompatible change,

351 +and jc/diff-whitespace-prepare topic is meant to ease the transition.

352

372 -* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit

353 +* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit

354 (merged to 'next' on 2009-11-21 at 3375bf4)

355 + No diff -b/-w output for all-whitespace changes

356 + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

357 +

358 +Likewise.

359

360 * jc/1.7.0-push-safety (2009-02-09) 2 commits.

361 (merged to 'next' on 2009-10-11 at 81b8128)

362 + Refuse deleting the current branch via push

363 + Refuse updating the current branch in a non-bare repository via push

364

365 +--------------------------------------------------

366 +[Reverted from 'next']

367 +

368 +* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits

369 + (merged to 'next' on 2009-11-25 at 8aa62a0)

370 + + Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"

371 + (merged to 'next' on 2009-11-22 at 4ba5880)

372 + + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)

373 +

374 +This is a revert of the tip one I merged prematurely to 'next'. The real

375 +fix from Ramsay is already in 'master'.

376 +

377 +* ks/precompute-completion (2009-11-15) 4 commits.

378 + (merged to 'next' on 2009-11-15 at 23cdb96)

379 + + Revert ks/precompute-completion series

380 + (merged to 'next' on 2009-10-28 at cd5177f)

381 + + completion: ignore custom merge strategies when pre-generating

382 + (merged to 'next' on 2009-10-22 at f46a28a)

383 + + bug: precomputed completion includes scripts sources

384 + (merged to 'next' on 2009-10-14 at adf722a)

385 + + Speedup bash completion loading

386 +

387 +Reverted out of 'next', to be replaced with jn/faster-completion-startup

388 +topic.

389 +

390 --------------------------------------------------

391 [I have been too busy to purge these]

392

@@ -411,16 +420,3 @@ pass the tests when merged to 'pu', so it has been ejected for now.

420

421 I picked these up but didn't queue as Warthog9's comments made certain

422 amount of sense to me.

414 -

415 -* ks/precompute-completion (2009-11-15) 4 commits.

416 - (merged to 'next' on 2009-11-15 at 23cdb96)

417 - + Revert ks/precompute-completion series

418 - (merged to 'next' on 2009-10-28 at cd5177f)

419 - + completion: ignore custom merge strategies when pre-generating

420 - (merged to 'next' on 2009-10-22 at f46a28a)

421 - + bug: precomputed completion includes scripts sources

422 - (merged to 'next' on 2009-10-14 at adf722a)

423 - + Speedup bash completion loading

424 -

425 -Reverted out of 'next', to be replaced with jn/faster-completion-startup

426 -topic.

What's cooking (2009/11 #07)