What's cooking (2011/12 #05)
Junio C Hamano committed
Dec 15, 2011 at 16:11 UTC
1c9291f1f79cab85eca225d0bd4e02d56c8bdb52
1 file changed
+169
-151
whats-cooking.txt
+169
-151
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2011, #04; Tue, 13)
3
-X-master-at: 73c6b3575bc638b7096ec913bd91193707e2265d
4
-X-next-at: 1fd576a2d00312e74195662cae445c4463ca87e7
2
+Subject: What's cooking in git.git (Dec 2011, #05; Thu, 15)
3
+X-master-at: 10f4eb652ee4e592f91f638e579d1afcb96c0408
4
+X-next-at: d65a830db872dde05a0cb8e8d289f4f5a50b7818
5
6
-What's cooking in git.git (Dec 2011, #04; Tue, 13)
6
+What's cooking in git.git (Dec 2011, #05; Thu, 15)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -38,39 +38,38 @@ The preformatted documentation in HTML and man format are found in:
38
--------------------------------------------------
39
[New Topics]
40
41
-* jk/maint-fetch-status-table (2011-12-09) 1 commit
42
- (merged to 'next' on 2011-12-09 at 159415e)
43
- + fetch: create status table using strbuf
41
+* ef/setenv-putenv (2011-12-14) 2 commits
42
+ - compat/setenv.c: error if name contains '='
43
+ - compat/setenv.c: update errno when erroring out
44
+ (this branch is used by ef/x-setenv-putenv.)
45
45
-Will merge to 'master'.
46
+* jk/maint-do-not-feed-stdin-to-tests (2011-12-15) 1 commit
47
+ - test-lib: redirect stdin of tests
48
47
-* ci/stripspace-docs (2011-12-12) 1 commit
48
- (merged to 'next' on 2011-12-13 at 35b2cdf)
49
- + Update documentation for stripspace
49
+* jn/test-cleanup-7006 (2011-12-14) 1 commit
50
+ - test: errors preparing for a test are not special
51
51
-* jk/maint-mv (2011-12-12) 5 commits
52
- (merged to 'next' on 2011-12-13 at 58caedb)
53
- + mv: be quiet about overwriting
54
- + mv: improve overwrite warning
55
- + mv: make non-directory destination error more clear
56
- + mv: honor --verbose flag
57
- + docs: mention "-k" for both forms of "git mv"
52
+* nd/war-on-nul-in-commit (2011-12-15) 3 commits
53
+ - commit_tree(): refuse commit messages that contain NULs
54
+ - Convert commit_tree() to take strbuf as message
55
+ - merge: abort if fails to commit
56
59
-* jk/maint-snprintf-va-copy (2011-12-12) 1 commit
60
- (merged to 'next' on 2011-12-13 at d37a7e1)
61
- + compat/snprintf: don't look at va_list twice
57
+* jk/git-prompt (2011-12-12) 10 commits
58
+ - contrib: add credential helper for OS X Keychain
59
+ - Makefile: OS X has /dev/tty
60
+ - Makefile: linux has /dev/tty
61
+ - credential: use git_prompt instead of git_getpass
62
+ - prompt: use git_terminal_prompt
63
+ - add generic terminal prompt function
64
+ - refactor git_getpass into generic prompt function
65
+ - move git_getpass to its own source file
66
+ - imap-send: don't check return value of git_getpass
67
+ - imap-send: avoid buffer overflow
68
+ (this branch uses jk/credentials.)
69
63
-* jn/maint-sequencer-fixes (2011-12-12) 7 commits
64
- (merged to 'next' on 2011-12-13 at 5b3950c)
65
- + revert: stop creating and removing sequencer-old directory
66
- + Revert "reset: Make reset remove the sequencer state"
67
- + revert: do not remove state until sequence is finished
68
- + revert: allow single-pick in the middle of cherry-pick sequence
69
- + revert: pass around rev-list args in already-parsed form
70
- + revert: allow cherry-pick --continue to commit before resuming
71
- + revert: give --continue handling its own function
70
+Will merge to 'next' after taking another look.
71
73
-* mh/ref-api (2011-12-12) 51 commits
72
+* mh/ref-api-rest (2011-12-12) 35 commits
73
- repack_without_ref(): call clear_packed_ref_cache()
74
- read_packed_refs(): keep track of the directory being worked in
75
- is_refname_available(): query only possibly-conflicting references
@@ -106,22 +105,127 @@ Will merge to 'master'.
105
- do_for_each_ref_in_arrays(): new function
106
- do_for_each_ref_in_array(): new function
107
- do_for_each_ref(): correctly terminate while processesing extra_refs
109
- - add_ref(): take a (struct ref_entry *) parameter
110
- - create_ref_entry(): extract function from add_ref()
111
- - repack_without_ref(): remove temporary
112
- - resolve_gitlink_ref_recursive(): change to work with struct ref_cache
113
- - Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
114
- - resolve_gitlink_ref(): improve docstring
115
- - get_ref_dir(): change signature
116
- - refs: change signatures of get_packed_refs() and get_loose_refs()
117
- - is_dup_ref(): extract function from sort_ref_array()
118
- - add_ref(): add docstring
119
- - parse_ref_line(): add docstring
120
- - is_refname_available(): remove the "quiet" argument
121
- - clear_ref_array(): rename from free_ref_array()
122
- - refs: rename parameters result -> sha1
123
- - refs: rename "refname" variables
124
- - struct ref_entry: document name member
108
+ (this branch uses mh/ref-api.)
109
+
110
+The API for extra anchoring points may require rethought first; that would
111
+hopefully make the "ref" part a lot simpler.
112
+
113
+--------------------------------------------------
114
+[Graduated to "master"]
115
+
116
+* bc/maint-apply-check-no-patch (2011-12-05) 2 commits
117
+ (merged to 'next' on 2011-12-09 at fc780cd)
118
+ + builtin/apply.c: report error on failure to recognize input
119
+ + t/t4131-apply-fake-ancestor.sh: fix broken test
120
+
121
+* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
122
+ (merged to 'next' on 2011-12-09 at c374d14)
123
+ + convert: track state in LF-to-CRLF filter
124
+
125
+* jk/maint-1.6.2-upload-archive (2011-11-21) 1 commit
126
+ + archive: don't let remote clients get unreachable commits
127
+ (this branch is used by jk/maint-upload-archive.)
128
+
129
+* jk/maint-fetch-status-table (2011-12-09) 1 commit
130
+ (merged to 'next' on 2011-12-09 at 159415e)
131
+ + fetch: create status table using strbuf
132
+
133
+* jk/maint-upload-archive (2011-11-21) 1 commit
134
+ (merged to 'next' on 2011-12-09 at 03deb16)
135
+ + Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
136
+ (this branch uses jk/maint-1.6.2-upload-archive.)
137
+
138
+* jl/submodule-status-failure-report (2011-12-08) 1 commit
139
+ (merged to 'next' on 2011-12-09 at 53eb3b3)
140
+ + diff/status: print submodule path when looking for changes fails
141
+
142
+* jn/branch-move-to-self (2011-11-28) 2 commits
143
+ (merged to 'next' on 2011-12-09 at 7d27260)
144
+ + Allow checkout -B <current-branch> to update the current branch
145
+ + branch: allow a no-op "branch -M <current-branch> HEAD"
146
+
147
+* jn/gitweb-side-by-side-diff (2011-10-31) 8 commits
148
+ (merged to 'next' on 2011-12-09 at 7662e58)
149
+ + gitweb: Add navigation to select side-by-side diff
150
+ + gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
151
+ + t9500: Add basic sanity tests for side-by-side diff in gitweb
152
+ + t9500: Add test for handling incomplete lines in diff by gitweb
153
+ + gitweb: Give side-by-side diff extra CSS styling
154
+ + gitweb: Add a feature to show side-by-side diff
155
+ + gitweb: Extract formatting of diff chunk header
156
+ + gitweb: Refactor diff body line classification
157
+
158
+Replaces a series from Kato Kazuyoshi on the same topic.
159
+
160
+* ks/tag-cleanup (2011-12-09) 1 commit
161
+ (merged to 'next' on 2011-12-09 at cbea045)
162
+ + git-tag: introduce --cleanup option
163
+
164
+* nd/ignore-might-be-precious (2011-11-28) 2 commits
165
+ (merged to 'next' on 2011-12-09 at 1a94553)
166
+ + checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
167
+ + Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
168
+
169
+* tj/maint-imap-send-remove-unused (2011-11-23) 2 commits
170
+ (merged to 'next' on 2011-12-09 at 877cc11)
171
+ + Merge branch 'maint' into tj/imap-send-remove-unused
172
+ + imap-send: Remove unused 'use_namespace' variable
173
+
174
+* tr/userdiff-c-returns-pointer (2011-12-06) 1 commit
175
+ (merged to 'next' on 2011-12-09 at 0b6a092)
176
+ + userdiff: allow * between cpp funcname words
177
+
178
+--------------------------------------------------
179
+[Cooking]
180
+
181
+* ci/stripspace-docs (2011-12-12) 1 commit
182
+ (merged to 'next' on 2011-12-13 at 35b2cdf)
183
+ + Update documentation for stripspace
184
+
185
+* jk/maint-mv (2011-12-12) 5 commits
186
+ (merged to 'next' on 2011-12-13 at 58caedb)
187
+ + mv: be quiet about overwriting
188
+ + mv: improve overwrite warning
189
+ + mv: make non-directory destination error more clear
190
+ + mv: honor --verbose flag
191
+ + docs: mention "-k" for both forms of "git mv"
192
+
193
+* jk/maint-snprintf-va-copy (2011-12-12) 1 commit
194
+ (merged to 'next' on 2011-12-13 at d37a7e1)
195
+ + compat/snprintf: don't look at va_list twice
196
+
197
+* jn/maint-sequencer-fixes (2011-12-12) 7 commits
198
+ (merged to 'next' on 2011-12-13 at 5b3950c)
199
+ + revert: stop creating and removing sequencer-old directory
200
+ + Revert "reset: Make reset remove the sequencer state"
201
+ + revert: do not remove state until sequence is finished
202
+ + revert: allow single-pick in the middle of cherry-pick sequence
203
+ + revert: pass around rev-list args in already-parsed form
204
+ + revert: allow cherry-pick --continue to commit before resuming
205
+ + revert: give --continue handling its own function
206
+ (this branch is used by rr/revert-cherry-pick.)
207
+
208
+* mh/ref-api (2011-12-12) 16 commits
209
+ (merged to 'next' on 2011-12-15 at d65a830)
210
+ + add_ref(): take a (struct ref_entry *) parameter
211
+ + create_ref_entry(): extract function from add_ref()
212
+ + repack_without_ref(): remove temporary
213
+ + resolve_gitlink_ref_recursive(): change to work with struct ref_cache
214
+ + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
215
+ + resolve_gitlink_ref(): improve docstring
216
+ + get_ref_dir(): change signature
217
+ + refs: change signatures of get_packed_refs() and get_loose_refs()
218
+ + is_dup_ref(): extract function from sort_ref_array()
219
+ + add_ref(): add docstring
220
+ + parse_ref_line(): add docstring
221
+ + is_refname_available(): remove the "quiet" argument
222
+ + clear_ref_array(): rename from free_ref_array()
223
+ + refs: rename parameters result -> sha1
224
+ + refs: rename "refname" variables
225
+ + struct ref_entry: document name member
226
+ (this branch is used by mh/ref-api-rest.)
227
+
228
+Later part split out to expedite moving the earlier good bits forward.
229
230
* nd/resolve-ref (2011-12-13) 3 commits
231
(merged to 'next' on 2011-12-13 at c7002e9)
@@ -141,9 +245,7 @@ Will merge to 'next' after taking another look.
245
- test-terminal: set output terminals to raw mode
246
- test-terminal: give the child an empty stdin TTY
247
144
-Will merge to 'next' after taking another look.
145
-
146
-* jc/push-ignore-stale (2011-12-13) 2 commits
248
+* jc/push-ignore-stale (2011-12-14) 2 commits
249
- push: --ignore-stale option
250
- set_ref_status_for_push(): use transport-flags abstraction
251
@@ -159,28 +261,24 @@ Will merge to 'next' after taking another look.
261
+ http-push: enable "proactive auth"
262
+ t5540: test DAV push with authentication
263
162
---------------------------------------------------
163
-[Cooking]
264
+* rr/revert-cherry-pick (2011-12-15) 6 commits
265
+ - t3502, t3510: clarify cherry-pick -m failure
266
+ - t3510 (cherry-pick-sequencer): use exit status
267
+ - revert: simplify getting commit subject in format_todo()
268
+ - revert: tolerate extra spaces, tabs in insn sheet
269
+ - revert: make commit subjects in insn sheet optional
270
+ - revert: free msg in format_todo()
271
+ (this branch uses jn/maint-sequencer-fixes.)
272
165
-* rr/revert-cherry-pick (2011-12-09) 9 commits
166
- . revert: simplify communicating command-line arguments
167
- . revert: report fine-grained error messages from insn parser
168
- . revert: allow mixed pick and revert instructions
169
- . t3510 (cherry-pick-sequencer): remove malformed sheet 2
170
- . t3510 (cherry-pick-sequencer): use exit status
171
- . revert: simplify getting commit subject in format_todo()
172
- . revert: tolerate extra spaces, tabs in insn sheet
173
- . revert: make commit subjects in insn sheet optional
174
- . revert: free msg in format_todo()
175
-
176
-Ejected for now, to give higher priority to jn/maint-sequencer-fixes
177
-topic.
273
+Picked up only the earlier bits that are reasonably clear for now.
274
275
* ew/keepalive (2011-12-05) 1 commit
276
(merged to 'next' on 2011-12-13 at 1b5d5c4)
277
+ enable SO_KEEPALIVE for connected TCP sockets
278
183
-* jc/checkout-m-twoway (2011-12-11) 2 commits
279
+* jc/checkout-m-twoway (2011-12-15) 3 commits
280
+ (merged to 'next' on 2011-12-15 at cc64fed)
281
+ + checkout_merged(): squelch false warning from some gcc
282
(merged to 'next' on 2011-12-11 at b61057f)
283
+ Test 'checkout -m -- path'
284
(merged to 'next' on 2011-12-09 at c946009)
@@ -194,12 +292,6 @@ topic.
292
+ Test the current state of the cache-tree optimization
293
+ Add test-scrap-cache-tree
294
197
-* tr/userdiff-c-returns-pointer (2011-12-06) 1 commit
198
- (merged to 'next' on 2011-12-09 at 0b6a092)
199
- + userdiff: allow * between cpp funcname words
200
-
201
-Will merge to 'master'.
202
-
295
* jc/commit-amend-no-edit (2011-12-08) 5 commits
296
(merged to 'next' on 2011-12-09 at b9cfa4e)
297
+ test: commit --amend should honor --no-edit
@@ -208,16 +300,6 @@ Will merge to 'master'.
300
+ test: remove a porcelain test that hard-codes commit names
301
+ test: add missing "&&" after echo command
302
211
-* jl/submodule-status-failure-report (2011-12-08) 1 commit
212
- (merged to 'next' on 2011-12-09 at 53eb3b3)
213
- + diff/status: print submodule path when looking for changes fails
214
-
215
-Will merge to 'master'.
216
-
217
-* ks/tag-cleanup (2011-12-09) 1 commit
218
- (merged to 'next' on 2011-12-09 at cbea045)
219
- + git-tag: introduce --cleanup option
220
-
303
Will merge to 'master'.
304
305
* rr/test-chaining (2011-12-11) 7 commits
@@ -230,17 +312,12 @@ Will merge to 'master'.
312
+ test: fix '&&' chaining
313
+ t3200 (branch): fix '&&' chaining
314
233
-* bc/maint-apply-check-no-patch (2011-12-05) 2 commits
234
- (merged to 'next' on 2011-12-09 at fc780cd)
235
- + builtin/apply.c: report error on failure to recognize input
236
- + t/t4131-apply-fake-ancestor.sh: fix broken test
237
-
238
-Will merge to 'master'.
239
-
315
* aw/rebase-i-stop-on-failure-to-amend (2011-11-30) 1 commit
316
(merged to 'next' on 2011-12-09 at a117e83)
317
+ rebase -i: interrupt rebase when "commit --amend" failed during "reword"
318
319
+Will merge to 'master'.
320
+
321
* jc/split-blob (2011-12-01) 6 commits
322
. WIP (streaming chunked)
323
- chunked-object: fallback checkout codepaths
@@ -262,37 +339,7 @@ needs to learn it to be used remotely.
339
340
Will merge to 'master'.
341
265
-* tj/maint-imap-send-remove-unused (2011-11-23) 2 commits
266
- (merged to 'next' on 2011-12-09 at 877cc11)
267
- + Merge branch 'maint' into tj/imap-send-remove-unused
268
- + imap-send: Remove unused 'use_namespace' variable
269
-
270
-Will merge to 'master'.
271
-
272
-* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
273
- (merged to 'next' on 2011-12-09 at c374d14)
274
- + convert: track state in LF-to-CRLF filter
275
-
276
-Will merge to 'master'.
277
-
278
-* jn/branch-move-to-self (2011-11-28) 2 commits
279
- (merged to 'next' on 2011-12-09 at 7d27260)
280
- + Allow checkout -B <current-branch> to update the current branch
281
- + branch: allow a no-op "branch -M <current-branch> HEAD"
282
-
283
-Will merge to 'master'.
284
-
285
-* jk/credentials (2011-12-12) 24 commits
286
- - contrib: add credential helper for OS X Keychain
287
- - Makefile: OS X has /dev/tty
288
- - Makefile: linux has /dev/tty
289
- - credential: use git_prompt instead of git_getpass
290
- - prompt: use git_terminal_prompt
291
- - add generic terminal prompt function
292
- - refactor git_getpass into generic prompt function
293
- - move git_getpass to its own source file
294
- - imap-send: don't check return value of git_getpass
295
- - imap-send: avoid buffer overflow
342
+* jk/credentials (2011-12-12) 14 commits
343
(merged to 'next' on 2011-12-12 at 7a6d658)
344
+ t: add test harness for external credential helpers
345
+ credentials: add "store" helper
@@ -308,30 +355,14 @@ Will merge to 'master'.
355
+ introduce credentials API
356
+ t5550: fix typo
357
+ test-lib: add test_config_global variant
358
+ (this branch is used by jk/git-prompt.)
359
312
-Looking good. Probably split the later part into its own topic and
313
-merge the parts already in 'next' to 'master' soonish.
314
-
315
-* nd/ignore-might-be-precious (2011-11-28) 2 commits
316
- (merged to 'next' on 2011-12-09 at 1a94553)
317
- + checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
318
- + Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
319
-
320
-Will merge to 'master'.
360
+Later part split out to expedite moving the earlier good bits forward.
361
362
* jk/upload-archive-use-start-command (2011-11-21) 1 commit
363
(merged to 'next' on 2011-12-09 at 88cb83a)
364
+ upload-archive: use start_command instead of fork
365
326
-* jk/maint-1.6.2-upload-archive (2011-11-21) 1 commit
327
- + archive: don't let remote clients get unreachable commits
328
- (this branch is used by jk/maint-upload-archive.)
329
-
330
-* jk/maint-upload-archive (2011-11-21) 1 commit
331
- (merged to 'next' on 2011-12-09 at 03deb16)
332
- + Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
333
- (this branch uses jk/maint-1.6.2-upload-archive.)
334
-
366
Will merge to 'master'.
367
368
* ab/enable-i18n (2011-12-05) 1 commit
@@ -362,17 +393,4 @@ move data from worktree to repository is made aware of streaming, just
393
like the checkout codepath that goes the other way, which was done in the
394
previous "large file support" topic in the 1.7.7 cycle.
395
365
-* jn/gitweb-side-by-side-diff (2011-10-31) 8 commits
366
- (merged to 'next' on 2011-12-09 at 7662e58)
367
- + gitweb: Add navigation to select side-by-side diff
368
- + gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
369
- + t9500: Add basic sanity tests for side-by-side diff in gitweb
370
- + t9500: Add test for handling incomplete lines in diff by gitweb
371
- + gitweb: Give side-by-side diff extra CSS styling
372
- + gitweb: Add a feature to show side-by-side diff
373
- + gitweb: Extract formatting of diff chunk header
374
- + gitweb: Refactor diff body line classification
375
-
376
-Replaces a series from Kato Kazuyoshi on the same topic.
377
-
396
Will merge to 'master'.