What's cooking (2011/12 #07)
Junio C Hamano committed
Dec 19, 2011 at 17:42 UTC
e7f7d9ab7f20b97da017c48ac6854c55fc925f12
1 file changed
+140
-192
whats-cooking.txt
+140
-192
@@ -1,19 +1,18 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2011, #06; Sun, 18)
3
-X-master-at: d16520499d2652b5b59dfb25f9cf2d56a4c6913a
4
-X-next-at: 03f4636270a389f701ff4d876e0535fb9fbdc969
2
+Subject: What's cooking in git.git (Dec 2011, #07; Mon, 19)
3
+X-master-at: 876a6f4991abdd72ea707b193b4f2b831096ad3c
4
+X-next-at: 0b410e5c3b357520ddace5bff4c5bfa3699f9220
5
6
-What's cooking in git.git (Dec 2011, #06; Sun, 18)
6
+What's cooking in git.git (Dec 2011, #07; Mon, 19)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in
11
'next'.
12
13
-A handful of topics have graduated to 'master', but they are all minor.
14
-More important features for 1.7.9 will come in the next batch (marked as
15
-'Will merge to "master"' below), which should happen in a couple of days;
16
-Peff's credential series is among them.
13
+The second large batch of topics for 1.7.9 graduated to 'master', and the
14
+tip of it should be 85% feature complete for this cycle (modulo fixes and
15
+tweaks).
16
17
Here are the repositories that have my integration branches:
18
@@ -40,48 +39,118 @@ The preformatted documentation in HTML and man format are found in:
39
https://code.google.com/p/git-{htmldocs,manpages}.git/
40
https://github.com/gitster/git-{htmldocs,manpages}.git/
41
42
+--------------------------------------------------
43
+[New Topics]
44
+
45
+* jc/advice-doc (2011-12-18) 1 commit
46
+ (merged to 'next' on 2011-12-19 at 0b410e5)
47
+ + advice: Document that they all default to true
48
+ (this branch is used by jc/advise-push-default.)
49
+
50
+Will merge to "master".
51
+
52
--------------------------------------------------
53
[Graduated to "master"]
54
46
-* aw/rebase-i-stop-on-failure-to-amend (2011-11-30) 1 commit
47
- (merged to 'next' on 2011-12-09 at a117e83)
48
- + rebase -i: interrupt rebase when "commit --amend" failed during "reword"
49
-
50
-* jc/commit-amend-no-edit (2011-12-08) 5 commits
51
- (merged to 'next' on 2011-12-09 at b9cfa4e)
52
- + test: commit --amend should honor --no-edit
53
- + commit: honour --no-edit
54
- + t7501 (commit): modernize style
55
- + test: remove a porcelain test that hard-codes commit names
56
- + test: add missing "&&" after echo command
57
-
58
-* jc/stream-to-pack (2011-12-01) 5 commits
59
- (merged to 'next' on 2011-12-09 at d0fd605)
60
- + bulk-checkin: replace fast-import based implementation
61
- + csum-file: introduce sha1file_checkpoint
62
- + finish_tmp_packfile(): a helper function
63
- + create_tmp_packfile(): a helper function
64
- + write_pack_header(): a helper function
65
- (this branch is used by jc/split-blob.)
66
-
67
-Teaches "git add" to send large-ish blob data straight to a packfile.
68
-This is a continuation to the "large file support" topic. The codepath to
69
-move data from worktree to repository is made aware of streaming, just
70
-like the checkout codepath that goes the other way, which was done in the
71
-previous "large file support" topic in the 1.7.7 cycle.
72
-
73
-* jh/fast-import-notes (2011-11-28) 3 commits
74
- (merged to 'next' on 2011-12-09 at 2b01132)
75
- + fast-import: Fix incorrect fanout level when modifying existing notes refs
76
- + t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
77
- + t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
78
-
79
-* jk/upload-archive-use-start-command (2011-11-21) 1 commit
80
- (merged to 'next' on 2011-12-09 at 88cb83a)
81
- + upload-archive: use start_command instead of fork
55
+* ab/enable-i18n (2011-12-05) 1 commit
56
+ (merged to 'next' on 2011-12-13 at 65af8cd)
57
+ + i18n: add infrastructure for translating Git with gettext
58
+
59
+* ci/stripspace-docs (2011-12-12) 1 commit
60
+ (merged to 'next' on 2011-12-13 at 35b2cdf)
61
+ + Update documentation for stripspace
62
+
63
+* ew/keepalive (2011-12-05) 1 commit
64
+ (merged to 'next' on 2011-12-13 at 1b5d5c4)
65
+ + enable SO_KEEPALIVE for connected TCP sockets
66
+
67
+* jc/checkout-m-twoway (2011-12-15) 3 commits
68
+ (merged to 'next' on 2011-12-15 at cc64fed)
69
+ + checkout_merged(): squelch false warning from some gcc
70
+ (merged to 'next' on 2011-12-11 at b61057f)
71
+ + Test 'checkout -m -- path'
72
+ (merged to 'next' on 2011-12-09 at c946009)
73
+ + checkout -m: no need to insist on having all 3 stages
74
+
75
+* jk/credentials (2011-12-12) 14 commits
76
+ (merged to 'next' on 2011-12-12 at 7a6d658)
77
+ + t: add test harness for external credential helpers
78
+ + credentials: add "store" helper
79
+ + strbuf: add strbuf_add*_urlencode
80
+ + Makefile: unix sockets may not available on some platforms
81
+ + credentials: add "cache" helper
82
+ + docs: end-user documentation for the credential subsystem
83
+ + credential: make relevance of http path configurable
84
+ + credential: add credential.*.username
85
+ + credential: apply helper config
86
+ + http: use credential API to get passwords
87
+ + credential: add function for parsing url components
88
+ + introduce credentials API
89
+ + t5550: fix typo
90
+ + test-lib: add test_config_global variant
91
+ (this branch is used by jk/git-prompt.)
92
+
93
+* jk/fetch-no-tail-match-refs (2011-12-13) 4 commits
94
+ (merged to 'next' on 2011-12-13 at 805c018)
95
+ + connect.c: drop path_match function
96
+ + fetch-pack: match refs exactly
97
+ + t5500: give fully-qualified refs to fetch-pack
98
+ + drop "match" parameter from get_remote_heads
99
+
100
+* jk/maint-mv (2011-12-12) 5 commits
101
+ (merged to 'next' on 2011-12-13 at 58caedb)
102
+ + mv: be quiet about overwriting
103
+ + mv: improve overwrite warning
104
+ + mv: make non-directory destination error more clear
105
+ + mv: honor --verbose flag
106
+ + docs: mention "-k" for both forms of "git mv"
107
+
108
+* jk/maint-push-over-dav (2011-12-13) 2 commits
109
+ (merged to 'next' on 2011-12-13 at 45e376c)
110
+ + http-push: enable "proactive auth"
111
+ + t5540: test DAV push with authentication
112
+
113
+* jk/maint-snprintf-va-copy (2011-12-12) 1 commit
114
+ (merged to 'next' on 2011-12-13 at d37a7e1)
115
+ + compat/snprintf: don't look at va_list twice
116
+
117
+* jn/maint-sequencer-fixes (2011-12-12) 7 commits
118
+ (merged to 'next' on 2011-12-13 at 5b3950c)
119
+ + revert: stop creating and removing sequencer-old directory
120
+ + Revert "reset: Make reset remove the sequencer state"
121
+ + revert: do not remove state until sequence is finished
122
+ + revert: allow single-pick in the middle of cherry-pick sequence
123
+ + revert: pass around rev-list args in already-parsed form
124
+ + revert: allow cherry-pick --continue to commit before resuming
125
+ + revert: give --continue handling its own function
126
+ (this branch is used by rr/revert-cherry-pick.)
127
+
128
+* nd/resolve-ref (2011-12-13) 3 commits
129
+ (merged to 'next' on 2011-12-13 at c7002e9)
130
+ + Rename resolve_ref() to resolve_ref_unsafe()
131
+ + Convert resolve_ref+xstrdup to new resolve_refdup function
132
+ + revert: convert resolve_ref() to read_ref_full()
133
+
134
+* rr/test-chaining (2011-12-11) 7 commits
135
+ (merged to 'next' on 2011-12-13 at b08445e)
136
+ + t3401: use test_commit in setup
137
+ + t3401: modernize style
138
+ + t3040 (subprojects-basic): fix '&&' chaining, modernize style
139
+ + t1510 (worktree): fix '&&' chaining
140
+ + t3030 (merge-recursive): use test_expect_code
141
+ + test: fix '&&' chaining
142
+ + t3200 (branch): fix '&&' chaining
143
+
144
+* tr/cache-tree (2011-12-06) 5 commits
145
+ (merged to 'next' on 2011-12-13 at e0da64d)
146
+ + reset: update cache-tree data when appropriate
147
+ + commit: write cache-tree data when writing index anyway
148
+ + Refactor cache_tree_update idiom from commit
149
+ + Test the current state of the cache-tree optimization
150
+ + Add test-scrap-cache-tree
151
152
--------------------------------------------------
84
-[New Topics]
153
+[Cooking]
154
155
* cn/maint-lf-to-crlf-filter (2011-12-16) 1 commit
156
- lf_to_crlf_filter(): tell the caller we added "\n" when draining
@@ -100,7 +169,9 @@ try not to convert LF to CRLF if the repository data already has CRLF.
169
170
Will merge to "next".
171
103
-* jc/request-pull-show-head-4 (2011-12-16) 1 commit
172
+* jc/request-pull-show-head-4 (2011-12-19) 2 commits
173
+ (merged to 'next' on 2011-12-19 at 771939b)
174
+ + request-pull: do not emit "tag" before the tagname
175
(merged to 'next' on 2011-12-16 at bea51ac)
176
+ request-pull: update the "pull" command generation logic
177
@@ -121,10 +192,9 @@ Will merge to "next".
192
193
Will merge to "next".
194
124
-* jk/http-push-to-empty (2011-12-17) 1 commit
125
- - remote-curl: don't pass back fake refs
126
-
127
-Will merge to "next".
195
+* jk/http-push-to-empty (2011-12-19) 1 commit
196
+ (merged to 'next' on 2011-12-19 at 845e2a1)
197
+ + remote-curl: don't pass back fake refs
198
199
* jk/maint-push-v-is-verbose (2011-12-17) 1 commit
200
- make "git push -v" actually verbose
@@ -144,7 +214,7 @@ Will merge to "next".
214
215
Will merge to "next".
216
147
-* jn/maint-gitweb-utf8-fix (2011-12-18) 4 commits
217
+* jn/maint-gitweb-utf8-fix (2011-12-19) 4 commits
218
- gitweb: Fix fallback mode of to_utf8 subroutine
219
- gitweb: Output valid utf8 in git_blame_common('data')
220
- gitweb: esc_html() site name for title in OPML
@@ -165,15 +235,17 @@ Will merge to "next".
235
- git-p4: test debug macro
236
- git-p4: introduce asciidoc documentation
237
168
-* jc/advise-push-default (2011-12-18) 2 commits
238
+Waiting for a reroll.
239
+
240
+* jc/advise-push-default (2011-12-18) 1 commit
241
- push: hint to use push.default=upstream when appropriate
170
- - advice: Document that they all default to true
242
+ (this branch uses jc/advice-doc.)
243
172
-A counter-proposal to jc/push-ignore-stale that may encourage a bad
173
-workflow.
244
+Peff had a good suggestion outlining an updated code structure so that
245
+somebody new can try to dip his or her toes in the development. Any
246
+takers?
247
175
---------------------------------------------------
176
-[Cooking]
248
+Waiting for a reroll.
249
250
* ef/setenv-putenv (2011-12-14) 2 commits
251
- compat/setenv.c: error if name contains '='
@@ -210,7 +282,6 @@ Will merge to "next".
282
- move git_getpass to its own source file
283
- imap-send: don't check return value of git_getpass
284
- imap-send: avoid buffer overflow
213
- (this branch uses jk/credentials.)
285
286
Will merge to 'next' after taking another look.
287
@@ -255,40 +326,7 @@ Will merge to 'next' after taking another look.
326
The API for extra anchoring points may require rethought first; that would
327
hopefully make the "ref" part a lot simpler.
328
258
-* ci/stripspace-docs (2011-12-12) 1 commit
259
- (merged to 'next' on 2011-12-13 at 35b2cdf)
260
- + Update documentation for stripspace
261
-
262
-Will merge to "master".
263
-
264
-* jk/maint-mv (2011-12-12) 5 commits
265
- (merged to 'next' on 2011-12-13 at 58caedb)
266
- + mv: be quiet about overwriting
267
- + mv: improve overwrite warning
268
- + mv: make non-directory destination error more clear
269
- + mv: honor --verbose flag
270
- + docs: mention "-k" for both forms of "git mv"
271
-
272
-Will merge to "master".
273
-
274
-* jk/maint-snprintf-va-copy (2011-12-12) 1 commit
275
- (merged to 'next' on 2011-12-13 at d37a7e1)
276
- + compat/snprintf: don't look at va_list twice
277
-
278
-Will merge to "master".
279
-
280
-* jn/maint-sequencer-fixes (2011-12-12) 7 commits
281
- (merged to 'next' on 2011-12-13 at 5b3950c)
282
- + revert: stop creating and removing sequencer-old directory
283
- + Revert "reset: Make reset remove the sequencer state"
284
- + revert: do not remove state until sequence is finished
285
- + revert: allow single-pick in the middle of cherry-pick sequence
286
- + revert: pass around rev-list args in already-parsed form
287
- + revert: allow cherry-pick --continue to commit before resuming
288
- + revert: give --continue handling its own function
289
- (this branch is used by rr/revert-cherry-pick.)
290
-
291
-Will merge to "master".
329
+Waiting for a reroll.
330
331
* mh/ref-api (2011-12-12) 16 commits
332
(merged to 'next' on 2011-12-15 at d65a830)
@@ -314,14 +352,6 @@ Later part split out to expedite moving the earlier good bits forward.
352
353
Will merge to "master".
354
317
-* nd/resolve-ref (2011-12-13) 3 commits
318
- (merged to 'next' on 2011-12-13 at c7002e9)
319
- + Rename resolve_ref() to resolve_ref_unsafe()
320
- + Convert resolve_ref+xstrdup to new resolve_refdup function
321
- + revert: convert resolve_ref() to read_ref_full()
322
-
323
-Will merge to "master".
324
-
355
* tr/grep-threading (2011-12-16) 3 commits
356
- grep: disable threading in non-worktree case
357
- grep: enable threading with -p and -W using lazy attribute lookup
@@ -329,39 +359,20 @@ Will merge to "master".
359
360
Will merge to 'next' after taking another look.
361
332
-* tr/pty-all (2011-12-12) 3 commits
333
- - t/lib-terminal: test test-terminal's sanity
362
+* tr/pty-all (2011-12-19) 1 commit
363
- test-terminal: set output terminals to raw mode
335
- - test-terminal: give the child an empty stdin TTY
336
-
337
-The test breakage that originally triggered interest in this topic is
338
-fixed more cleanly with Peff's jk/maint-do-not-feed-stdin-to-tests but
339
-this series may independently be useful.
364
341
-Jonathan had good review comments, and this would need to be rerolled.
365
+Kept only the second one from the original.
366
+Will merge to "next".
367
368
* jc/push-ignore-stale (2011-12-14) 2 commits
369
- push: --ignore-stale option
370
- set_ref_status_for_push(): use transport-flags abstraction
371
372
Probably solving a wrong problem and encouraging a wrong workflow while at
348
-it. Will drop. jc/advise-push-default might be a better approach.
373
+it. jc/advise-push-default might be a better approach.
374
350
-* jk/fetch-no-tail-match-refs (2011-12-13) 4 commits
351
- (merged to 'next' on 2011-12-13 at 805c018)
352
- + connect.c: drop path_match function
353
- + fetch-pack: match refs exactly
354
- + t5500: give fully-qualified refs to fetch-pack
355
- + drop "match" parameter from get_remote_heads
356
-
357
-Will merge to "master".
358
-
359
-* jk/maint-push-over-dav (2011-12-13) 2 commits
360
- (merged to 'next' on 2011-12-13 at 45e376c)
361
- + http-push: enable "proactive auth"
362
- + t5540: test DAV push with authentication
363
-
364
-Will merge to "master".
375
+Will drop.
376
377
* rr/revert-cherry-pick (2011-12-15) 6 commits
378
- t3502, t3510: clarify cherry-pick -m failure
@@ -370,48 +381,9 @@ Will merge to "master".
381
- revert: tolerate extra spaces, tabs in insn sheet
382
- revert: make commit subjects in insn sheet optional
383
- revert: free msg in format_todo()
373
- (this branch uses jn/maint-sequencer-fixes.)
374
-
375
-Picked up only the earlier bits that are reasonably clear for now.
384
385
Will merge to "next".
386
379
-* ew/keepalive (2011-12-05) 1 commit
380
- (merged to 'next' on 2011-12-13 at 1b5d5c4)
381
- + enable SO_KEEPALIVE for connected TCP sockets
382
-
383
-* jc/checkout-m-twoway (2011-12-15) 3 commits
384
- (merged to 'next' on 2011-12-15 at cc64fed)
385
- + checkout_merged(): squelch false warning from some gcc
386
- (merged to 'next' on 2011-12-11 at b61057f)
387
- + Test 'checkout -m -- path'
388
- (merged to 'next' on 2011-12-09 at c946009)
389
- + checkout -m: no need to insist on having all 3 stages
390
-
391
-Will merge to "master".
392
-
393
-* tr/cache-tree (2011-12-06) 5 commits
394
- (merged to 'next' on 2011-12-13 at e0da64d)
395
- + reset: update cache-tree data when appropriate
396
- + commit: write cache-tree data when writing index anyway
397
- + Refactor cache_tree_update idiom from commit
398
- + Test the current state of the cache-tree optimization
399
- + Add test-scrap-cache-tree
400
-
401
-Will merge to "master".
402
-
403
-* rr/test-chaining (2011-12-11) 7 commits
404
- (merged to 'next' on 2011-12-13 at b08445e)
405
- + t3401: use test_commit in setup
406
- + t3401: modernize style
407
- + t3040 (subprojects-basic): fix '&&' chaining, modernize style
408
- + t1510 (worktree): fix '&&' chaining
409
- + t3030 (merge-recursive): use test_expect_code
410
- + test: fix '&&' chaining
411
- + t3200 (branch): fix '&&' chaining
412
-
413
-Will merge to "master".
414
-
387
* jc/split-blob (2011-12-01) 6 commits
388
. WIP (streaming chunked)
389
- chunked-object: fallback checkout codepaths
@@ -420,35 +392,11 @@ Will merge to "master".
392
- new representation types in the packstream
393
- varint-in-pack: refactor varint encoding/decoding
394
423
-Not ready. At least pack-objects and fsck need to learn the new encoding
424
-for the series to be usable locally, and then index-pack/unpack-objects
425
-needs to learn it to be used remotely.
426
-
427
-* jk/credentials (2011-12-12) 14 commits
428
- (merged to 'next' on 2011-12-12 at 7a6d658)
429
- + t: add test harness for external credential helpers
430
- + credentials: add "store" helper
431
- + strbuf: add strbuf_add*_urlencode
432
- + Makefile: unix sockets may not available on some platforms
433
- + credentials: add "cache" helper
434
- + docs: end-user documentation for the credential subsystem
435
- + credential: make relevance of http path configurable
436
- + credential: add credential.*.username
437
- + credential: apply helper config
438
- + http: use credential API to get passwords
439
- + credential: add function for parsing url components
440
- + introduce credentials API
441
- + t5550: fix typo
442
- + test-lib: add test_config_global variant
443
- (this branch is used by jk/git-prompt.)
444
-
445
-Later part split out to expedite moving the earlier good bits forward.
446
-
447
-Will merge to "master".
395
+Not ready.
396
449
-* ab/enable-i18n (2011-12-05) 1 commit
450
- (merged to 'next' on 2011-12-13 at 65af8cd)
451
- + i18n: add infrastructure for translating Git with gettext
397
+At least pack-objects and fsck need to learn the new encoding for the
398
+series to be usable locally, and then index-pack/unpack-objects needs to
399
+learn it to be used remotely.
400
401
* jc/signed-commit (2011-11-29) 5 commits
402
- gpg-interface: allow use of a custom GPG binary
@@ -457,4 +405,4 @@ Will merge to "master".
405
- log: --show-signature
406
- commit: teach --gpg-sign option
407
460
-Not exactly urgent.
408
+Not urgent.