2c2f72ac4c · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Nov 2009, #05; Sun, 22)

3 -X-master-at: 12fb25dce80f6804da73e0b9451caeeddb1b16d9

4 -X-next-at: 7074fe79a7635c32006bb5f62bfbfb3c84e69f43

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

3 +X-master-at: ad7ace714d353ef49045bc37c1363e8fc904792d

4 +X-next-at: 71380f5fbda0088bc2b94876e2a3b3bf74d6651f

5

6 -What's cooking in git.git (Nov 2009, #05; Sun, 22)

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

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

8

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

@@ -42,7 +42,7 @@ backward compatible. Currently planned changes are:

42

43 http://article.gmane.org/gmane.comp.version-control.git/109790

44

45 - * git-status won't be "git-commit --dry-run" anymore

45 + * "git status" won't be "git-commit --dry-run" anymore

46

47 http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993

48

@@ -56,206 +56,20 @@ backward compatible. Currently planned changes are:

56

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

58

59 -Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of

60 -patches sent today but they didn't arraive before I started today's

61 -integration cycle and are left out from today's tree.

62 -

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

60 [Graduated to "master"]

61

66 -* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit.

67 - (merged to 'next' on 2009-11-21 at dba8141)

68 - + git am/mailinfo: Don't look at in-body headers when rebasing

69 -

70 -* rj/maint-t9700 (2009-11-19) 1 commit.

71 - (merged to 'next' on 2009-11-21 at 29e149b)

72 - + t9700-perl-git.sh: Fix a test failure on Cygwin

73 -

74 -* jn/faster-completion-startup (2009-11-17) 1 commit.

75 - + Speed up bash completion loading

76 -

77 -* th/maint-remote-update-help-string (2009-11-15) 1 commit.

78 - + Update 'git remote update' usage string to match man page.

79 -

80 -* tc/format-attribute (2009-11-14) 1 commit

81 - + Check the format of more printf-type functions

82 -

83 -* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.

84 - (merged to 'next' on 2009-11-16 at 5b5a93f)

85 - + diffcore-break: save cnt_data for other phases

86 - + diffcore-break: free filespec data as we go

87 -

88 -* bc/grep-i-F (2009-11-06) 1 commit.

89 - (merged to 'next' on 2009-11-17 at a9b138c)

90 - + grep: Allow case insensitive search of fixed-strings

91 -

92 -* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.

93 - (merged to 'next' on 2009-11-17 at 7ba213d)

94 - + Expand ~ and ~user in core.excludesfile, commit.template

95 -

96 -* pb/maint-use-custom-perl (2009-11-17) 1 commit.

97 - (merged to 'next' on 2009-11-17 at 1ee8d46)

98 - + Make sure $PERL_PATH is defined when the test suite is run.

99 -

100 -* th/remote-usage (2009-11-16) 1 commit.

101 - + git remote: Separate usage strings for subcommands

102 -

103 -* mo/maint-crlf-doc (2009-11-14) 1 commit.

104 - (merged to 'next' on 2009-11-17 at abd9133)

105 - + core.autocrlf documentation: mention the crlf attribute

106 -

107 -* rj/cygwin-msvc (2009-11-09) 2 commits.

108 - + MSVC: Add support for building with NO_MMAP

109 - + Makefile: keep MSVC and Cygwin configuration separate

110 - (this branch uses rj/maint-simplify-cygwin-makefile.)

111 -

112 -* jp/fetch-cull-many-refs (2009-11-13) 3 commits

113 - (merged to 'next' on 2009-11-15 at db0f967)

114 - + remote: fix use-after-free error detected by glibc in ref_remove_duplicates

115 - (merged to 'next' on 2009-11-01 at 1f09ce9)

116 - + fetch: Speed up fetch of large numbers of refs

117 - + remote: Make ref_remove_duplicates faster for large numbers of refs

118 -

119 -* jn/help-everywhere (2009-11-09) 21 commits

120 - (merged to 'next' on 2009-11-17 at 3a2dffe)

121 - + diff --no-index: make the usage string less scary

122 - + merge-{recursive,subtree}: use usagef() to print usage

123 - + Introduce usagef() that takes a printf-style format

124 - + Let 'git <command> -h' show usage without a git dir

125 - + Show usage string for 'git http-push -h'

126 - + Let 'git http-fetch -h' show usage outside any git repository

127 - + Show usage string for 'git stripspace -h'

128 - + Show usage string for 'git unpack-file -h'

129 - + Show usage string for 'git show-index -h'

130 - + Show usage string for 'git rev-parse -h'

131 - + Show usage string for 'git merge-one-file -h'

132 - + Show usage string for 'git mailsplit -h'

133 - + Show usage string for 'git imap-send -h'

134 - + Show usage string for 'git get-tar-commit-id -h'

135 - + Show usage string for 'git fast-import -h'

136 - + Show usage string for 'git check-ref-format -h'

137 - + Show usage string for 'git show-ref -h'

138 - + Show usage string for 'git merge-ours -h'

139 - + Show usage string for 'git commit-tree -h'

140 - + Show usage string for 'git cherry -h'

141 - + Show usage string for 'git grep -h'

142 - (this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)

143 -

144 -* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.

145 - (merged to 'next' on 2009-11-17 at cd35125)

146 - + http-fetch: add missing initialization of argv0_path

147 - (this branch is used by jn/help-everywhere.)

148 -

149 -* jn/remove-fetch--tool (2009-11-09) 1 commit

150 - (merged to 'next' on 2009-11-17 at 72f6c3b)

151 - + Retire fetch--tool helper to contrib/examples

152 - (this branch is used by jn/help-everywhere.)

153 -

154 -* jn/gitweb-log-history (2009-11-13) 3 commits

155 - (merged to 'next' on 2009-11-17 at d225f7d)

156 - + gitweb: Make 'history' view (re)use git_log_generic()

157 - + gitweb: Refactor common parts of 'log' and 'shortlog' views

158 - + gitweb: Refactor 'log' action generation, adding git_log_body()

159 -

160 -* rg/doc-workflow (2009-11-17) 1 commit.

161 - + Add branch management for releases to gitworkflows

162 -

163 -* sb/ls-tree-parseopt (2009-11-13) 2 commits.

164 - (merged to 'next' on 2009-11-17 at c383204)

165 - + ls-tree: migrate to parse-options

166 - + t3101: test more ls-tree options

167 -

168 -* jl/submodule-add-noname (2009-09-22) 1 commit.

169 - (merged to 'next' on 2009-11-15 at 3a77d01)

170 - + git submodule add: make the <path> parameter optional

171 -

172 -Dscho started an interesting discussion regarding the larger workflow in

173 -which the "submodule add" is used. I think the patch itself makes sense

174 -but at the same time it probably makes sense to also take the <path> and

175 -infer the <repository> as Dscho suggested, probably in "git submodule

176 -add", not in "git add" proper, at least initially.

177 -

178 -* sc/protocol-doc (2009-11-03) 1 commit.

179 - (merged to 'next' on 2009-11-15 at 32d6de8)

180 - + Update packfile transfer protocol documentation

181 -

182 -* tr/filter-branch (2009-11-10) 2 commits.

183 - (merged to 'next' on 2009-11-15 at 79c6a1d)

184 - + filter-branch: nearest-ancestor rewriting outside subdir filter

185 - + filter-branch: stop special-casing $filter_subdir argument

186 -

187 -* bg/format-patch-doc-update (2009-11-07) 4 commits.

188 - (merged to 'next' on 2009-11-17 at 68b9056)

189 - + format-patch: Add "--no-stat" as a synonym for "-p"

190 - + format-patch documentation: Fix formatting

191 - + format-patch documentation: Remove diff options that are not useful

192 - + format-patch: Always generate a patch

193 -

194 -* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.

195 - + Makefile: merge two Cygwin configuration sections into one

196 - (this branch is used by rj/cygwin-msvc.)

197 -

198 -* jn/editor-pager (2009-10-30) 9 commits

199 - (merged to 'next' on 2009-11-15 at 7f3e3ae)

200 - + Provide a build time default-pager setting

201 - + Provide a build time default-editor setting

202 - + am -i, git-svn: use "git var GIT_PAGER"

203 - + add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"

204 - + Teach git var about GIT_PAGER

205 - + Teach git var about GIT_EDITOR

206 - + Suppress warnings from "git var -l"

207 - + Do not use VISUAL editor on dumb terminals

208 - + Handle more shell metacharacters in editor names

209 -

210 -* bw/autoconf-more (2009-11-04) 2 commits

211 - (merged to 'next' on 2009-11-15 at e86a8c9)

212 - + configure: add settings for gitconfig, editor and pager

213 - + configure: add macro to set arbitrary make variables

214 -

215 -* sp/smart-http (2009-11-14) 37 commits

216 - (merged to 'next' on 2009-11-17 at 11067eb)

217 - + http-backend: Let gcc check the format of more printf-type functions.

218 - + http-backend: Fix access beyond end of string.

219 - (merged to 'next' on 2009-11-15 at 2a326b2)

220 - + http-backend: Fix bad treatment of uintmax_t in Content-Length

221 - + t5551-http-fetch: Work around broken Accept header in libcurl

222 - + t5551-http-fetch: Work around some libcurl versions

223 - + http-backend: Protect GIT_PROJECT_ROOT from /../ requests

224 - + Git-aware CGI to provide dumb HTTP transport

225 - (merged to 'next' on 2009-11-06 at 666837c)

226 - + http-backend: Test configuration options

227 - + http-backend: Use http.getanyfile to disable dumb HTTP serving

228 - + test smart http fetch and push

229 - + http tests: use /dumb/ URL prefix

230 - + set httpd port before sourcing lib-httpd

231 - + t5540-http-push: remove redundant fetches

232 - + Smart HTTP fetch: gzip requests

233 - + Smart fetch over HTTP: client side

234 - + Smart push over HTTP: client side

235 - + Discover refs via smart HTTP server when available

236 - + http-backend: more explict LocationMatch

237 - + http-backend: add example for gitweb on same URL

238 - + http-backend: use mod_alias instead of mod_rewrite

239 - + http-backend: reword some documentation

240 - + http-backend: add GIT_PROJECT_ROOT environment var

241 - + Smart fetch and push over HTTP: server side

242 - + Add stateless RPC options to upload-pack, receive-pack

243 - + Git-aware CGI to provide dumb HTTP transport

244 - + remote-helpers: return successfully if everything up-to-date

245 - + Move WebDAV HTTP push under remote-curl

246 - + remote-helpers: Support custom transport options

247 - + remote-helpers: Fetch more than one ref in a batch

248 - + fetch: Allow transport -v -v -v to set verbosity to 3

249 - + remote-curl: Refactor walker initialization

250 - + Add multi_ack_detailed capability to fetch-pack/upload-pack

251 - + Move "get_ack()" back to fetch-pack

252 - + fetch-pack: Use a strbuf to compose the want list

253 - + pkt-line: Make packet_read_line easier to debug

254 - + pkt-line: Add strbuf based functions

255 - + http-push: fix check condition on http.c::finish_http_pack_request()

256 -

257 ---------------------------------------------------

258 -[New Topics]

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)

@@ -270,20 +84,6 @@ add", not in "git add" proper, at least initially.

84 + Documentation: fix typos and spelling in replace documentation

85 + replace: use a GIT_NO_REPLACE_OBJECTS env variable

86

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

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

275 -

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

277 -patch.

278 -

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

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

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

282 -

283 -* jc/checkout-merge-base (2009-11-20) 2 commits

284 - - "rebase --onto A...B" replays history on the merge base between A and B

285 - - "checkout A...B" switches to the merge base between A and B

286 -

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.

@@ -295,39 +95,59 @@ patch.

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

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

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

99

300 -* tr/reset-checkout-patch (2009-11-19) 1 commit.

301 - (merged to 'next' on 2009-11-22 at b224950)

302 - + {checkout,reset} -p: make patch direction configurable

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

122 --------------------------------------------------

305 -[Stalled]

123 +[New Topics]

124

307 -* jc/fix-tree-walk (2009-10-22) 8 commits

308 - (merged to 'next' on 2009-10-22 at 10c0c8f)

309 - + Revert failed attempt since 353c5ee

310 - + read-tree --debug-unpack

311 - (merged to 'next' on 2009-10-11 at 0b058e2)

312 - + unpack-trees.c: look ahead in the index

313 - + unpack-trees.c: prepare for looking ahead in the index

314 - + Aggressive three-way merge: fix D/F case

315 - + traverse_trees(): handle D/F conflict case sanely

316 - + more D/F conflict tests

317 - + tests: move convenience regexp to match object names to test-lib.sh

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)

130

319 -This has some stupid bugs and reverted from 'next' until I can fix it, but

320 -the "temporarily" turned out to be very loooong. Sigh...

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

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

133

322 -* sr/gfi-options (2009-09-06) 6 commits.

323 - - fast-import: test the new option command

324 - - fast-import: add option command

325 - - fast-import: test the new feature command

326 - - fast-import: add feature command

327 - - fast-import: put marks reading in it's own function

328 - - fast-import: put option parsing code in separate functions

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

135 + - grep: --full-tree

136

330 -It seemed to be moving again soon, but nothing has happened yet...

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

139 +

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

141 + - shortlog: respect commit encoding

142 +

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.

146 +

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

148 +

149 +--------------------------------------------------

150 +[Stalled]

151

152 * je/send-email-no-subject (2009-08-05) 1 commit.

153 (merged to 'next' on 2009-10-11 at 1b99c56)

@@ -339,8 +159,32 @@ the message is sent) of this feature, but the feature itself needs its own

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

160 says "no"?)

161

342 ---------------------------------------------------

343 -[Cooking]

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 +

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

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

170 +

171 +I heard this needs at least retitling among other changes?

172 +

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

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

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

@@ -354,139 +198,138 @@ says "no"?)

198 - Notes API: init_notes(): Initialize the notes tree from the given notes ref

199 - Notes API: get_commit_notes() -> format_note() + remove the commit restriction

200

357 -Early part has been lived in 'next' for a while and has graduated. This

358 -is a reroll of the remainder. Is everybody happy with merging this to

359 -'next'? I saw some checkpatch style violations, but didn't find anything

360 -objectionable in the logic.

361 -

362 -* jn/gitweb-blame (2009-11-19) 6 commits.

363 - - gitweb.js: fix null object exception in initials calculation

364 - - gitweb: Minify gitweb.js if JSMIN is defined

365 - - gitweb: Create links leading to 'blame_incremental' using JavaScript

366 - (merged to 'next' on 2009-10-11 at 73c4a83)

367 - + gitweb: Colorize 'blame_incremental' view during processing

368 - + gitweb: Incremental blame (using JavaScript)

369 - + gitweb: Add optional "time to generate page" info in footer

370 -

371 -Ajax-y blame, with a few recent fixes.

201 +Johan waits for an Ack from Shawn on "fast-import" one.

202

203 * tr/maint-merge-ours-clarification (2009-11-15) 1 commit

204 (merged to 'next' on 2009-11-21 at fadaf7b)

205 + rebase: refuse to rebase with -s ours

206

377 -* jc/log-stdin (2009-11-20) 4 commits

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

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

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

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

382 - + read_revision_from_stdin(): use strbuf

207 +I do not think we reached a concensus for solving conflicts between "give

208 +them rope" and "protect users from clearly meaningless combinations". The

209 +author obviously is for the latter (and I am inclined to agree); Dscho

210 +seems to think otherwise.

211

384 -Still no tests yet but with docs from Peff.

212 +* jc/fix-tree-walk (2009-10-22) 8 commits

213 + (merged to 'next' on 2009-10-22 at 10c0c8f)

214 + + Revert failed attempt since 353c5ee

215 + + read-tree --debug-unpack

216 + (merged to 'next' on 2009-10-11 at 0b058e2)

217 + + unpack-trees.c: look ahead in the index

218 + + unpack-trees.c: prepare for looking ahead in the index

219 + + Aggressive three-way merge: fix D/F case

220 + + traverse_trees(): handle D/F conflict case sanely

221 + + more D/F conflict tests

222 + + tests: move convenience regexp to match object names to test-lib.sh

223

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

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

224 +This has some stupid bugs and reverted from 'next' until I can fix it, but

225 +the "temporarily" turned out to be very loooong. Sigh...

226

389 -I heard this needs at least retitling among other changes?

227 +* sr/gfi-options (2009-09-06) 6 commits.

228 + - fast-import: test the new option command

229 + - fast-import: add option command

230 + - fast-import: test the new feature command

231 + - fast-import: add feature command

232 + - fast-import: put marks reading in it's own function

233 + - fast-import: put option parsing code in separate functions

234

391 -* em/commit-claim (2009-11-04) 1 commit

392 - - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author

235 +Sverre is working on a re-roll to address comments from Shawn.

236

394 -I just picked better bits from both versions, but this needs to be

395 -rethought.

237 +--------------------------------------------------

238 +[Cooking]

239

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

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

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

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

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

402 - + teach warn_dangling_symref to take a FILE argument

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

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

405 - + Add the configuration option skipFetchAll

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

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

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

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

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

243

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

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

244 +Jim Meyering sent a patch to do a subset of what this does; to allow

245 +keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need

246 +to also teach "am" to pass the new -b option, but that is independent of

247 +what Jim showed the need in real-world, so I think this can go in as-is.

248

412 -Any comments? Should it go to Documentation/technical instead?

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

250

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

415 - - Add Python support library for remote helpers

416 - - Basic build infrastructure for Python scripts

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

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

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

420 - - Add support for "import" helper command

421 - - Allow specifying the remote helper in the url

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

423 - - Allow fetch to modify refs

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

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

426 - - Fix memory leak in helper method for disconnect

251 +* jc/checkout-merge-base (2009-11-20) 2 commits

252 + - "rebase --onto A...B" replays history on the merge base between A and B

253 + - "checkout A...B" switches to the merge base between A and B

254

428 -Replaced again. Is everybody happy with merging this to 'next'?

255 +I've been using the first one for a while myself but do not see many users

256 +want this (yet); the new feature is not urgent anyway.

257

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

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

432 - + gitweb: Smarter snapshot names

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

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

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

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

258 +* tr/reset-checkout-patch (2009-11-19) 1 commit.

259 + (merged to 'next' on 2009-11-22 at b224950)

260 + + {checkout,reset} -p: make patch direction configurable

261

438 -Soon in 'master'.

262 +I do not particularly like a configuration like this that changes the

263 +behaviour of a command in a drastic way---it will make helping others much

264 +harder.

265

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

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

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

267

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

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

445 - + Revert ks/precompute-completion series

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

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

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

449 - + bug: precomputed completion includes scripts sources

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

451 - + Speedup bash completion loading

268 +* jn/gitweb-blame (2009-11-24) 8 commits.

269 + (merged to 'next' on 2009-11-25 at 0a5b649)

270 + + gitweb.js: fix padLeftStr() and its usage

271 + + gitweb.js: Harden setting blamed commit info in incremental blame

272 + + gitweb.js: fix null object exception in initials calculation

273 + + gitweb: Minify gitweb.js if JSMIN is defined

274 + + gitweb: Create links leading to 'blame_incremental' using JavaScript

275 + (merged to 'next' on 2009-10-11 at 73c4a83)

276 + + gitweb: Colorize 'blame_incremental' view during processing

277 + + gitweb: Incremental blame (using JavaScript)

278 + + gitweb: Add optional "time to generate page" info in footer

279

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

454 -topic.

280 +Ajax-y blame, with further fixes. As this does not seem to break existing

281 +features, I am inclined to say that we push this out early, as a new

282 +feature with known breakages, to give it wider audience.

283

456 -* nd/sparse (2009-08-20) 19 commits.

457 - - sparse checkout: inhibit empty worktree

458 - - Add tests for sparse checkout

459 - - read-tree: add --no-sparse-checkout to disable sparse checkout support

460 - - unpack-trees(): ignore worktree check outside checkout area

461 - - unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index

462 - - unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout

463 - - unpack-trees.c: generalize verify_* functions

464 - - unpack-trees(): add CE_WT_REMOVE to remove on worktree alone

465 - - Introduce "sparse checkout"

466 - - dir.c: export excluded_1() and add_excludes_from_file_1()

467 - - excluded_1(): support exclude files in index

468 - - unpack-trees(): carry skip-worktree bit over in merged_entry()

469 - - Read .gitignore from index if it is skip-worktree

470 - - Avoid writing to buffer in add_excludes_from_file_1()

471 - - Teach Git to respect skip-worktree bit (writing part)

472 - - Teach Git to respect skip-worktree bit (reading part)

473 - - Introduce "skip-worktree" bit in index, teach Git to get/set this bit

474 - - Add test-index-version

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

476 -

477 -The latest update I didn't look at very closely but I had an impression

478 -that it was touching very generic codepath that would affect non sparse

479 -cases, iow the patch looked very scary (the entire series already is).

284 +* em/commit-claim (2009-11-04) 1 commit

285 + (merged to 'next' on 2009-11-23 at b5df6fd)

286 + + commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author

287

481 ---------------------------------------------------

482 -[For 1.7.0]

288 +I am not sure if the option name does a good job at explaining it to the

289 +end users, but I think the code and feature is solid.

290

484 -* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.

485 - - git-merge: forbid fast-forward and up-to-date when --no-commit is given

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

292

487 -This makes "git merge --no-commit" fail when it results in fast-forward or

488 -up-to-date. I haven't described this at the beginning of this message

489 -yet, as it is not clear if this change is even necessary. Opinions?

293 +* 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.

298 +

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

300 +

301 +* nd/sparse (2009-11-25) 20 commits.

302 + (merged to 'next' on 2009-11-25 at 71380f5)

303 + + tests: rename duplicate t1009

304 + (merged to 'next' on 2009-11-23 at f712a41)

305 + + sparse checkout: inhibit empty worktree

306 + + Add tests for sparse checkout

307 + + read-tree: add --no-sparse-checkout to disable sparse checkout support

308 + + unpack-trees(): ignore worktree check outside checkout area

309 + + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index

310 + + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout

311 + + unpack-trees.c: generalize verify_* functions

312 + + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone

313 + + Introduce "sparse checkout"

314 + + dir.c: export excluded_1() and add_excludes_from_file_1()

315 + + excluded_1(): support exclude files in index

316 + + unpack-trees(): carry skip-worktree bit over in merged_entry()

317 + + Read .gitignore from index if it is skip-worktree

318 + + Avoid writing to buffer in add_excludes_from_file_1()

319 + + Teach Git to respect skip-worktree bit (writing part)

320 + + Teach Git to respect skip-worktree bit (reading part)

321 + + Introduce "skip-worktree" bit in index, teach Git to get/set this bit

322 + + Add test-index-version

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

324 +

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

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

327 +

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

329 +1.6.6?

330 +

331 +--------------------------------------------------

332 +[For 1.7.0]

333

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

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

@@ -526,6 +369,10 @@ 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.

371

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

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

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

375 +

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

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

378 + Refuse deleting the current branch via push

@@ -534,6 +381,17 @@ we could argue that it is a bugfix.

381 --------------------------------------------------

382 [I have been too busy to purge these]

383

384 +* jc/log-tz (2009-03-03) 1 commit.

385 + - Allow --date=local --date=other-format to work as expected

386 +

387 +Maybe some people care about this. I dunno.

388 +

389 +* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.

390 + . git-merge: forbid fast-forward and up-to-date when --no-commit is given

391 +

392 +This makes "git merge --no-commit" fail when it results in fast-forward or

393 +up-to-date. It appears nobody wants to have this, so I dropped it.

394 +

395 * ne/rev-cache (2009-10-19) 7 commits.

396 . support for commit grafts, slight change to general mechanism

397 . support for path name caching in rev-cache

@@ -546,16 +404,6 @@ we could argue that it is a bugfix.

404 The author indicated that there is another round coming. Does not seem to

405 pass the tests when merged to 'pu', so it has been ejected for now.

406

549 -* jc/log-tz (2009-03-03) 1 commit.

550 - - Allow --date=local --date=other-format to work as expected

551 -

552 -Maybe some people care about this. I dunno.

553 -

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

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

556 -

557 -Maybe some people care about this. I dunno.

558 -

407 * pb/gitweb-no-project-list (2009-11-06) 3 commits.

408 . gitweb: Polish the content tags support

409 . gitweb: Support for no project list on gitweb front page

@@ -563,3 +411,16 @@ Maybe some people care about this. I dunno.

411

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

413 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 #06)