What's cooking (2011/12/01)
Junio C Hamano committed
Dec 2, 2011 at 12:27 UTC
f6e31118a9ff1127552da55792d3c03f7d500681
1 file changed
+107
-141
whats-cooking.txt
+107
-141
@@ -1,14 +1,18 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2011, #05; Mon, 28)
3
-X-master-at: fc14b89a7e6899b8ac3b5751ec2d8c98203ea4c2
4
-X-next-at: 9ef225745e2777b46364afc3297e5b06d1e29033
2
+Subject: What's cooking in git.git (Dec 2011, #01; Fri, 2)
3
+X-master-at: 406da7803217998ff6bf5dc69c55b1613556c2f4
4
+X-next-at: 56e79320f3d9b044c380dfebf136584aaa17ac5b
5
6
-What's cooking in git.git (Nov 2011, #05; Mon, 28)
6
+What's cooking in git.git (Dec 2011, #01; Fri, 2)
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 'next'.
11
12
+Now that 1.7.8 is tagged, I'll start planning to rewind 'next' by kicking
13
+topics back to 'pu' and/or dropping them, but let's give the new release a
14
+couple of days of calm.
15
+
16
Here are the repositories that have my integration branches:
17
18
With maint, master, next, pu, todo:
@@ -37,90 +41,34 @@ The preformatted documentation in HTML and man format are found in:
41
--------------------------------------------------
42
[New Topics]
43
40
-* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
41
- - convert: track state in LF-to-CRLF filter
44
+* aw/rebase-i-stop-on-failure-to-amend (2011-11-30) 1 commit
45
+ - rebase -i: interrupt rebase when "commit --amend" failed during "reword"
46
43
-Candidate for early next cycle.
47
+* jc/split-blob (2011-12-01) 6 commits
48
+ . WIP (streaming chunked)
49
+ - chunked-object: fallback checkout codepaths
50
+ - bulk-checkin: support chunked-object encoding
51
+ - bulk-checkin: allow the same data to be multiply hashed
52
+ - new representation types in the packstream
53
+ - varint-in-pack: refactor varint encoding/decoding
54
+ (this branch uses jc/stream-to-pack.)
55
45
-* nd/maint-ignore-exclude (2011-11-28) 1 commit
46
- - checkout,merge: loosen overwriting untracked file check based on info/exclude
47
- (this branch is used by nd/ignore-might-be-precious.)
56
+* jh/fast-import-notes (2011-11-28) 3 commits
57
+ - fast-import: Fix incorrect fanout level when modifying existing notes refs
58
+ - t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
59
+ - t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
60
49
-Candidate for early next cycle.
61
+* ld/p4-labels-branches (2011-11-30) 4 commits
62
+ - git-p4: importing labels should cope with missing owner
63
+ - git-p4: add test for p4 labels
64
+ - git-p4: cope with labels with empty descriptions
65
+ - git-p4: handle p4 branches and labels containing shell chars
66
51
-* vr/git-merge-doc (2011-11-21) 1 commit
52
- - Show error for 'git merge' with unset merge.defaultToUpstream
67
+Retracted?
68
54
-Candidate for early next cycle.
55
-
56
-* jn/branch-move-to-self (2011-11-28) 2 commits
57
- - Allow checkout -B <current-branch> to update the current branch
58
- - branch: allow a no-op "branch -M <current-branch> HEAD"
59
-
60
-* jk/credentials (2011-11-28) 19 commits
61
- - compat/getpass: add a /dev/tty implementation
62
- - credential: use git_prompt instead of git_getpass
63
- - prompt: add PROMPT_ECHO flag
64
- - stub out getpass_echo function
65
- - refactor git_getpass into generic prompt function
66
- - move git_getpass to its own source file
67
- - t: add test harness for external credential helpers
68
- - credentials: add "store" helper
69
- - strbuf: add strbuf_add*_urlencode
70
- - credentials: add "cache" helper
71
- - docs: end-user documentation for the credential subsystem
72
- - credential: make relevance of http path configurable
73
- - credential: add credential.*.username
74
- - credential: apply helper config
75
- - http: use credential API to get passwords
76
- - credential: add function for parsing url components
77
- - introduce credentials API
78
- - t5550: fix typo
79
- - test-lib: add test_config_global variant
80
-
81
-* nd/ignore-might-be-precious (2011-11-28) 2 commits
82
- - checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
83
- - Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
84
- (this branch uses nd/maint-ignore-exclude.)
85
-
86
-* jk/upload-archive-use-start-command (2011-11-21) 1 commit
87
- - upload-archive: use start_command instead of fork
88
-
89
-* jk/maint-1.6.2-upload-archive (2011-11-21) 1 commit
90
- - archive: don't let remote clients get unreachable commits
91
- (this branch is used by jk/maint-upload-archive.)
92
-
93
-* jk/maint-upload-archive (2011-11-21) 1 commit
94
- - Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
95
- (this branch uses jk/maint-1.6.2-upload-archive.)
96
-
97
---------------------------------------------------
98
-[Graduated to "master"]
99
-
100
-* jc/maint-name-rev-all (2011-11-15) 1 commit
101
- + name-rev --all: do not even attempt to describe non-commit object
102
-
103
-Fix for a corner-case bug that was present from day one of the command.
104
-
105
-* jn/revert-quit (2011-11-21) 3 commits
106
- + revert: improve error message for cherry-pick during cherry-pick
107
- + revert: rearrange pick_revisions() for clarity
108
- + revert: rename --reset option to --quit
109
-
110
-Late fix for a recent feature.
111
-
112
-* ml/mailmap (2011-11-16) 1 commit
113
- + mailmap: xcalloc mailmap_info
114
-
115
-An obvious(ly correct) and trivial cleanup.
116
-
117
-* rr/misc-fixes (2011-11-15) 4 commits
118
- + git-compat-util: don't assume value for undefined variable
119
- + sha1_file: don't mix enum with int
120
- + convert: don't mix enum with int
121
- + http: remove unused function hex()
122
-
123
-Obvious(ly correct) and trivial cleanups.
69
+* tj/maint-imap-send-remove-unused (2011-11-23) 2 commits
70
+ - Merge branch 'maint' into tj/imap-send-remove-unused
71
+ - imap-send: Remove unused 'use_namespace' variable
72
73
--------------------------------------------------
74
[Stalled]
@@ -146,7 +94,6 @@ looked somewhat suboptimal.
94
+ completion: optimize refs completion
95
+ completion: document __gitcomp()
96
149
-Will keep in 'next' during this cycle.
97
Needs an Ack or two from completion folks before going forward.
98
99
* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
@@ -191,7 +138,7 @@ because we are incapable of coding this, but because it is not a good idea
138
to do this. I suspect people who are new to git that might think they need
139
it would soon realize the don't.
140
194
-Will keep in 'pu' as a showcase for a while and then will drop.
141
+Will drop.
142
143
* eh/grep-scale-to-cpunum (2011-11-05) 1 commit
144
- grep: detect number of CPUs for thread spawning
@@ -205,28 +152,88 @@ Kills I/O parallelism and needs to be improved or discarded.
152
153
Not absolutely needed; parked in 'pu' but may drop.
154
155
+* cb/daemon-permission-errors (2011-10-17) 2 commits
156
+ - daemon: report permission denied error to clients
157
+ - daemon: add tests
158
+
159
+The tip commit might be loosening things a bit too much.
160
+
161
--------------------------------------------------
162
[Cooking]
163
164
+* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
165
+ - convert: track state in LF-to-CRLF filter
166
+
167
+Candidate for early next cycle.
168
+
169
+* nd/maint-ignore-exclude (2011-11-28) 1 commit
170
+ - checkout,merge: loosen overwriting untracked file check based on info/exclude
171
+ (this branch is used by nd/ignore-might-be-precious.)
172
+
173
+Candidate for early next cycle.
174
+
175
+* vr/git-merge-doc (2011-11-21) 1 commit
176
+ - Show error for 'git merge' with unset merge.defaultToUpstream
177
+
178
+Candidate for early next cycle.
179
+
180
+* jn/branch-move-to-self (2011-11-28) 2 commits
181
+ - Allow checkout -B <current-branch> to update the current branch
182
+ - branch: allow a no-op "branch -M <current-branch> HEAD"
183
+
184
+Candidate for early next cycle.
185
+
186
+* jk/credentials (2011-11-28) 20 commits
187
+ - fixup! 034c066e
188
+ - compat/getpass: add a /dev/tty implementation
189
+ - credential: use git_prompt instead of git_getpass
190
+ - prompt: add PROMPT_ECHO flag
191
+ - stub out getpass_echo function
192
+ - refactor git_getpass into generic prompt function
193
+ - move git_getpass to its own source file
194
+ - t: add test harness for external credential helpers
195
+ - credentials: add "store" helper
196
+ - strbuf: add strbuf_add*_urlencode
197
+ - credentials: add "cache" helper
198
+ - docs: end-user documentation for the credential subsystem
199
+ - credential: make relevance of http path configurable
200
+ - credential: add credential.*.username
201
+ - credential: apply helper config
202
+ - http: use credential API to get passwords
203
+ - credential: add function for parsing url components
204
+ - introduce credentials API
205
+ - t5550: fix typo
206
+ - test-lib: add test_config_global variant
207
+
208
+* nd/ignore-might-be-precious (2011-11-28) 2 commits
209
+ - checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
210
+ - Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
211
+ (this branch uses nd/maint-ignore-exclude.)
212
+
213
+* jk/upload-archive-use-start-command (2011-11-21) 1 commit
214
+ - upload-archive: use start_command instead of fork
215
+
216
+* jk/maint-1.6.2-upload-archive (2011-11-21) 1 commit
217
+ - archive: don't let remote clients get unreachable commits
218
+ (this branch is used by jk/maint-upload-archive.)
219
+
220
+* jk/maint-upload-archive (2011-11-21) 1 commit
221
+ - Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
222
+ (this branch uses jk/maint-1.6.2-upload-archive.)
223
+
224
* jk/refresh-porcelain-output (2011-11-18) 3 commits
225
(merged to 'next' on 2011-11-18 at 872f25e)
226
+ refresh_index: make porcelain output more specific
227
+ refresh_index: rename format variables
228
+ read-cache: let refresh_cache_ent pass up changed flags
229
217
-Will keep in 'next' during this cycle.
218
-
230
* ab/enable-i18n (2011-11-18) 1 commit
231
- i18n: add infrastructure for translating Git with gettext
232
222
-Not urgent.
223
-
233
* gh/userdiff-matlab (2011-11-15) 1 commit
234
(merged to 'next' on 2011-11-18 at 10cd275)
235
+ Add built-in diff patterns for MATLAB code
236
228
-Will keep in 'next' during this cycle.
229
-
237
* jc/maint-pack-object-cycle (2011-11-16) 1 commit
238
(merged to 'next' on 2011-11-18 at 3715a81)
239
+ pack-object: tolerate broken packs that have duplicated objects
@@ -235,16 +242,12 @@ Make the client side more robust against bogus pack stream; the problem
242
was discovered by accident while repacking a clone obtained from somewhat
243
buggy test server.
244
238
-Will keep in 'next' during this cycle.
239
-
245
* jc/index-pack-reject-dups (2011-11-16) 1 commit
246
(merged to 'next' on 2011-11-18 at 2090221)
247
+ receive-pack, fetch-pack: reject bogus pack that records objects twice
248
249
And this is the prevention to reject such pack stream in the first place.
250
246
-Will keep in 'next' during this cycle.
247
-
251
* nd/resolve-ref (2011-11-13) 2 commits
252
(merged to 'next' on 2011-11-18 at 8e17b34)
253
+ Copy resolve_ref() return value for longer use
@@ -253,25 +256,20 @@ Will keep in 'next' during this cycle.
256
A fix for an error-reporting codepath that is not a regression, that
257
turned into a patch that touches many callsite.
258
256
-Will keep in 'next' during this cycle.
257
-
259
* vr/msvc (2011-10-31) 3 commits
260
(merged to 'next' on 2011-11-14 at f46d021)
261
+ MSVC: Remove unneeded header stubs
262
+ Compile fix for MSVC: Include <io.h>
263
+ Compile fix for MSVC: Do not include sys/resources.h
264
264
-Will keep in 'next' during this cycle.
265
-
265
* na/strtoimax (2011-11-05) 3 commits
266
(merged to 'next' on 2011-11-14 at b64e1cb)
267
+ Support sizes >=2G in various config options accepting 'g' sizes.
268
+ Compatibility: declare strtoimax() under NO_STRTOUMAX
269
+ Add strtoimax() compatibility function.
270
272
-Will keep in 'next' during this cycle.
273
-
274
-* jc/signed-commit (2011-11-12) 4 commits
271
+* jc/signed-commit (2011-11-29) 5 commits
272
+ - gpg-interface: allow use of a custom GPG binary
273
- pretty: %G[?GS] placeholders
274
- test "commit -S" and "log --show-signature"
275
- log: --show-signature
@@ -303,8 +301,6 @@ out of 'next'.
301
Further updated to allow "commit --amend" to retain the mergetag
302
headers. I think this is ready for the cycle after upcoming 1.7.8.
303
306
-Will keep in 'next' during this cycle.
307
-
304
* jc/request-pull-show-head-4 (2011-11-09) 12 commits
305
(merged to 'next' on 2011-11-13 at e473fd2)
306
+ request-pull: use the annotated tag contents
@@ -328,21 +324,15 @@ Allow setting "description" for branches and use it to help communications
324
between humans in various workflow elements. It also allows requesting for
325
a signed tag to be pulled and shows the tag message in the generated message.
326
331
-Will keep in 'next' during this cycle.
332
-
327
* ab/clang-lints (2011-11-06) 2 commits
328
(merged to 'next' on 2011-11-13 at a573aec)
329
+ cast variable in call to free() in builtin/diff.c and submodule.c
330
+ apply: get rid of useless x < 0 comparison on a size_t type
331
338
-Will keep in 'next' during this cycle.
339
-
332
* ab/pull-rebase-config (2011-11-07) 1 commit
333
(merged to 'next' on 2011-11-13 at 72bb2d5)
334
+ pull: introduce a pull.rebase option to enable --rebase
335
344
-Will keep in 'next' during this cycle.
345
-
336
* nd/fsck-progress (2011-11-06) 4 commits
337
(merged to 'next' on 2011-11-13 at 8831811)
338
+ fsck: print progress
@@ -350,31 +340,25 @@ Will keep in 'next' during this cycle.
340
+ verify_packfile(): check as many object as possible in a pack
341
+ fsck: return error code when verify_pack() goes wrong
342
353
-Will keep in 'next' during this cycle.
354
-
343
* nd/prune-progress (2011-11-07) 3 commits
344
(merged to 'next' on 2011-11-13 at c5722ac)
345
+ reachable: per-object progress
346
+ prune: handle --progress/no-progress
347
+ prune: show progress while marking reachable objects
348
361
-Will keep in 'next' during this cycle.
362
-
363
-* jc/stream-to-pack (2011-11-23) 8 commits
364
- - bulk-checkin: honor pack.packsizelimit
365
- - bulk-checkin: do not write an object that already exists
366
- - bulk-checkin: do not write the same object twice
349
+* jc/stream-to-pack (2011-12-01) 5 commits
350
+ - bulk-checkin: replace fast-import based implementation
351
- csum-file: introduce sha1file_checkpoint
368
- - Bulk check-in
352
- finish_tmp_packfile(): a helper function
353
- create_tmp_packfile(): a helper function
354
- write_pack_header(): a helper function
355
+ (this branch is used by jc/split-blob.)
356
357
Teaches "git add" to send large-ish blob data straight to a packfile.
374
-This is a continuation to the "large file support" topic. I think this
375
-codepath to move data from worktree to repository needs to become aware of
376
-streaming, just like the checkout codepath that goes the other way, which
377
-was done in the previous "large file support" topic in the 1.7.7 cycle.
358
+This is a continuation to the "large file support" topic. The codepath to
359
+move data from worktree to repository is made aware of streaming, just
360
+like the checkout codepath that goes the other way, which was done in the
361
+previous "large file support" topic in the 1.7.7 cycle.
362
363
* jn/gitweb-side-by-side-diff (2011-10-31) 8 commits
364
- gitweb: Add navigation to select side-by-side diff
@@ -396,7 +380,6 @@ Replaces a series from Kato Kazuyoshi on the same topic.
380
+ http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
381
382
Reduces unnecessary waits.
399
-Will keep in 'next' during this cycle.
383
384
* nd/misc-cleanups (2011-10-27) 6 commits
385
(merged to 'next' on 2011-10-28 at 2527a49)
@@ -410,15 +393,11 @@ Will keep in 'next' during this cycle.
393
These are unquestionably good parts taken out of a larger series, so that
394
we can focus more on the other changes in later rounds of review.
395
413
-Will keep in 'next' during this cycle.
414
-
396
* rs/allocate-cache-entry-individually (2011-10-26) 2 commits
397
(merged to 'next' on 2011-10-27 at 2e4acd6)
398
+ cache.h: put single NUL at end of struct cache_entry
399
+ read-cache.c: allocate index entries individually
400
420
-Will keep in 'next' during this cycle.
421
-
401
* mh/ref-api-3 (2011-11-16) 26 commits
402
(merged to 'next' on 2011-11-16 at cc76151)
403
+ refs: loosen over-strict "format" check
@@ -451,8 +430,6 @@ Will keep in 'next' during this cycle.
430
+ cache.h: add comments for git_path() and git_path_submodule()
431
(this branch is tangled with mh/ref-api-2.)
432
454
-Will keep in 'next' during this cycle.
455
-
433
* rr/revert-cherry-pick (2011-10-23) 5 commits
434
(merged to 'next' on 2011-10-26 at 27b7496)
435
+ revert: simplify communicating command-line arguments
@@ -464,15 +441,6 @@ Will keep in 'next' during this cycle.
441
The internals of "git revert/cherry-pick" has been further refactored to
442
serve as the basis for the sequencer.
443
467
-Will keep in 'next' during this cycle.
468
-
469
-* cb/daemon-permission-errors (2011-10-17) 2 commits
470
- - daemon: report permission denied error to clients
471
- - daemon: add tests
472
-
473
-The tip commit might be loosening things a bit too much.
474
-Will keep in 'pu' until hearing a convincing argument for the patch.
475
-
444
* mh/ref-api-2 (2011-11-16) 15 commits
445
(merged to 'next' on 2011-11-16 at 511457f)
446
+ refs: loosen over-strict "format" check
@@ -492,5 +460,3 @@ Will keep in 'pu' until hearing a convincing argument for the patch.
460
+ struct ref_entry: document name member
461
+ cache.h: add comments for git_path() and git_path_submodule()
462
(this branch is tangled with mh/ref-api-3.)
495
-
496
-Will keep in 'next' during this cycle.