What's cooking (2011/12 #06)
Junio C Hamano committed
Dec 18, 2011 at 21:50 UTC
8414e982923725144bb96bef26d3b415580c9c89
1 file changed
+182
-118
whats-cooking.txt
+182
-118
@@ -1,15 +1,20 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2011, #05; Thu, 15)
3
-X-master-at: 10f4eb652ee4e592f91f638e579d1afcb96c0408
4
-X-next-at: d65a830db872dde05a0cb8e8d289f4f5a50b7818
2
+Subject: What's cooking in git.git (Dec 2011, #06; Sun, 18)
3
+X-master-at: d16520499d2652b5b59dfb25f9cf2d56a4c6913a
4
+X-next-at: 03f4636270a389f701ff4d876e0535fb9fbdc969
5
6
-What's cooking in git.git (Dec 2011, #05; Thu, 15)
6
+What's cooking in git.git (Dec 2011, #06; Sun, 18)
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.
17
+
18
Here are the repositories that have my integration branches:
19
20
With maint, master, next, pu, todo:
@@ -35,25 +40,165 @@ The preformatted documentation in HTML and man format are found in:
40
https://code.google.com/p/git-{htmldocs,manpages}.git/
41
https://github.com/gitster/git-{htmldocs,manpages}.git/
42
43
+--------------------------------------------------
44
+[Graduated to "master"]
45
+
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
82
+
83
--------------------------------------------------
84
[New Topics]
85
86
+* cn/maint-lf-to-crlf-filter (2011-12-16) 1 commit
87
+ - lf_to_crlf_filter(): tell the caller we added "\n" when draining
88
+ (this branch is used by jc/maint-lf-to-crlf-keep-crlf.)
89
+
90
+A recent fix to the codepath was not quite correct.
91
+
92
+Will merge to "next".
93
+
94
+* jc/maint-lf-to-crlf-keep-crlf (2011-12-18) 1 commit
95
+ - lf_to_crlf_filter(): resurrect CRLF->CRLF hack
96
+ (this branch uses cn/maint-lf-to-crlf-filter.)
97
+
98
+The lf-to-crlf filter in the streaming checkout codepath forgot that we
99
+try not to convert LF to CRLF if the repository data already has CRLF.
100
+
101
+Will merge to "next".
102
+
103
+* jc/request-pull-show-head-4 (2011-12-16) 1 commit
104
+ (merged to 'next' on 2011-12-16 at bea51ac)
105
+ + request-pull: update the "pull" command generation logic
106
+
107
+Will merge to "master".
108
+
109
+* jk/doc-fsck (2011-12-16) 1 commit
110
+ - docs: brush up obsolete bits of git-fsck manpage
111
+
112
+Will merge to "next".
113
+
114
+* jk/follow-rename-score (2011-12-16) 1 commit
115
+ - use custom rename score during --follow
116
+
117
+Will merge to "next".
118
+
119
+* jk/pretty-reglog-ent (2011-12-16) 1 commit
120
+ - pretty: give placeholders to reflog identity
121
+
122
+Will merge to "next".
123
+
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".
128
+
129
+* jk/maint-push-v-is-verbose (2011-12-17) 1 commit
130
+ - make "git push -v" actually verbose
131
+
132
+Will merge to "next".
133
+
134
+* jk/maint-strbuf-missing-init (2011-12-18) 2 commits
135
+ - Update jk/maint-strbuf-missing-init to builtin/ rename
136
+ - commit, merge: initialize static strbuf
137
+
138
+Will merge to "next".
139
+
140
+* rs/diff-tree-combined-clean-up (2011-12-17) 3 commits
141
+ - submodule: use diff_tree_combined_merge() instead of diff_tree_combined()
142
+ - pass struct commit to diff_tree_combined_merge()
143
+ - use struct sha1_array in diff_tree_combined()
144
+
145
+Will merge to "next".
146
+
147
+* jn/maint-gitweb-utf8-fix (2011-12-18) 4 commits
148
+ - gitweb: Fix fallback mode of to_utf8 subroutine
149
+ - gitweb: Output valid utf8 in git_blame_common('data')
150
+ - gitweb: esc_html() site name for title in OPML
151
+ - gitweb: Call to_utf8() on input string in chop_and_escape_str()
152
+
153
+Will merge to "next".
154
+
155
+* pw/p4-docs-and-tests (2011-12-18) 11 commits
156
+ - git-p4: document and test submit options
157
+ - git-p4: test and document --use-client-spec
158
+ - git-p4: test --keep-path
159
+ - git-p4: test --max-changes
160
+ - git-p4: document and test --import-local
161
+ - git-p4: honor --changesfile option and test
162
+ - git-p4: document and test clone --branch
163
+ - git-p4: test cloning with two dirs, clarify doc
164
+ - git-p4: clone does not use --git-dir
165
+ - git-p4: test debug macro
166
+ - git-p4: introduce asciidoc documentation
167
+
168
+* jc/advise-push-default (2011-12-18) 2 commits
169
+ - push: hint to use push.default=upstream when appropriate
170
+ - advice: Document that they all default to true
171
+
172
+A counter-proposal to jc/push-ignore-stale that may encourage a bad
173
+workflow.
174
+
175
+--------------------------------------------------
176
+[Cooking]
177
+
178
* ef/setenv-putenv (2011-12-14) 2 commits
179
- compat/setenv.c: error if name contains '='
180
- compat/setenv.c: update errno when erroring out
181
(this branch is used by ef/x-setenv-putenv.)
182
183
+Will merge to "next".
184
+
185
* jk/maint-do-not-feed-stdin-to-tests (2011-12-15) 1 commit
186
- test-lib: redirect stdin of tests
187
188
+Will merge to "next".
189
+
190
* jn/test-cleanup-7006 (2011-12-14) 1 commit
191
- test: errors preparing for a test are not special
192
193
+Will merge to "next".
194
+
195
* nd/war-on-nul-in-commit (2011-12-15) 3 commits
196
- commit_tree(): refuse commit messages that contain NULs
197
- Convert commit_tree() to take strbuf as message
198
- merge: abort if fails to commit
199
200
+Will merge to "next".
201
+
202
* jk/git-prompt (2011-12-12) 10 commits
203
- contrib: add credential helper for OS X Keychain
204
- Makefile: OS X has /dev/tty
@@ -110,78 +255,12 @@ Will merge to 'next' after taking another look.
255
The API for extra anchoring points may require rethought first; that would
256
hopefully make the "ref" part a lot simpler.
257
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
-
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
@@ -190,10 +269,14 @@ Replaces a series from Kato Kazuyoshi on the same topic.
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
@@ -205,6 +288,8 @@ Replaces a series from Kato Kazuyoshi on the same topic.
288
+ revert: give --continue handling its own function
289
(this branch is used by rr/revert-cherry-pick.)
290
291
+Will merge to "master".
292
+
293
* mh/ref-api (2011-12-12) 16 commits
294
(merged to 'next' on 2011-12-15 at d65a830)
295
+ add_ref(): take a (struct ref_entry *) parameter
@@ -227,13 +312,17 @@ Replaces a series from Kato Kazuyoshi on the same topic.
312
313
Later part split out to expedite moving the earlier good bits forward.
314
315
+Will merge to "master".
316
+
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
236
-* tr/grep-threading (2011-12-12) 3 commits
323
+Will merge to "master".
324
+
325
+* tr/grep-threading (2011-12-16) 3 commits
326
- grep: disable threading in non-worktree case
327
- grep: enable threading with -p and -W using lazy attribute lookup
328
- grep: load funcname patterns for -W
@@ -245,10 +334,19 @@ Will merge to 'next' after taking another look.
334
- 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.
340
+
341
+Jonathan had good review comments, and this would need to be rerolled.
342
+
343
* jc/push-ignore-stale (2011-12-14) 2 commits
344
- push: --ignore-stale option
345
- set_ref_status_for_push(): use transport-flags abstraction
346
347
+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.
349
+
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
@@ -256,11 +354,15 @@ Will merge to 'next' after taking another look.
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".
365
+
366
* rr/revert-cherry-pick (2011-12-15) 6 commits
367
- t3502, t3510: clarify cherry-pick -m failure
368
- t3510 (cherry-pick-sequencer): use exit status
@@ -272,6 +374,8 @@ Will merge to 'next' after taking another look.
374
375
Picked up only the earlier bits that are reasonably clear for now.
376
377
+Will merge to "next".
378
+
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
@@ -284,6 +388,8 @@ Picked up only the earlier bits that are reasonably clear for now.
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
@@ -292,15 +398,7 @@ Picked up only the earlier bits that are reasonably clear for now.
398
+ Test the current state of the cache-tree optimization
399
+ Add test-scrap-cache-tree
400
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
298
- + commit: honour --no-edit
299
- + t7501 (commit): modernize style
300
- + test: remove a porcelain test that hard-codes commit names
301
- + test: add missing "&&" after echo command
302
-
303
-Will merge to 'master'.
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)
@@ -312,11 +410,7 @@ Will merge to 'master'.
410
+ test: fix '&&' chaining
411
+ t3200 (branch): fix '&&' chaining
412
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'.
413
+Will merge to "master".
414
415
* jc/split-blob (2011-12-01) 6 commits
416
. WIP (streaming chunked)
@@ -325,20 +419,11 @@ Will merge to 'master'.
419
- bulk-checkin: allow the same data to be multiply hashed
420
- new representation types in the packstream
421
- varint-in-pack: refactor varint encoding/decoding
328
- (this branch uses jc/stream-to-pack.)
422
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
334
-* jh/fast-import-notes (2011-11-28) 3 commits
335
- (merged to 'next' on 2011-12-09 at 2b01132)
336
- + fast-import: Fix incorrect fanout level when modifying existing notes refs
337
- + t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
338
- + t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
339
-
340
-Will merge to 'master'.
341
-
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
@@ -359,11 +444,7 @@ Will merge to 'master'.
444
445
Later part split out to expedite moving the earlier good bits forward.
446
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
-
366
-Will merge to 'master'.
447
+Will merge to "master".
448
449
* ab/enable-i18n (2011-12-05) 1 commit
450
(merged to 'next' on 2011-12-13 at 65af8cd)
@@ -377,20 +458,3 @@ Will merge to 'master'.
458
- commit: teach --gpg-sign option
459
460
Not exactly urgent.
380
-
381
-* jc/stream-to-pack (2011-12-01) 5 commits
382
- (merged to 'next' on 2011-12-09 at d0fd605)
383
- + bulk-checkin: replace fast-import based implementation
384
- + csum-file: introduce sha1file_checkpoint
385
- + finish_tmp_packfile(): a helper function
386
- + create_tmp_packfile(): a helper function
387
- + write_pack_header(): a helper function
388
- (this branch is used by jc/split-blob.)
389
-
390
-Teaches "git add" to send large-ish blob data straight to a packfile.
391
-This is a continuation to the "large file support" topic. The codepath to
392
-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
-
396
-Will merge to 'master'.