What's cooking (2010/04 #01)
Junio C Hamano committed
Apr 2, 2010 at 00:48 UTC
a75ef01981e9110f4a7839aa545f333b0e37cbd8
1 file changed
+246
-125
whats-cooking.txt
+246
-125
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2010, #07; Sun, 28)
3
-X-master-at: faf752693abd0a891a9a47a2d398353cc59ee93a
4
-X-next-at: 133563ba0a1cd78841512283a1069b49bf69373e
2
+Subject: What's cooking in git.git (Apr 2010, #01; Fri, 02)
3
+X-master-at: a50dec22f2800fd073aa6ca1d112f25b4f667a56
4
+X-next-at: 85b6122874e41c12f0cd6ae4744fb1b856d4a0ad
5
6
-What's cooking in git.git (Mar 2010, #07; Sun, 28)
6
+What's cooking in git.git (Apr 2010, #01; Fri, 02)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,42 +11,123 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-As it has been about 6 weeks since the previous feature release, I'd want
15
-to start making noises about feature freeze for 1.7.1 in a few days. I
16
-expect that the changes still under discussion will be ready by the time
17
-the post 1.7.1 cycle begins, and we will hopefully have a cycle for 1.7.2
18
-that is shorter than usual to include them.
14
+Topics not in 'next' will have to wait until post 1.7.1 cycle. I expect
15
+that the changes still under discussion will be ready by the time the post
16
+1.7.1 cycle begins, and we will hopefully have a cycle for 1.7.2 that is
17
+shorter than usual to include them.
18
19
--------------------------------------------------
21
-[New Topics]
22
-
23
-* da/maint-python-startup (2010-03-27) 1 commit
24
- - Makefile: Remove usage of deprecated Python "has_key" method
20
+[Graduated to "master"]
21
26
-Another thing that this fixes is not described in the log message.
27
-
28
-* jc/conflict-marker-size (2010-03-24) 1 commit
29
- - diff --check: honor conflict-marker-size attribute
22
+* sb/notes-parse-opt (2010-02-27) 1 commit
23
+ (merged to 'next' on 2010-03-24 at 82eebc1)
24
+ + notes: rework subcommands and parse options
25
31
-* ld/discovery-limit-to-fs (2010-03-17) 3 commits
32
- - Add support for GIT_ONE_FILESYSTEM
33
- - truncate cwd string before printing error message
34
- - config.c: remove static keyword from git_env_bool()
26
+* cc/cherry-pick-ff (2010-03-20) 7 commits
27
+ (merged to 'next' on 2010-03-20 at a1ae16b)
28
+ + revert: fix tiny memory leak in cherry-pick --ff
29
+ + rebase -i: use new --ff cherry-pick option
30
+ (merged to 'next' on 2010-03-07 at 5589b26)
31
+ + Documentation: describe new cherry-pick --ff option
32
+ + cherry-pick: add tests for new --ff option
33
+ + revert: add --ff option to allow fast forward when cherry-picking
34
+ + builtin/merge: make checkout_fast_forward() non static
35
+ + parse-options: add parse_options_concat() to concat options
36
36
-* sb/fmt-merge-msg (2010-03-24) 7 commits
37
- - fmt-merge-msg: hide summary option
38
- - fmt-merge-msg: remove custom string_list implementation
39
- - string-list: add unsorted_string_list_lookup()
40
- - fmt-merge-msg: use pretty.c routines
41
- - t6200: test fmt-merge-msg more
42
- - t6200: modernize with test_tick
43
- - fmt-merge-msg: be quiet if nothing to merge
37
+--------------------------------------------------
38
+[New Topics]
39
45
-* pc/remove-warn (2010-03-26) 4 commits
46
- . Remove a redundant errno test in a usage of remove_path
47
- . Introduce remove_or_warn function
48
- . Implement the rmdir_or_warn function
49
- . Generalise the unlink_or_warn function
40
+* cw/ws-indent-with-tab (2010-04-01) 2 commits
41
+ - whitespace: we cannot "catch all errors known to git" anymore
42
+ - Add tab-in-indent whitespace error class
43
+
44
+Not quite ready until "apply --whitespace=fix" gets a matching change.
45
+
46
+* ic/bash-completion-rpm (2010-03-26) 1 commit
47
+ - RPM spec: include bash completion support
48
+
49
+This is needed in 'master' by -rc1 at the latest. Soon in 'next'.
50
+
51
+* js/grep-open (2010-03-26) 2 commits
52
+ - grep -O: allow optional argument specifying the pager (or editor)
53
+ - grep: Add the option '--open-files-in-pager'
54
+
55
+Probably needs to support --no-index mode as well.
56
+
57
+* mg/notes-reflog (2010-03-29) 2 commits
58
+ - refs.c: Write reflogs for notes just like for branch heads
59
+ - t3301-notes: Test the creation of reflog entries
60
+
61
+Implementation is trivially correct; I am unsure if "notes" tree wants
62
+reflog in the first place, though. Please convince me and I'll move it
63
+to 'next' soon, aiming for -rc0 or -rc1 at the latest.
64
+
65
+* rr/remote-helper-doc (2010-03-28) 2 commits
66
+ - Documentation/remote-helpers: Fix some typos
67
+ - Documentation/remote-helpers: Rewrite description
68
+
69
+Although I lost track of this series with too rapid succession of
70
+updates, intermixed with some documentation updates in the related
71
+areas, my impression is that area experts haven't Acked them yet.
72
+
73
+* sr/remote-helper-export (2010-03-29) 7 commits
74
+ - remote-helpers: add tests for testgit helper
75
+ - remote-helpers: add testgit helper
76
+ - remote-helpers: add support for an export command
77
+ - remote-helpers: allow requesing the path to the .git directory
78
+ - fast-import: always create marks_file directories
79
+ - clone: also configure url for bare clones
80
+ - clone: pass the remote name to remote_get
81
+
82
+May merge to 'next', but I would prefer waiting til 1.7.2 to have
83
+this with a confidence than fast-tracking it.
84
+
85
+* cc/revert-strategy (2010-03-31) 5 commits
86
+ - revert: add "--strategy" option to choose merge strategy
87
+ - merge: make function try_merge_command non static
88
+ - merge: refactor code that calls "git merge-STRATEGY"
89
+ - revert: refactor merge recursive code into its own function
90
+ - revert: use strbuf to refactor the code that writes the merge message
91
+ (this branch uses jn/merge-diff3-label.)
92
+
93
+May merge to 'next' soon, but this is more about debugging and we are not
94
+in a great hurry.
95
+
96
+* mr/gitweb-jsmin (2010-04-01) 6 commits
97
+ - gitweb: update INSTALL to use shorter make target
98
+ - gitweb: add documentation to INSTALL regarding gitweb.js
99
+ - instaweb: add minification awareness
100
+ - Gitweb: add autoconfigure support for minifiers
101
+ - Gitweb: add support for minifying gitweb.css
102
+ - Gitweb: add ignore and clean rules for minified files
103
+
104
+Soon in 'next' when minor rewording replacement patches come; otherwise
105
+felt solid.
106
+
107
+* sc/http-late-auth (2010-04-01) 1 commit
108
+ - Prompt for a username when an HTTP request 401s
109
+
110
+May merge to 'next', but I would prefer waiting til 1.7.2 to have
111
+this with a confidence than fast-tracking it.
112
+
113
+* hg/convert (2010-03-29) 5 commits
114
+ . convert: Added core.refilteronadd feature.
115
+ . convert: Inhibit contraction of foreign $Id$ during stats.
116
+ . convert: Use the enum constant SAFE_CRLF_FALSE.
117
+ . convert: Keep foreign $Id$ on checkout.
118
+ . convert: Safer handling of $Id$ contraction.
119
+
120
+* jk/cached-textconv (2010-04-01) 7 commits
121
+ - diff: avoid useless filespec population
122
+ - diff: cache textconv output
123
+ - textconv: refactor calls to run_textconv
124
+ - introduce notes-cache interface
125
+ - make commit_tree a library function
126
+ - fix textconv leak in emit_rewrite_diff
127
+ - fix const-correctness of write_sha1_file
128
+
129
+May merge to 'next', but I would prefer waiting til 1.7.2 to have
130
+this with a confidence than fast-tracking it.
131
132
--------------------------------------------------
133
[Stalled]
@@ -81,86 +162,146 @@ Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
162
Needs squelching the configuration setting when "--pretty=raw" is given,
163
at least, or possibly when any "--pretty" is explicitly given.
164
84
---------------------------------------------------
85
-[Cooking]
86
-
165
* np/malloc-threading (2010-03-24) 1 commit
166
- Make xmalloc and xrealloc thread-safe
167
168
Still has locking issues?
169
92
-* bw/git-completion-rpmspec (2010-03-20) 1 commit
93
- - Add a git-completion rpm subpackage to the spec
170
+* js/async-thread (2010-03-09) 7 commits
171
+ - Enable threaded async procedures whenever pthreads is available
172
+ (merged to 'next' on 2010-03-20 at 9939243)
173
+ + Dying in an async procedure should only exit the thread, not the process.
174
+ + Reimplement async procedures using pthreads
175
+ + Windows: more pthreads functions
176
+ + Fix signature of fcntl() compatibility dummy
177
+ + Make report() from usage.c public as vreportf() and use it.
178
+ + Modernize t5530-upload-pack-error.
179
95
-Shipping bash-completion as part of RPM package; since Todd Zullinger who
96
-packages git for Fedora joined the thread, I am hoping that I can defer
97
-the direction of the final version to the discussion between Todd and Ben.
180
+Waiting for resolution of locking issues in malloc-threading.
181
+
182
+--------------------------------------------------
183
+[Cooking]
184
+
185
+* da/maint-python-startup (2010-03-27) 1 commit
186
+ (merged to 'next' on 2010-04-01 at ca6897a)
187
+ + Makefile: Remove usage of deprecated Python "has_key" method
188
+
189
+Hopefully will merge to 'master' by -rc0.
190
+
191
+* jc/conflict-marker-size (2010-03-24) 1 commit
192
+ (merged to 'next' on 2010-04-01 at 164b1f4)
193
+ + diff --check: honor conflict-marker-size attribute
194
+
195
+Hopefully will merge to 'master' by -rc0.
196
+
197
+* ld/discovery-limit-to-fs (2010-03-17) 3 commits
198
+ - Add support for GIT_ONE_FILESYSTEM
199
+ - truncate cwd string before printing error message
200
+ - config.c: remove static keyword from git_env_bool()
201
+
202
+Linus made a good point of making this a default, and Erick Mattos
203
+confirmed that it won't be a problem even on Windows.
204
+
205
+Will move to 'next' after such a "default on" change, keep it there until
206
+1.7.1 ships, warn about it in the release notes as an upcoming backward
207
+incompatibility, and then move to 'master' after 1.7.1.
208
+
209
+* sb/fmt-merge-msg (2010-03-24) 7 commits
210
+ (merged to 'next' on 2010-04-01 at 5fcbec5)
211
+ + fmt-merge-msg: hide summary option
212
+ + fmt-merge-msg: remove custom string_list implementation
213
+ + string-list: add unsorted_string_list_lookup()
214
+ + fmt-merge-msg: use pretty.c routines
215
+ + t6200: test fmt-merge-msg more
216
+ + t6200: modernize with test_tick
217
+ + fmt-merge-msg: be quiet if nothing to merge
218
+
219
+Hopefully will merge to 'master' by -rc0.
220
+
221
+* pc/remove-warn (2010-03-26) 4 commits
222
+ - Remove a redundant errno test in a usage of remove_path
223
+ - Introduce remove_or_warn function
224
+ - Implement the rmdir_or_warn function
225
+ - Generalise the unlink_or_warn function
226
+
227
+I cherry-picked only obviously sensible bits. Soon in 'next'.
228
229
* ef/maint-empty-commit-log (2010-03-21) 1 commit
100
- - rev-list: fix --pretty=oneline with empty message
230
+ (merged to 'next' on 2010-03-28 at aa103e5)
231
+ + rev-list: fix --pretty=oneline with empty message
232
102
-Looked reasonable. Soon in 'next'.
233
+Hopefully will merge to 'master' by -rc0.
234
235
* em/checkout-orphan (2010-03-21) 1 commit
105
- - git checkout: create unparented branch by --orphan
106
-
107
-Looked reasonable, except that we might want to come up with a way to
108
-allow people with core.logallrefupdates set to false to still override it
109
-with "-l" when switching to this new branch. Or we may not care. I dunno.
236
+ (merged to 'next' on 2010-03-28 at 86b6a4f)
237
+ + git checkout: create unparented branch by --orphan
238
111
-Soon in 'next'.
239
+Perhaps needs a bit of documentation updates, describing the "going open
240
+source" scenario.
241
242
* mg/mailmap-update (2010-03-19) 1 commit
114
- - .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
243
+ (merged to 'next' on 2010-03-28 at 8ac3436)
244
+ + .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
245
116
-Soon in 'next'.
246
+Soon in 'master'.
247
248
* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit
119
- - send-email: lazily assign editor variable
249
+ (merged to 'next' on 2010-03-28 at 7e8e58e)
250
+ + send-email: lazily assign editor variable
251
121
-Soon in 'next'.
252
+Soon in 'master'.
253
254
* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit
124
- - rev-list: use default abbrev length when abbrev-commit is in effect
255
+ (merged to 'next' on 2010-03-28 at d3e9f04)
256
+ + rev-list: use default abbrev length when abbrev-commit is in effect
257
126
-Soon in 'next'.
258
+Soon in 'master'.
259
260
* rb/maint-python-path (2010-03-21) 1 commit
129
- - Correct references to /usr/bin/python which does not exist on FreeBSD
261
+ (merged to 'next' on 2010-03-28 at 58ba409)
262
+ + Correct references to /usr/bin/python which does not exist on FreeBSD
263
131
-Soon in 'next'.
264
+Soon in 'master'.
265
266
* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit
134
- - imap-send: Remove limitation on message body
267
+ (merged to 'next' on 2010-03-28 at fbedd77)
268
+ + imap-send: Remove limitation on message body
269
136
-Soon in 'next'.
270
+Soon in 'master'.
271
272
* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit
139
- - http-backend: Don't infinite loop during die()
273
+ (merged to 'next' on 2010-03-28 at bf02879)
274
+ + http-backend: Don't infinite loop during die()
275
141
-Soon in 'next'.
276
+Soon in 'master'.
277
278
* ar/config-from-command-line (2010-03-26) 2 commits
279
- Use strbufs instead of open-coded string manipulation
280
- Allow passing of configuration parameters in the command line
281
282
+May merge to 'next', but I would prefer waiting til 1.7.2 to have
283
+this with a confidence than fast-tracking it.
284
+
285
* bc/t5505-fix (2010-03-19) 3 commits
148
- - t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
149
- - t5505: add missing &&
150
- - t5505: remove unnecessary subshell invocations
286
+ (merged to 'next' on 2010-03-28 at 1b097af)
287
+ + t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
288
+ + t5505: add missing &&
289
+ + t5505: remove unnecessary subshell invocations
290
152
-Looked reasonable. Soon in 'next'.
291
+Soon in 'master'.
292
293
* bw/template-tool-buildconfig (2010-03-20) 2 commits
155
- - Modernize git calling conventions in hook templates
156
- - Make templates honour SHELL_PATH and PERL_PATH
294
+ (merged to 'next' on 2010-03-28 at 1e6fd8d)
295
+ + Modernize git calling conventions in hook templates
296
+ + Make templates honour SHELL_PATH and PERL_PATH
297
158
-Looked reasonable. Soon in 'next'.
298
+Soon in 'master'.
299
300
* mb/rebase-i-no-ff (2010-03-24) 1 commit
161
- - Teach rebase the --no-ff option.
301
+ (merged to 'next' on 2010-03-28 at b2c54cb)
302
+ + Teach rebase the --no-ff option.
303
163
-Looked reasonable. Soon in 'next'.
304
+Soon in 'master'.
305
306
* jn/merge-diff3-label (2010-03-20) 14 commits
307
(merged to 'next' on 2010-03-20 at 26f1805)
@@ -178,84 +319,64 @@ Looked reasonable. Soon in 'next'.
319
+ xdl_merge(): add optional ancestor label to diff3-style output
320
+ tests: document cherry-pick behavior in face of conflicts
321
+ tests: document format of conflicts from checkout -m
322
+ (this branch is used by cc/revert-strategy.)
323
+
324
+Soon in 'master'.
325
326
* do/rebase-i-arbitrary (2010-03-14) 1 commit
183
- - rebase--interactive: don't require what's rebased to be a branch
327
+ (merged to 'next' on 2010-03-28 at 5ba9970)
328
+ + rebase--interactive: don't require what's rebased to be a branch
329
185
-Looked reasonable. Soon in 'next'.
330
+Soon in 'master'.
331
332
* ja/send-email-ehlo (2010-03-14) 3 commits
188
- - git-send-email.perl - try to give real name of the calling host to HELO/EHLO
189
- - git-send-email.perl: add option --smtp-debug
190
- - git-send-email.perl: improve error message in send_message()
333
+ (merged to 'next' on 2010-03-28 at 00964a8)
334
+ + git-send-email.perl - try to give real name of the calling host to HELO/EHLO
335
+ + git-send-email.perl: add option --smtp-debug
336
+ + git-send-email.perl: improve error message in send_message()
337
192
-Looked reasonable. Soon in 'next'.
338
+Soon in 'master'.
339
340
* ak/everyday-git (2009-10-21) 1 commit
195
- - everyday: fsck and gc are not everyday operations
341
+ (merged to 'next' on 2010-03-28 at ae67548)
342
+ + everyday: fsck and gc are not everyday operations
343
197
-Looked reasonable. Soon in 'next'.
344
+Soon in 'master'.
345
346
* bc/acl-test (2010-03-15) 5 commits
200
- - t/t1304: make a second colon optional in the mask ACL check
201
- - t/t1304: set the ACL effective rights mask
202
- - t/t1304: use 'test -r' to test readability rather than looking at mode bits
203
- - t/t1304: set the Default ACL base entries
204
- - t/t1304: avoid -d option to setfacl
347
+ (merged to 'next' on 2010-03-28 at b40fa09)
348
+ + t/t1304: make a second colon optional in the mask ACL check
349
+ + t/t1304: set the ACL effective rights mask
350
+ + t/t1304: use 'test -r' to test readability rather than looking at mode bits
351
+ + t/t1304: set the Default ACL base entries
352
+ + t/t1304: avoid -d option to setfacl
353
206
-Looked reasonable. Soon in 'next'.
354
+Soon in 'master'.
355
356
* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
209
- - daemon.c: avoid accessing ss_family member of struct sockaddr_storage
357
+ (merged to 'next' on 2010-03-28 at 305ad0b)
358
+ + daemon.c: avoid accessing ss_family member of struct sockaddr_storage
359
211
-Looked reasonable. Soon in 'next'.
360
+Soon in 'master'.
361
362
* ef/cherry-abbrev (2010-03-20) 2 commits
214
- - ls: remove redundant logic
215
- - cherry: support --abbrev option
363
+ (merged to 'next' on 2010-03-28 at eb3825c)
364
+ + ls: remove redundant logic
365
+ + cherry: support --abbrev option
366
217
-Looked reasonable. Soon in 'next'.
218
-
219
-* sb/notes-parse-opt (2010-02-27) 1 commit
220
- (merged to 'next' on 2010-03-24 at 82eebc1)
221
- + notes: rework subcommands and parse options
222
-
223
-Ready for 'master'.
367
+Soon in 'master'.
368
369
* gh/maint-stash-show-error-message (2010-03-16) 1 commit
226
- - Improve error messages from 'git stash show'
370
+ (merged to 'next' on 2010-03-28 at 61a5643)
371
+ + Improve error messages from 'git stash show'
372
228
-Looked reasonable. Soon in 'next'.
373
+Soon in 'master'.
374
375
* rs/threaded-grep-context (2010-03-15) 1 commit
231
- - grep: enable threading for context line printing
232
-
233
-Looked reasonable. Soon in 'next'.
234
-
235
-* cc/cherry-pick-ff (2010-03-20) 7 commits
236
- (merged to 'next' on 2010-03-20 at a1ae16b)
237
- + revert: fix tiny memory leak in cherry-pick --ff
238
- + rebase -i: use new --ff cherry-pick option
239
- (merged to 'next' on 2010-03-07 at 5589b26)
240
- + Documentation: describe new cherry-pick --ff option
241
- + cherry-pick: add tests for new --ff option
242
- + revert: add --ff option to allow fast forward when cherry-picking
243
- + builtin/merge: make checkout_fast_forward() non static
244
- + parse-options: add parse_options_concat() to concat options
245
-
246
-Ready for 'master'.
247
-
248
-* js/async-thread (2010-03-09) 7 commits
249
- - Enable threaded async procedures whenever pthreads is available
250
- (merged to 'next' on 2010-03-20 at 9939243)
251
- + Dying in an async procedure should only exit the thread, not the process.
252
- + Reimplement async procedures using pthreads
253
- + Windows: more pthreads functions
254
- + Fix signature of fcntl() compatibility dummy
255
- + Make report() from usage.c public as vreportf() and use it.
256
- + Modernize t5530-upload-pack-error.
376
+ (merged to 'next' on 2010-03-28 at 1934af1)
377
+ + grep: enable threading for context line printing
378
258
-The tip one will be soon in 'next', but one step at a time.
379
+Soon in 'master'.
380
381
* nd/setup (2010-03-25) 43 commits
382
- builtins: do not commit pager choice early