What's cooking (2009/10 #04)
Junio C Hamano committed
Oct 21, 2009 at 23:52 UTC
a59913e5512daa09a743f083f8931e8ab1f4eca9
1 file changed
+198
-142
whats-cooking.txt
+198
-142
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2009, #03; Mon, 19)
3
-X-master-at: e79999b1a285d4dcf1d84bc893c864516a390cfa
4
-X-next-at: e01f7ce260cd5923cc9a088b74793a58379b5cc0
2
+Subject: What's cooking in git.git (Oct 2009, #04; Wed, 21)
3
+X-master-at: 3694209ca16c033fb4c539cc23b0b370e48952dd
4
+X-next-at: fef13efd27479ba3d90fd511ea198445ed434a73
5
6
-What's cooking in git.git (Oct 2009, #03; Mon, 19)
6
+What's cooking in git.git (Oct 2009, #04; Wed, 21)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -54,109 +54,117 @@ backward compatible. Currently planeed changes are:
54
--------------------------------------------------
55
[Graduated to "master"]
56
57
-* jp/maint-send-email-fold (2009-10-08) 1 commit.
58
- + git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
59
-
60
-* pv/maint-add-p-no-exclude (2009-10-10) 1 commit.
61
- (merged to 'next' on 2009-10-11 at 0ff2e96)
62
- + git-add--interactive: never skip files included in index
63
-
64
-* dk/blame-el (2009-09-29) 1 commit.
65
- + git-blame.el: Change how blame information is shown.
66
-
67
-* jn/gitweb-patch (2009-10-09) 1 commit.
68
- + gitweb: Do not show 'patch' link for merge commits
69
-
70
-* mr/instaweb-cgid (2009-09-26) 1 commit.
71
- (merged to 'next' on 2009-10-11 at 99bcfaf)
72
- + instaweb: support mod_cgid for apache2
73
-
74
-* tf/doc-pt-br (2009-09-23) 1 commit.
75
- + Documentation: update pt-BR
76
-
77
-The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
78
-definition is not widely distributed yet (it just hit the development
79
-tree).
80
-
81
-* bg/rebase-reword (2009-10-07) 2 commits.
82
- + rebase-i: fix reword when using a terminal editor
83
- + Teach 'rebase -i' the command "reword"
84
-
85
-* jp/fetch-tag-match (2009-09-17) 1 commit.
86
- + fetch: Speed up fetch by rewriting find_non_local_tags
87
-
88
-* jn/gitweb-show-size (2009-09-07) 1 commit.
89
- + gitweb: Add 'show-sizes' feature to show blob sizes in tree view
90
-
91
-* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
92
- (merged to 'next' on 2009-10-11 at 7f34fb3)
93
- + diff -B: colour whitespace errors
94
- + diff.c: emit_add_line() takes only the rest of the line
95
- + diff.c: split emit_line() from the first char and the rest of the line
96
- + diff.c: shuffling code around
97
- + diff --whitespace: fix blank lines at end
98
- + core.whitespace: split trailing-space into blank-at-{eol,eof}
99
- + diff --color: color blank-at-eof
100
- + diff --whitespace=warn/error: fix blank-at-eof check
101
- + diff --whitespace=warn/error: obey blank-at-eof
102
- + diff.c: the builtin_diff() deals with only two-file comparison
103
- + apply --whitespace: warn blank but not necessarily empty lines at EOF
104
- + apply --whitespace=warn/error: diagnose blank at EOF
105
- + apply.c: split check_whitespace() into two
106
- + apply --whitespace=fix: detect new blank lines at eof correctly
107
- + apply --whitespace=fix: fix handling of blank lines at the eof
108
- (this branch is used by jc/maint-blank-at-eof.)
109
-
110
-This is a fix for an ancient bug (or inconsistent set of features); the
111
-topic is based on an ancient codebase and is designed to be merged
112
-upwards. jc/maint-blank-at-eof serves that purpose.
57
+* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
58
+ (merged to 'next' on 2009-10-14 at 105f997)
59
+ + gitweb: fix esc_param
60
+ (this branch is used by sb/gitweb-link-author.)
61
62
--------------------------------------------------
63
[New Topics]
64
117
-* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
118
- - bisect reset: Allow resetting to any commit, not just a branch
65
+* vl/git-gui (2009-10-16) 1 commit.
66
+ - git-gui: adjust the minimum height of diff pane for shorter screen height
67
120
-* fc/doc-fast-forward (2009-10-11) 1 commit.
121
- - user-manual: use 'fast-forward'
68
+Shawn?
69
123
-* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
124
- (merged to 'next' on 2009-10-14 at 105f997)
125
- + gitweb: fix esc_param
126
- (this branch is used by sb/gitweb-link-author.)
70
+* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
71
+ (merged to 'next' on 2009-10-21 at 1d9190d)
72
+ + modernize fetch/merge/pull examples
73
128
-* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
129
- - info/grafts: allow trailing whitespaces at the end of line
74
+* ja/fetch-doc (2009-10-21) 1 commit.
75
+ (merged to 'next' on 2009-10-21 at bf09f62)
76
+ + Documentation/fetch-options.txt: order options alphabetically
77
131
-* jc/strbuf-nested-expand (2009-10-18) 5 commits
132
- - Teach --wrap to only indent without wrapping
133
- - Add %[wrap(width,in1,in2)<<any-string>>%] implementation
134
- - strbuf_nested_expand(): allow expansion to interrupt in the middle
135
- - Add strbuf_add_wrapped_text() to utf8.[ch]
136
- - print_wrapped_text(): allow hard newlines
137
- (this branch uses js/log-rewrap.)
78
+Helps 'git-fetch.{1,html}' without helping 'git-pull.{1,html}'.
79
139
-* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
140
- (merged to 'next' on 2009-10-19 at 77824f2)
141
- + cvsimport: fix relative argument filenames
80
+* jc/1.7.0-no-commit-no-ff-2 (2009-10-21) 1 commit.
81
+ - git-merge: forbid fast-forward and up-to-date when --no-commit is given
82
143
-* jn/show-normalized-refs (2009-10-12) 3 commits.
144
- - check-ref-format: simplify --print implementation
145
- - git check-ref-format --print
146
- - Add tests for git check-ref-format
83
+This makes "git merge --no-commit" fail when it results in fast-forward or
84
+up-to-date. I haven't described this at the beginning of this message
85
+yet, as it is not clear if this is even necessary, but since I already
86
+wrote it and many people seem to be interested in UI and behaviour
87
+warts,...
88
148
-* sb/gitweb-link-author (2009-10-14) 1 commit.
149
- - gitweb: linkify author/committer names with search
150
- (this branch uses gb/maint-gitweb-esc-param.)
89
+Some tests expect the traditional behaviour of silently ignoring --no-commit
90
+upon fast-forward, and tonight's 'pu' does not pass them.
91
152
-* jc/checkout-auto-track (2009-10-18) 3 commits
153
- - git checkout --nodwim
154
- - DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
155
- - check_filename(): make verify_filename() callable without dying
92
+* jc/1.7.0-no-commit-no-ff (2009-10-21) 1 commit.
93
+ . git-merge: imply --no-ff when --no-commit is given
94
+
95
+This is an alternative patch to the same issue.
96
+
97
+* jc/fsck-default-full (2009-10-20) 1 commit
98
+ (merged to 'next' on 2009-10-21 at 1375192)
99
+ + fsck: default to "git fsck --full"
100
+
101
+Should be safe enough to be in 'master' soon.
102
+
103
+* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
104
+ - Fix incorrect error check while reading deflated pack data
105
+
106
+This is the final round from 2009-10-21, not my earlier botched attempts.
107
+
108
+* jc/receive-pack-auto (2009-10-20) 2 commits.
109
+ (merged to 'next' on 2009-10-21 at fef13ef)
110
+ + receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
111
+ + gc --auto --quiet: make the notice a bit less verboase
112
+
113
+* jp/dirty-describe (2009-10-21) 1 commit.
114
+ - Teach "git describe" --dirty option
115
+
116
+Ack?
117
+
118
+* tr/filter-branch (2009-10-21) 2 commits.
119
+ - filter-branch: nearest-ancestor rewriting outside subdir filter
120
+ - filter-branch: stop special-casing $filter_subdir argument
121
+
122
+J6t already has some comments on this.
123
+
124
+* tr/maint-roff-quote (2009-10-21) 2 commits.
125
+ - Document GNU_ROFF in Makefile
126
+ - Quote ' as \(aq in manpages
127
+
128
+The doc may need to be clarified a bit more.
129
+
130
+* bg/clone-doc (2009-10-20) 1 commit.
131
+ (merged to 'next' on 2009-10-21 at 3016736)
132
+ + git-clone.txt: Fix grammar and formatting
133
+
134
+Should be correct enough to be in 'master' soon.
135
+
136
+* iv/tar-lzma-xz (2009-10-20) 1 commit.
137
+ (merged to 'next' on 2009-10-21 at cb0df8a)
138
+ + import-tars: Add support for tarballs compressed with lzma, xz
139
+
140
+Should be safe enough to be in 'master' soon.
141
+
142
+* rs/pretty-wrap (2009-10-17) 1 commit
143
+ - Implement wrap format %w() as if it is a mode switch
144
+ (this branch uses js/log-rewrap; is related to jc/strbuf-nested-expand.)
145
+
146
+When it comes to design issues to keep unnecessary complexity out, I tend
147
+to trust Réne (and Nico) a lot more than I trust myself. Tonight's 'pu'
148
+queues this series instead of my "nested" one.
149
+
150
+* sr/blame-incomplete (2009-10-19) 1 commit.
151
+ - blame: make sure that the last line ends in an LF
152
+
153
+I think this is _good enough_ as-is; although it would be better if we
154
+added some hint to the output for Porcelain implementations, that can be
155
+done as a follow-up fix.
156
157
--------------------------------------------------
158
[Stalled]
159
160
+* mr/gitweb-snapshot (2009-09-26) 2 commits.
161
+ - gitweb: append short hash ids to snapshot files
162
+ (merged to 'next' on 2009-10-11 at 22ba047)
163
+ + gitweb: check given hash before trying to create snapshot
164
+
165
+I lost track of the discussion around the tip commit. The bottom one may
166
+better go to 'master' regardless.
167
+
168
* db/vcs-helper-rest (2009-09-03) 6 commits.
169
- Allow helpers to report in "list" command that the ref is unchanged
170
- Add support for "import" helper command
@@ -186,10 +194,6 @@ add", not in "git add" proper, at least initially.
194
- fast-import: add feature command
195
- fast-import: put marks reading in it's own function
196
- fast-import: put option parsing code in separate functions
189
- (this branch is used by jh/notes.)
190
-
191
-Ejected from 'next' as fast-import folks still seem to be discussing with
192
-how to proceed.
197
198
* je/send-email-no-subject (2009-08-05) 1 commit.
199
(merged to 'next' on 2009-10-11 at 1b99c56)
@@ -202,34 +206,97 @@ test to verify the negative case (i.e. does it correctly stop if the user
206
says "no"?)
207
208
* jh/cvs-helper (2009-08-18) 8 commits.
205
- - More fixes to the git-remote-cvs installation procedure
206
- - Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
207
- - Add simple selftests of git-remote-cvs functionality
208
- - git-remote-cvs: Remote helper program for CVS repositories
209
- - 2/2: Add Python support library for CVS remote helper
210
- - 1/2: Add Python support library for CVS remote helper
211
- - Basic build infrastructure for Python scripts
212
- - Allow helpers to request marks for fast-import
209
+ . More fixes to the git-remote-cvs installation procedure
210
+ . Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
211
+ . Add simple selftests of git-remote-cvs functionality
212
+ . git-remote-cvs: Remote helper program for CVS repositories
213
+ . 2/2: Add Python support library for CVS remote helper
214
+ . 1/2: Add Python support library for CVS remote helper
215
+ . Basic build infrastructure for Python scripts
216
+ . Allow helpers to request marks for fast-import
217
(this branch uses db/vcs-helper-rest.)
218
215
-Builds on db/vcs-helper.
219
+* jc/strbuf-nested-expand (2009-10-18) 3 commits
220
+ . Teach --wrap to only indent without wrapping
221
+ . Add %[wrap(width,in1,in2)<<any-string>>%] implementation
222
+ . strbuf_nested_expand(): allow expansion to interrupt in the middle
223
+ (this branch uses js/log-rewrap; is related to rs/pretty-wrap.)
224
+
225
+Ejected from 'pu' to let rs/pretty-wrap in as described above.
226
227
--------------------------------------------------
228
[Cooking]
229
220
-* tr/stash-format (2009-10-16) 5 commits
221
- . stash list: drop the default limit of 10 stashes
222
- . stash list: use new %g formats instead of sed
223
- . Introduce new pretty formats %g[sdD] for reflog information
224
- . reflog-walk: refactor the branch@{num} formatting
225
- . Refactor pretty_print_commit arguments into a struct
230
+* ne/rev-cache (2009-10-19) 7 commits.
231
+ - support for commit grafts, slight change to general mechanism
232
+ - support for path name caching in rev-cache
233
+ - full integration of rev-cache into git, completed test suite
234
+ - administrative functions for rev-cache, start of integration into git
235
+ - support for non-commit object caching in rev-cache
236
+ - basic revision cache system, no integration or features
237
+ - man page and technical discussion for rev-cache
238
227
-Expecting a re-roll.
239
+Still unstable? Has an extra test squashed in; tonight's 'pu' does not
240
+pass tests.
241
+
242
+* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
243
+ - bisect reset: Allow resetting to any commit, not just a branch
244
+
245
+Soon in 'next'.
246
+
247
+* fc/doc-fast-forward (2009-10-11) 1 commit.
248
+ - user-manual: use 'fast-forward'
249
+
250
+* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
251
+ - info/grafts: allow trailing whitespaces at the end of line
252
+
253
+Soon in 'next'.
254
+
255
+* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
256
+ (merged to 'next' on 2009-10-19 at 77824f2)
257
+ + cvsimport: fix relative argument filenames
258
+
259
+Should be safe enough to be in 'master' soon.
260
+
261
+* jn/show-normalized-refs (2009-10-12) 3 commits.
262
+ - check-ref-format: simplify --print implementation
263
+ - git check-ref-format --print
264
+ - Add tests for git check-ref-format
265
+
266
+This was for helping Porcelains like git-gui to sanely cope with user
267
+input that has redundant // in refnames. Are potential users happy with
268
+the series? I think this is ready for 'next'.
269
+
270
+* sb/gitweb-link-author (2009-10-15) 1 commit
271
+ - gitweb: linkify author/committer names with search
272
+
273
+Soon in 'next'.
274
+
275
+* jc/checkout-auto-track (2009-10-18) 3 commits
276
+ - git checkout --no-guess
277
+ - DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
278
+ - check_filename(): make verify_filename() callable without dying
279
+
280
+The final shape of this series ended up to be more or less exactly what
281
+Dscho hinted he wanted to have in one of the discussion. Is everybody
282
+happy with this kind of new user-friendliness? I think it is safe enough
283
+to be queued to 'next'.
284
+
285
+* tr/stash-format (2009-10-19) 5 commits
286
+ - stash list: drop the default limit of 10 stashes
287
+ - stash list: use new %g formats instead of sed
288
+ - Introduce new pretty formats %g[sdD] for reflog information
289
+ - reflog-walk: refactor the branch@{num} formatting
290
+ - Refactor pretty_print_commit arguments into a struct
291
+
292
+Soon in 'next'.
293
294
* ks/precompute-completion (2009-10-05) 1 commit.
295
(merged to 'next' on 2009-10-14 at adf722a)
296
+ Speedup bash completion loading
297
298
+Are people happy with this?
299
+
300
* sp/smart-http (2009-10-14) 17 commits
301
- Smart HTTP fetch: gzip requests
302
- Smart fetch over HTTP: client side
@@ -249,7 +316,9 @@ Expecting a re-roll.
316
- pkt-line: Make packet_read_line easier to debug
317
- pkt-line: Add strbuf based functions
318
252
-* ef/msys-imap (2009-10-13) 8 commits.
319
+What's the doneness of this series?
320
+
321
+* ef/msys-imap (2009-10-21) 8 commits.
322
- MSVC: Enable OpenSSL, and translate -lcrypto
323
- mingw: enable OpenSSL
324
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
@@ -259,12 +328,8 @@ Expecting a re-roll.
328
- imap-send: use separate read and write fds
329
- imap-send: remove useless uid code
330
262
-Is this good to go yet?
263
-
264
-* mr/gitweb-snapshot (2009-09-26) 2 commits.
265
- - gitweb: append short hash ids to snapshot files
266
- (merged to 'next' on 2009-10-11 at 22ba047)
267
- + gitweb: check given hash before trying to create snapshot
331
+Another re-roll. Waiting for an Ack from MSVC folks but otherwise it is
332
+ready for 'next', I think.
333
334
* jc/pretty-lf (2009-10-04) 1 commit.
335
- Pretty-format: %[+-]x to tweak inter-item newlines
@@ -272,17 +337,21 @@ Is this good to go yet?
337
* js/log-rewrap (2008-11-10) 2 commits
338
- Add strbuf_add_wrapped_text() to utf8.[ch]
339
- print_wrapped_text(): allow hard newlines
275
- (this branch is used by jc/strbuf-nested-expand.)
340
+ (this branch is used by jc/strbuf-nested-expand and rs/pretty-wrap.)
341
+
342
+Soon in 'next'; regardless of how wrapping is exposed to --pretty=format,
343
+this code will be used, and it seems to be leak-free and reasonably done.
344
+
345
+We _might_ want to cherry-pick the tip of jc/strbuf-nested-expand to this
346
+series, though.
347
277
-* js/diff-verbose-submodule (2009-10-14) 4 commits.
348
+* js/diff-verbose-submodule (2009-10-14) 2 commits.
349
- add tests for git diff --submodule-summary
279
- - fix output for deleted submodules in git diff --submodule-summary
280
- - fix indentation depth for git diff --submodule-summary
281
- - Add the --submodule-summary option to the diff option family
350
+ - Add the --submodule option to the diff option family
351
283
-There was an attempted re-roll and it looked very promising with a minor
284
-fix-up, but I ran out of time to pick it up and unilaterally tweaking it.
285
-Waiting for a response.
352
+I should retitle and fix some comments in the tip commit (the tests have
353
+already been adjusted to use the real option name), but otherwise I think
354
+this is ready for 'next'.
355
356
* jc/fix-tree-walk (2009-09-14) 10 commits.
357
- read-tree --debug-unpack
@@ -330,9 +399,9 @@ resolve strategy.
399
- Speed up git notes lookup
400
- Add a script to edit/inspect notes
401
- Introduce commit notes
333
- (this branch uses sr/gfi-options.)
402
335
-Is this good for 'next' now?
403
+Rebased so that it does not pull in anything else. Presumably it is ready
404
+for next?
405
406
* jn/gitweb-blame (2009-09-01) 5 commits.
407
- gitweb: Minify gitweb.js if JSMIN is defined
@@ -342,7 +411,7 @@ Is this good for 'next' now?
411
+ gitweb: Incremental blame (using JavaScript)
412
+ gitweb: Add optional "time to generate page" info in footer
413
345
-Ajax-y blame.
414
+Ajax-y blame. Probably the first three should go to 'master' by now?
415
416
* nd/sparse (2009-08-20) 19 commits.
417
- sparse checkout: inhibit empty worktree
@@ -423,18 +492,5 @@ Maybe some people care about this. I dunno.
492
493
Maybe some people care about this. I dunno.
494
426
-* ne/rev-cache (2009-09-07) 7 commits.
427
- . support for commit grafts, slight change to general mechanism
428
- . support for path name caching in rev-cache
429
- . full integration of rev-cache into git, completed test suite
430
- . administrative functions for rev-cache, start of integration into git
431
- . support for non-commit object caching in rev-cache
432
- . basic revision cache system, no integration or features
433
- . man page and technical discussion for rev-cache
434
-
435
-This seems to break at least t6001 when merged to 'pu'.
436
-
495
* jg/log-format-body-indent (2009-09-19) 1 commit.
496
. git-log --format: Add %B tag with %B(x) option
439
-
440
-Ejected from 'pu' as this is merely a short-hand for %[wrap(0,x,x)%b%].