What's cooking (2011/05 #08)
Junio C Hamano committed
May 16, 2011 at 23:42 UTC
abb84113afaa8ab99d27c307e9b3b92f04dbbf62
1 file changed
+127
-82
whats-cooking.txt
+127
-82
@@ -1,44 +1,91 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #07; Sun, 15)
3
-X-master-at: c565cb452c1e20babe4d0632c58e0f11a9af30c4
4
-X-next-at: 1a857915d643622bb71b1f0683f43acb1ddb48df
2
+Subject: What's cooking in git.git (May 2011, #08; Mon, 16)
3
+X-master-at: b602ed7dea968d72c5b3f61ca016de7f285d80ef
4
+X-next-at: cc6c7e82981e91501dc98f94e565f15ae4591a0c
5
6
-What's cooking in git.git (May 2011, #07; Sun, 15)
6
+What's cooking in git.git (May 2011, #08; Mon, 16)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-I am somewhat frustrated that I so almost no reviews on gitweb
13
-patches. Does this mean nobody is interested in viewing the projects
14
-on gitweb? How can we improve this lack of review bandwidth situation?
15
-
12
The main part of this cycle is expected to run thru May, aiming for a
13
feature freeze in early June.
14
19
-We are about to finish the week #3 of this cycle.
15
+We are at the beginning of week #4 of this cycle.
16
17
--------------------------------------------------
18
[New Topics]
19
24
-* jc/replacing (2011-05-15) 5 commits
25
- - read_sha1_file(): allow selective bypassing of replacement mechanism
26
- - inline lookup_replace_object() calls
27
- - read_sha1_file(): get rid of read_sha1_file_repl() madness
28
- - t6050: make sure we test not just commit replacement
29
- - Declare lookup_replace_object() in cache.h, not in commit.h
20
+* jk/cherry-pick-root-with-resolve (2011-05-16) 3 commits
21
+ (merged to 'next' on 2011-05-16 at 2a63845)
22
+ + t3503: test cherry picking and reverting root commits
23
+ + revert: allow reverting a root commit
24
+ + cherry-pick: handle root commits with external strategies
25
+
26
+Will merge to "master" soonish, to merge further to "maint" later.
27
+
28
+* jk/git-connection-deadlock-fix (2011-05-16) 3 commits
29
+ (merged to 'next' on 2011-05-16 at 33e6c11)
30
+ + send-pack: avoid deadlock on git:// push with failed pack-objects
31
+ + connect: let callers know if connection is a socket
32
+ + connect: treat generic proxy processes like ssh processes
33
+ (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with js/maint-send-pack-stateless-rpc-deadlock-fix.)
34
+
35
+Will merge to "master" soonish, to merge further to "maint" later.
36
+
37
+--------------------------------------------------
38
+[Graduated to "master"]
39
+
40
+* ci/commit--interactive-atomic (2011-05-10) 6 commits
41
+ (merged to 'next' on 2011-05-11 at 7f36fd8)
42
+ + Test atomic git-commit --interactive
43
+ + Add commit to list of config.singlekey commands
44
+ + Add support for -p/--patch to git-commit
45
+ + Allow git commit --interactive with paths
46
+ + t7501.8: feed a meaningful command
47
+ + Use a temporary index for git commit --interactive
48
+
49
+* fc/completion-zsh (2011-05-10) 1 commit
50
+ + git-completion: fix regression in zsh support
51
+ (this branch is used by sg/completion-updates.)
52
+
53
+* jc/convert (2011-05-09) 4 commits
54
+ (merged to 'next' on 2011-05-15 at 9d35a6e)
55
+ + convert: make it harder to screw up adding a conversion attribute
56
+ + convert: make it safer to add conversion attributes
57
+ + convert: give saner names to crlf/eol variables, types and functions
58
+ + convert: rename the "eol" global variable to "core_eol"
59
(this branch is used by jc/streaming.)
60
32
-Will merge to "next" by the middle of week #4.
61
+* kk/maint-prefix-in-config-mak (2011-05-09) 3 commits
62
+ (merged to 'next' on 2011-05-09 at 267a3aa)
63
+ + Honor $(prefix) set in config.mak* when defining ETC_GIT*
64
+ + Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
65
+ (merged to 'next' on 2011-05-02 at c747ba3)
66
+ + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
67
+
68
+One revert and replace the whole thing from J6t. The end result looked
69
+reasonable.
70
34
-* jh/receive-count-limit (2011-05-14) 1 commit
35
- - receive-pack: Add receive.objectCountLimit to refuse push with too many objects
71
+* mg/merge-ff-config (2011-05-06) 3 commits
72
+ (merged to 'next' on 2011-05-08 at 977b432)
73
+ + tests: check git does not barf on merge.ff values for future versions of git
74
+ + merge: introduce merge.ff configuration variable
75
+ + Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
76
37
-* jl/submodule-conflicted-gitmodules (2011-05-14) 2 commits
38
- - Submodules: Don't parse .gitmodules when it contains, merge conflicts
39
- - test that git status works with merge conflict in, .gitmodules
77
+* sg/completion-updates (2011-05-10) 4 commits
78
+ (merged to 'next' on 2011-05-10 at eaf5398)
79
+ + Merge branch 'fc/completion-zsh' into sg/completion-updates
80
+ + Revert "completion: don't declare 'local words' to make zsh happy"
81
+ (merged to 'next' on 2011-05-08 at 761178c)
82
+ + completion: move private shopt shim for zsh to __git_ namespace
83
+ (merged to 'next' on 2011-05-02 at 0fd443a)
84
+ + completion: don't declare 'local words' to make zsh happy
85
+ (this branch uses fc/completion-zsh.)
86
41
-Will merge to "next" by the middle of week #4.
87
+This reverts the "local words only on bash" thingy and uses the
88
+workaround blessed by zsh folks instead.
89
90
--------------------------------------------------
91
[Stalled]
@@ -125,14 +172,55 @@ Needs to tighten the advice to only govern the generic How-to part.
172
--------------------------------------------------
173
[Cooking]
174
175
+* jc/replacing (2011-05-15) 5 commits
176
+ (merged to 'next' on 2011-05-16 at 5d0b584)
177
+ + read_sha1_file(): allow selective bypassing of replacement mechanism
178
+ + inline lookup_replace_object() calls
179
+ + read_sha1_file(): get rid of read_sha1_file_repl() madness
180
+ + t6050: make sure we test not just commit replacement
181
+ + Declare lookup_replace_object() in cache.h, not in commit.h
182
+ (this branch is used by jc/streaming.)
183
+
184
+Code restructuring without much new feature.
185
+Will merge to "master" by the end of week #4.
186
+
187
+* jh/receive-count-limit (2011-05-14) 1 commit
188
+ - receive-pack: Add receive.objectCountLimit to refuse push with too many objects
189
+
190
+Being rerolled.
191
+
192
+* jl/submodule-conflicted-gitmodules (2011-05-14) 2 commits
193
+ (merged to 'next' on 2011-05-16 at cc6c7e8)
194
+ + Submodules: Don't parse .gitmodules when it contains, merge conflicts
195
+ + test that git status works with merge conflict in, .gitmodules
196
+
197
+Will merge to "master" by the end of week #4.
198
+
199
+* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-16) 1 commit
200
+ + sideband_demux(): fix decl-after-stmt
201
+ (this branch is used by jk/git-connection-deadlock-fix and js/maint-send-pack-stateless-rpc-deadlock-fix.)
202
+
203
+Will merge to "master" soonish, to merge further to "maint" later.
204
+
205
+* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-16) 1 commit
206
+ (merged to 'next' on 2011-05-16 at ad83470)
207
+ + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
208
+ (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix; is tangled with jk/git-connection-deadlock-fix.)
209
+
210
+Will merge to "master" soonish, to merge further to "maint" later.
211
+
212
* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
213
+ setup_revisions(): take pathspec from command line and --stdin correctly
214
(this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)
215
216
+Will merge to "master" soonish, to merge further to "maint" later.
217
+
218
* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
219
- Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
220
(this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.)
221
222
+Will merge to "master" soonish, to merge further to "maint" later.
223
+
224
* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits
225
(merged to 'next' on 2011-05-15 at b4e3a75)
226
+ Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
@@ -142,12 +230,15 @@ Needs to tighten the advice to only govern the generic How-to part.
230
These are to fix an ancient bug where feeding "git log --stdin path" with
231
an input that also has additional pathspec corrupted memory.
232
233
+Will merge to "master" soonish, to merge further to "maint" later.
234
+
235
* jl/read-tree-m-dry-run (2011-05-11) 1 commit
236
- Teach read-tree the -n|--dry-run option
237
238
Looked good. We _might_ want to make -n simply ignore -u, though.
239
+Waiting for a reroll.
240
150
-* jc/streaming (2011-05-15) 12 commits
241
+* jc/streaming (2011-05-16) 12 commits
242
- streaming: read loose objects incrementally
243
- sha1_file.c: expose helpers to read loose objects
244
- streaming: read non-delta incrementally from a pack
@@ -160,7 +251,11 @@ Looked good. We _might_ want to make -n simply ignore -u, though.
251
- sha1_object_info_extended(): expose a bit more info
252
- packed_object_info_detail(): do not return a string
253
- Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
163
- (this branch uses jc/bigfile, jc/convert and jc/replacing.)
254
+ (this branch uses jc/bigfile and jc/replacing.)
255
+
256
+I _think_ the "hole" one does a reasonable job to avoid excessible and
257
+pointless seeks (it operates on 10k chunks and coalesces continuous chunks
258
+full of NULs), which was the concern raised in the review.
259
260
* jc/bigfile (2011-05-13) 3 commits
261
(merged to 'next' on 2011-05-15 at 0ee7144)
@@ -177,15 +272,7 @@ which we already should), and transport (receive-pack/fetch-pack call
272
either unpack-objects or index-pack, which still want to hold the full
273
object in-core and need to be fixed).
274
180
-* jc/convert (2011-05-09) 4 commits
181
- (merged to 'next' on 2011-05-15 at 9d35a6e)
182
- + convert: make it harder to screw up adding a conversion attribute
183
- + convert: make it safer to add conversion attributes
184
- + convert: give saner names to crlf/eol variables, types and functions
185
- + convert: rename the "eol" global variable to "core_eol"
186
- (this branch is used by jc/streaming.)
187
-
188
-Will merge to "master" by the middle of week #4.
275
+Will merge to "master" by the middle of week #5.
276
277
* jk/blame-line-porcelain (2011-05-09) 3 commits
278
(merged to 'next' on 2011-05-15 at 93232b3)
@@ -208,29 +295,6 @@ Will merge to "master" by the end of week #4.
295
296
Will merge to "master" by the end of week #4.
297
211
-* kk/maint-prefix-in-config-mak (2011-05-09) 3 commits
212
- (merged to 'next' on 2011-05-09 at 267a3aa)
213
- + Honor $(prefix) set in config.mak* when defining ETC_GIT*
214
- + Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
215
- (merged to 'next' on 2011-05-02 at c747ba3)
216
- + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
217
-
218
-One revert and replace the whole thing from J6t. The end result looked
219
-reasonable.
220
-
221
-Will merge to "master" by the end of week #4.
222
-
223
-* ci/commit--interactive-atomic (2011-05-10) 6 commits
224
- (merged to 'next' on 2011-05-11 at 7f36fd8)
225
- + Test atomic git-commit --interactive
226
- + Add commit to list of config.singlekey commands
227
- + Add support for -p/--patch to git-commit
228
- + Allow git commit --interactive with paths
229
- + t7501.8: feed a meaningful command
230
- + Use a temporary index for git commit --interactive
231
-
232
-Will merge to "master" by the end of week #4.
233
-
298
* ab/i18n-scripts (2011-05-14) 48 commits
299
- i18n: git-bisect bisect_next_check "You need to" message
300
- i18n: git-bisect [Y/n] messages
@@ -292,15 +356,12 @@ Will merge to "master" by the end of week #4.
356
Re-rolled to drop credits from the individual documentation pages
357
and update the documentation.
358
295
-* mg/merge-ff-config (2011-05-06) 3 commits
296
- (merged to 'next' on 2011-05-08 at 977b432)
297
- + tests: check git does not barf on merge.ff values for future versions of git
298
- + merge: introduce merge.ff configuration variable
299
- + Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
359
+Will merge to "next" by the end of week #4.
360
301
-Will merge to "master" by the end of week #4.
302
-
303
-* mk/grep-pcre (2011-05-09) 10 commits
361
+* mk/grep-pcre (2011-05-16) 12 commits
362
+ (merged to 'next' on 2011-05-16 at 0c6c25e)
363
+ + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
364
+ + git-grep: update tests now regexp type is "last one wins"
365
(merged to 'next' on 2011-05-15 at d110135)
366
+ git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
367
+ git-grep: Bail out when -P is used with -F or -E
@@ -314,24 +375,8 @@ Will merge to "master" by the end of week #4.
375
+ contrib/completion: --line-number to git grep
376
+ Documentation: Add --line-number to git-grep synopsis
377
317
-* fc/completion-zsh (2011-05-10) 1 commit
318
- + git-completion: fix regression in zsh support
319
- (this branch is used by sg/completion-updates.)
320
-
321
-* sg/completion-updates (2011-05-10) 4 commits
322
- (merged to 'next' on 2011-05-10 at eaf5398)
323
- + Merge branch 'fc/completion-zsh' into sg/completion-updates
324
- + Revert "completion: don't declare 'local words' to make zsh happy"
325
- (merged to 'next' on 2011-05-08 at 761178c)
326
- + completion: move private shopt shim for zsh to __git_ namespace
327
- (merged to 'next' on 2011-05-02 at 0fd443a)
328
- + completion: don't declare 'local words' to make zsh happy
329
- (this branch uses fc/completion-zsh.)
330
-
331
-This reverts the "local words only on bash" thingy and uses the
332
-workaround blessed by zsh folks instead.
333
-
334
-Will merge to "master" by the end of week #4.
378
+Fixed up the build procedure that did not update GIT-BUILD-OPTIONS.
379
+Will merge to "master" by the middle of week #5.
380
381
* ld/p4-preserve-user-names (2011-05-13) 3 commits
382
(merged to 'next' on 2011-05-15 at bdedb60)