What's cooking (2009/10 #06)

Junio C Hamano committed Oct 30, 2009 at 20:57 UTC 6513debf6e8656aeb362bec242ef4dd602ab2811
1 file changed +190 -155
whats-cooking.txt
+190 -155
@@ -1,9 +1,9 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Oct 2009, #05; Wed, 28)
3 -X-master-at: cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea
4 -X-next-at: 66178218961cb7484d46bd48df7da7318180b6b7
2 +Subject: What's cooking in git.git (Oct 2009, #06; Fri, 30)
3 +X-master-at: 5f809ff50921bee44bbf88c49056e7d145c0c35f
4 +X-next-at: 2bd302fd09c48ca7e1ec0032a6fdecf21f5f1994
5
6 -What's cooking in git.git (Oct 2009, #05; Wed, 28)
6 +What's cooking in git.git (Oct 2009, #06; Fri, 30)
7 --------------------------------------------------
8
9 Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -54,81 +54,137 @@ backward compatible. Currently planeed changes are:
54 --------------------------------------------------
55 [Graduated to "master"]
56
57 -* jc/fsck-default-full (2009-10-20) 1 commit
58 - + fsck: default to "git fsck --full"
57 +* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
58 + (merged to 'next' on 2009-10-21 at 1d9190d)
59 + + modernize fetch/merge/pull examples
60 +
61 +* ja/fetch-doc (2009-10-22) 3 commits.
62 + (merged to 'next' on 2009-10-22 at 8868407)
63 + + Documentation/merge-options.txt: order options in alphabetical groups
64 + + Documentation/git-pull.txt: Add subtitles above included option files
65 + (merged to 'next' on 2009-10-21 at bf09f62)
66 + + Documentation/fetch-options.txt: order options alphabetically
67 +
68 +* tr/maint-roff-quote (2009-10-22) 1 commit.
69 + (merged to 'next' on 2009-10-22 at 14c5631)
70 + + Quote ' as \(aq in manpages
71 +
72 +* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
73 + (merged to 'next' on 2009-10-22 at 592fff3)
74 + + bisect reset: Allow resetting to any commit, not just a branch
75
60 -* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
61 - + Fix incorrect error check while reading deflated pack data
76 +* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
77 + (merged to 'next' on 2009-10-22 at 90ccac6)
78 + + info/grafts: allow trailing whitespaces at the end of line
79
63 -* jc/receive-pack-auto (2009-10-20) 2 commits.
64 - + receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
65 - + gc --auto --quiet: make the notice a bit less verboase
80 +* jn/show-normalized-refs (2009-10-12) 3 commits.
81 + (merged to 'next' on 2009-10-23 at 332aad3)
82 + + check-ref-format: simplify --print implementation
83 + + git check-ref-format --print
84 + + Add tests for git check-ref-format
85
67 -* bg/clone-doc (2009-10-20) 1 commit.
68 - + git-clone.txt: Fix grammar and formatting
86 +* jc/checkout-auto-track (2009-10-18) 3 commits
87 + (merged to 'next' on 2009-10-23 at ff7e8f3)
88 + + git checkout --no-guess
89 + + DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
90 + + check_filename(): make verify_filename() callable without dying
91
70 -* iv/tar-lzma-xz (2009-10-20) 1 commit.
71 - + import-tars: Add support for tarballs compressed with lzma, xz
92 +The final shape of this series ended up to be more or less exactly what
93 +Dscho hinted he wanted to have in one of the discussion.
94
73 -* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
74 - + cvsimport: fix relative argument filenames
95 +* tr/stash-format (2009-10-19) 5 commits
96 + (merged to 'next' on 2009-10-23 at 6c551c3)
97 + + stash list: drop the default limit of 10 stashes
98 + + stash list: use new %g formats instead of sed
99 + + Introduce new pretty formats %g[sdD] for reflog information
100 + + reflog-walk: refactor the branch@{num} formatting
101 + + Refactor pretty_print_commit arguments into a struct
102
76 -* sb/gitweb-link-author (2009-10-15) 1 commit
77 - + gitweb: linkify author/committer names with search
103 +* js/diff-verbose-submodule (2009-10-23) 2 commits.
104 + (merged to 'next' on 2009-10-23 at e479773)
105 + + add tests for git diff --submodule
106 + + Add the --submodule option to the diff option family
107
108 --------------------------------------------------
109 [New Topics]
110
82 -* jp/dirty-describe (2009-10-21) 1 commit.
83 - - Teach "git describe" --dirty option
111 +* bg/merge-ff-only (2009-10-29) 1 commit
112 + - Teach 'git merge' and 'git pull' the option --ff-only
113
114 Soon in 'next'.
115
87 -* jp/fetch-cull-many-refs (2009-10-25) 2 commits
88 - - fetch: Speed up fetch of large numbers of refs
89 - - remote: Make ref_remove_duplicates faster for large numbers of refs
116 +* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
117 + - ls-files: unbreak "ls-files -i"
118
91 -* bg/format-patch-p-noop (2009-10-25) 3 commits.
92 - - format-patch documentation: Fix formatting
93 - - format-patch documentation: Remove diff options that are not useful
94 - - format-patch: Make implementation and documentation agree
119 +Soon in 'next'.
120
96 -* jk/gitignore-anchored (2009-10-26) 1 commit
97 - - gitignore: root most patterns at the top-level directory
121 +* jn/editor-pager (2009-10-30) 8 commits
122 + - Provide a build time default-pager setting
123 + - Provide a build time default-editor setting
124 + - am -i, git-svn: use "git var GIT_PAGER"
125 + - add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
126 + - Teach git var about GIT_PAGER
127 + - Teach git var about GIT_EDITOR
128 + - Do not use VISUAL editor on dumb terminals
129 + - Handle more shell metacharacters in editor names
130 +
131 +Does not seem to pass t3404 by itself.
132 +
133 +* js/maint-diff-color-words (2009-10-30) 3 commits.
134 + - (pu) cleanup with diff_words_flush()
135 + - diff --color-words -U0: fix the location of hunk headers
136 + - t4034-diff-words: add a test for word diff without context
137
99 -* jk/maint-add-p-empty (2009-10-27) 1 commit.
100 - - add-interactive: handle deletion of empty files
138 +Replaces mh/maint-diff-color-words. The tip one is my "at least it would
139 +be a bit more readable this way" patch without proper commit log message.
140 +
141 +* sc/difftool-p4merge (2009-10-28) 1 commit
142 + - mergetool--lib: add p4merge as a pre-configured mergetool option
143
144 Soon in 'next'.
145
104 -* jk/maint-push-config (2009-10-25) 1 commit.
105 - - push: always load default config
146 +* sc/protocol-doc (2009-10-29) 1 commit
147 + - Update packfile transfer protocol documentation
148
107 -Soon in 'next'.
149 +Expecting replacement.
150
109 -* lt/revision-bisect (2009-10-27) 1 commit.
110 - - Add '--bisect' revision machinery argument
151 +* sr/vcs-helper (2009-10-29) 19 commits
152 + - .gitignore: add git-remote-cvs
153 + - Refactor git_remote_cvs to a more generic git_remote_helpers
154 + - More fixes to the git-remote-cvs installation procedure
155 + - Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
156 + - Add simple selftests of git-remote-cvs functionality
157 + - git-remote-cvs: Remote helper program for CVS repositories
158 + - 2/2: Add Python support library for CVS remote helper
159 + - 1/2: Add Python support library for CVS remote helper
160 + - Basic build infrastructure for Python scripts
161 + - Allow helpers to request marks for fast-import
162 + - Introduce <vcs>::<url> syntax for remote url
163 + - Fix memory leak in helper method for disconnect
164 + - Allow helpers to report in "list" command that the ref is unchanged
165 + - Factor ref updating out of fetch_with_import
166 + - Add support for "import" helper command
167 + - Add a config option for remotes to specify a foreign vcs
168 + - Allow programs to not depend on remotes having urls
169 + - Allow fetch to modify refs
170 + - Use a function to determine whether a remote is valid
171
112 -* mh/maint-diff-color-words (2009-10-28) 3 commits
113 - - diff: fix the location of hunk headers for "git diff --color-words -U0"
114 - - diff: move the handling of the hunk header after the changed lines
115 - - t4034-diff-words: add a test for word diff without context
172 +Supposed to replace db/vcs-helper-rest and jh/cvs-helper but expecting
173 +replacement. Does not pass selftest yet (e.g. t9801).
174 +
175 +* tr/describe-advice (2009-10-28) 1 commit
176 + - describe: when failing, tell the user about options that work
177 +
178 +Soon in 'next'.
179
180 --------------------------------------------------
181 [Stalled]
182
120 -* tr/filter-branch (2009-10-21) 2 commits.
183 +* tr/filter-branch (2009-10-28) 2 commits.
184 - filter-branch: nearest-ancestor rewriting outside subdir filter
185 - filter-branch: stop special-casing $filter_subdir argument
186
124 -J6t already has some comments on this.
125 -
126 -* mr/gitweb-snapshot (2009-09-26) 2 commits.
127 - - gitweb: append short hash ids to snapshot files
128 - (merged to 'next' on 2009-10-11 at 22ba047)
129 - + gitweb: check given hash before trying to create snapshot
130 -
131 -Jakub says the tip one needs updates.
187 +J6t has some comments on this.
188
189 * ne/rev-cache (2009-10-19) 7 commits.
190 - support for commit grafts, slight change to general mechanism
@@ -139,7 +195,8 @@ Jakub says the tip one needs updates.
195 - basic revision cache system, no integration or features
196 - man page and technical discussion for rev-cache
197
142 -The author indicated that there is another round coming.
198 +The author indicated that there is another round coming. Does not seem to
199 +pass the tests when merged to 'pu'.
200
201 * jl/submodule-add-noname (2009-09-22) 1 commit.
202 - git submodule add: make the <path> parameter optional
@@ -158,7 +215,7 @@ add", not in "git add" proper, at least initially.
215 - fast-import: put marks reading in it's own function
216 - fast-import: put option parsing code in separate functions
217
161 -???
218 +Seems to be moving again soon.
219
220 * je/send-email-no-subject (2009-08-05) 1 commit.
221 (merged to 'next' on 2009-10-11 at 1b99c56)
@@ -173,68 +230,59 @@ says "no"?)
230 --------------------------------------------------
231 [Cooking]
232
176 -* db/vcs-helper-rest (2009-10-27) 7 commits.
177 - - Fix memory leak in helper method for disconnect
178 - - Allow helpers to report in "list" command that the ref is unchanged
179 - - Add support for "import" helper command
180 - - Add a config option for remotes to specify a foreign vcs
181 - - Allow programs to not depend on remotes having urls
182 - - Allow fetch to modify refs
183 - - Use a function to determine whether a remote is valid
184 - (this branch is used by jh/cvs-helper.)
233 +* mr/gitweb-snapshot (2009-10-29) 3 commits.
234 + - gitweb: Smarter snapshot names
235 + - t/gitweb-lib.sh: Split gitweb output into headers and body
236 + (merged to 'next' on 2009-10-11 at 22ba047)
237 + + gitweb: check given hash before trying to create snapshot
238
186 -Queued a fix-up.
239 +Replaced the tip with Jakub's updates.
240
188 -* jh/cvs-helper (2009-08-18) 8 commits.
189 - - More fixes to the git-remote-cvs installation procedure
190 - - Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
191 - - Add simple selftests of git-remote-cvs functionality
192 - - git-remote-cvs: Remote helper program for CVS repositories
193 - - 2/2: Add Python support library for CVS remote helper
194 - - 1/2: Add Python support library for CVS remote helper
195 - - Basic build infrastructure for Python scripts
196 - - Allow helpers to request marks for fast-import
197 - (this branch uses db/vcs-helper-rest.)
241 +* jp/dirty-describe (2009-10-21) 1 commit.
242 + (merged to 'next' on 2009-10-30 at 19c7fc7)
243 + + Teach "git describe" --dirty option
244
199 -This depends on the above.
245 +* jp/fetch-cull-many-refs (2009-10-25) 2 commits
246 + - fetch: Speed up fetch of large numbers of refs
247 + - remote: Make ref_remove_duplicates faster for large numbers of refs
248
201 -* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
202 - (merged to 'next' on 2009-10-21 at 1d9190d)
203 - + modernize fetch/merge/pull examples
249 +* bg/format-patch-p-noop (2009-10-25) 3 commits.
250 + (merged to 'next' on 2009-10-30 at e34a3db)
251 + + format-patch documentation: Fix formatting
252 + + format-patch documentation: Remove diff options that are not useful
253 + + format-patch: Make implementation and documentation agree
254
205 -Soon in 'master'.
255 +* jk/gitignore-anchored (2009-10-26) 1 commit
256 + (merged to 'next' on 2009-10-30 at 9391a93)
257 + + gitignore: root most patterns at the top-level directory
258
207 -* ja/fetch-doc (2009-10-22) 3 commits.
208 - (merged to 'next' on 2009-10-22 at 8868407)
209 - + Documentation/merge-options.txt: order options in alphabetical groups
210 - + Documentation/git-pull.txt: Add subtitles above included option files
211 - (merged to 'next' on 2009-10-21 at bf09f62)
212 - + Documentation/fetch-options.txt: order options alphabetically
259 +* jk/maint-add-p-empty (2009-10-27) 1 commit.
260 + (merged to 'next' on 2009-10-30 at 2bd302f)
261 + + add-interactive: handle deletion of empty files
262
214 -Soon in 'master'.
263 +* jk/maint-push-config (2009-10-25) 1 commit.
264 + (merged to 'next' on 2009-10-30 at 934e3c5)
265 + + push: always load default config
266
216 -* tr/maint-roff-quote (2009-10-22) 1 commit.
217 - (merged to 'next' on 2009-10-22 at 14c5631)
218 - + Quote ' as \(aq in manpages
267 +* lt/revision-bisect (2009-10-27) 1 commit.
268 + (merged to 'next' on 2009-10-30 at 81ee52b)
269 + + Add '--bisect' revision machinery argument
270
220 -Soon in 'master'.
271 +* jc/pretty-lf (2009-10-04) 1 commit.
272 + - Pretty-format: %[+-]x to tweak inter-item newlines
273
274 * rs/pretty-wrap (2009-10-17) 1 commit
223 - - Implement wrap format %w() as if it is a mode switch
275 + (merged to 'next' on 2009-10-30 at 403bbfe)
276 + + Implement wrap format %w() as if it is a mode switch
277 (this branch uses js/log-rewrap.)
278
226 -* jc/pretty-lf (2009-10-04) 1 commit.
227 - - Pretty-format: %[+-]x to tweak inter-item newlines
228 -
279 * js/log-rewrap (2009-10-18) 3 commits
230 - - Teach --wrap to only indent without wrapping
231 - - Add strbuf_add_wrapped_text() to utf8.[ch]
232 - - print_wrapped_text(): allow hard newlines
280 + (merged to 'next' on 2009-10-30 at 403bbfe)
281 + + Teach --wrap to only indent without wrapping
282 + + Add strbuf_add_wrapped_text() to utf8.[ch]
283 + + print_wrapped_text(): allow hard newlines
284 (this branch is used by rs/pretty-wrap.)
285
235 -Before discarding jc/strbuf-nested-expand, I cherry-picked the tip of it
236 -to this series.
237 -
286 * sr/blame-incomplete (2009-10-19) 1 commit.
287 (merged to 'next' on 2009-10-22 at 133e0ce)
288 + blame: make sure that the last line ends in an LF
@@ -243,50 +291,9 @@ I think this is _good enough_ as-is; although it would be better if we
291 added some hint to the output for Porcelain implementations, that can be
292 done as a follow-up fix.
293
246 -* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
247 - (merged to 'next' on 2009-10-22 at 592fff3)
248 - + bisect reset: Allow resetting to any commit, not just a branch
249 -
250 -Soon in 'master'.
251 -
294 * fc/doc-fast-forward (2009-10-24) 1 commit.
295 - Use 'fast-forward' all over the place
296
255 -* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
256 - (merged to 'next' on 2009-10-22 at 90ccac6)
257 - + info/grafts: allow trailing whitespaces at the end of line
258 -
259 -Soon in 'master'.
260 -
261 -* jn/show-normalized-refs (2009-10-12) 3 commits.
262 - (merged to 'next' on 2009-10-23 at 332aad3)
263 - + check-ref-format: simplify --print implementation
264 - + git check-ref-format --print
265 - + Add tests for git check-ref-format
266 -
267 -Soon in 'master'.
268 -
269 -* jc/checkout-auto-track (2009-10-18) 3 commits
270 - (merged to 'next' on 2009-10-23 at ff7e8f3)
271 - + git checkout --no-guess
272 - + DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
273 - + check_filename(): make verify_filename() callable without dying
274 -
275 -The final shape of this series ended up to be more or less exactly what
276 -Dscho hinted he wanted to have in one of the discussion.
277 -
278 -Soon in 'master'.
279 -
280 -* tr/stash-format (2009-10-19) 5 commits
281 - (merged to 'next' on 2009-10-23 at 6c551c3)
282 - + stash list: drop the default limit of 10 stashes
283 - + stash list: use new %g formats instead of sed
284 - + Introduce new pretty formats %g[sdD] for reflog information
285 - + reflog-walk: refactor the branch@{num} formatting
286 - + Refactor pretty_print_commit arguments into a struct
287 -
288 -Soon in 'master'.
289 -
297 * ks/precompute-completion (2009-10-26) 3 commits.
298 (merged to 'next' on 2009-10-28 at cd5177f)
299 + completion: ignore custom merge strategies when pre-generating
@@ -295,21 +302,24 @@ Soon in 'master'.
302 (merged to 'next' on 2009-10-14 at adf722a)
303 + Speedup bash completion loading
304
298 -* sp/smart-http (2009-10-25) 24 commits
299 - - remote-helpers: return successfully if everything up-to-date
300 - - update http tests according to remote-curl capabilities
305 +* sp/smart-http (2009-10-30) 28 commits
306 + - test smart http fetch and push
307 + - http tests: use /dumb/ URL prefix
308 + - set httpd port before sourcing lib-httpd
309 + - t5540-http-push: remove redundant fetches
310 + - Smart HTTP fetch: gzip requests
311 + - Smart fetch over HTTP: client side
312 + - Smart push over HTTP: client side
313 + - Discover refs via smart HTTP server when available
314 - http-backend: more explict LocationMatch
315 - http-backend: add example for gitweb on same URL
316 - http-backend: use mod_alias instead of mod_rewrite
317 - http-backend: reword some documentation
318 - http-backend: add GIT_PROJECT_ROOT environment var
306 - - Smart HTTP fetch: gzip requests
307 - - Smart fetch over HTTP: client side
308 - - Smart push over HTTP: client side
309 - - Discover refs via smart HTTP server when available
319 - Smart fetch and push over HTTP: server side
320 - Add stateless RPC options to upload-pack, receive-pack
321 - Git-aware CGI to provide dumb HTTP transport
322 + - remote-helpers: return successfully if everything up-to-date
323 - Move WebDAV HTTP push under remote-curl
324 - remote-helpers: Support custom transport options
325 - remote-helpers: Fetch more than one ref in a batch
@@ -320,8 +330,9 @@ Soon in 'master'.
330 - fetch-pack: Use a strbuf to compose the want list
331 - pkt-line: Make packet_read_line easier to debug
332 - pkt-line: Add strbuf based functions
333 + - http-push: fix check condition on http.c::finish_http_pack_request()
334
324 -Shawn plans another round of re-roll.
335 +v5
336
337 * ef/msys-imap (2009-10-22) 9 commits.
338 - Windows: use BLK_SHA1 again
@@ -336,13 +347,6 @@ Shawn plans another round of re-roll.
347
348 This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
349
339 -* js/diff-verbose-submodule (2009-10-23) 2 commits.
340 - (merged to 'next' on 2009-10-23 at e479773)
341 - + add tests for git diff --submodule
342 - + Add the --submodule option to the diff option family
343 -
344 -Soon in 'master'.
345 -
350 * jc/fix-tree-walk (2009-10-22) 11 commits.
351 (merged to 'next' on 2009-10-22 at 10c0c8f)
352 + Revert failed attempt since 353c5ee
@@ -396,7 +400,7 @@ may do so up to "Add selftests" one.
400 + gitweb: Incremental blame (using JavaScript)
401 + gitweb: Add optional "time to generate page" info in footer
402
399 -Ajax-y blame. Probably the first three should go to 'master' by now?
403 +Ajax-y blame.
404
405 * nd/sparse (2009-08-20) 19 commits.
406 - sparse checkout: inhibit empty worktree
@@ -490,3 +494,34 @@ Maybe some people care about this. I dunno.
494
495 * jg/log-format-body-indent (2009-09-19) 1 commit.
496 . git-log --format: Add %B tag with %B(x) option
497 +
498 +* mh/maint-diff-color-words (2009-10-28) 3 commits
499 + . diff: fix the location of hunk headers for "git diff --color-words -U0"
500 + . diff: move the handling of the hunk header after the changed lines
501 + . t4034-diff-words: add a test for word diff without context
502 +
503 +Ejected; js/maint-diff-color-words replaces this.
504 +
505 +* db/vcs-helper-rest (2009-10-27) 7 commits.
506 + . Fix memory leak in helper method for disconnect
507 + . Allow helpers to report in "list" command that the ref is unchanged
508 + . Add support for "import" helper command
509 + . Add a config option for remotes to specify a foreign vcs
510 + . Allow programs to not depend on remotes having urls
511 + . Allow fetch to modify refs
512 + . Use a function to determine whether a remote is valid
513 + (this branch is used by jh/cvs-helper.)
514 +
515 +* jh/cvs-helper (2009-08-18) 8 commits.
516 + . More fixes to the git-remote-cvs installation procedure
517 + . Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
518 + . Add simple selftests of git-remote-cvs functionality
519 + . git-remote-cvs: Remote helper program for CVS repositories
520 + . 2/2: Add Python support library for CVS remote helper
521 + . 1/2: Add Python support library for CVS remote helper
522 + . Basic build infrastructure for Python scripts
523 + . Allow helpers to request marks for fast-import
524 + (this branch uses db/vcs-helper-rest.)
525 +
526 +Ejected; sr/vcs-helper is supposed to replace these two.
527 +