What's cooking (2012/01 #02)
Junio C Hamano committed
Jan 9, 2012 at 16:44 UTC
4d9c22f7ddd04671116c609e051221a373057c54
1 file changed
+131
-136
whats-cooking.txt
+131
-136
@@ -1,18 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2012, #01; Thu, 5)
3
-X-master-at: 247f9d23da8cfd255533433ad2aa07d172afac0b
4
-X-next-at: 5da3ae2f29b4c8b897e934b1856cbb7753383aee
2
+Subject: What's cooking in git.git (Jan 2012, #02; Mon, 9)
3
+X-master-at: beecc7ab65b31c5471331e64acaa3f722125ea67
4
+X-next-at: 6c3c759d2442c2dca37be91f899570e1396d5bd5
5
6
-What's cooking in git.git (Jan 2012, #01; Thu, 5)
6
+What's cooking in git.git (Jan 2012, #02; Mon, 9)
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
-I'll be tagging 1.7.9-rc0 after merging a few topics to "master" to make
14
-it feature complete for the upcoming release tomorrow.
15
-
13
Here are the repositories that have my integration branches:
14
15
With maint, master, next, pu, todo:
@@ -41,39 +38,43 @@ The preformatted documentation in HTML and man format are found in:
38
--------------------------------------------------
39
[New Topics]
40
44
-* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
45
- - fixup! 15eaaf4
46
- - git-svn, perl/Git.pm: extend Git::prompt helper for querying users
47
- (merged to 'next' on 2012-01-05 at 954f125)
48
- + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
41
+* rs/diff-postimage-in-context (2012-01-06) 1 commit
42
+ (merged to 'next' on 2012-01-09 at 9635032)
43
+ + xdiff: print post-image for common records instead of pre-image
44
50
-The bottom one has been replaced with a rewrite based on comments from
51
-Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
52
-give precedence to tty over SSH_ASKPASS when terminal is available.
45
+Looked reasonable.
46
+Not urgent.
47
54
-I think it is OK to include the first one in the upcoming release, but we
55
-may want to wait and defer both to the next cycle.
48
+* cb/push-quiet (2012-01-08) 3 commits
49
+ - t5541: avoid TAP test miscounting
50
+ - fix push --quiet: add 'quiet' capability to receive-pack
51
+ - server_supports(): parse feature list more carefully
52
57
-* pw/p4-view-updates (2012-01-03) 6 commits
58
- (merged to 'next' on 2012-01-03 at c3b5872)
59
- + git-p4: view spec documentation
60
- + git-p4: rewrite view handling
61
- + git-p4: support single file p4 client view maps
62
- + git-p4: sort client views by reverse View number
63
- + git-p4: fix test for unsupported P4 Client Views
64
- + git-p4: test client view handling
53
+Looked reasonable.
54
+Not urgent.
55
+
56
+* nd/clone-detached (2012-01-08) 6 commits
57
+ - clone: print advice on checking out detached HEAD
58
+ - clone: allow --branch to take a tag
59
+ - clone: --branch=<branch> always means refs/heads/<branch>
60
+ - clone: factor out checkout code
61
+ - clone: write detached HEAD in bare repositories
62
+ - t5601: add missing && cascade
63
66
-Will merge to 'master' by 1.7.9 final.
67
-Unless real git-p4 users object (I am not one of them, so I cannot really
68
-judge), that is.
64
+I am not sure what the benefit of this is.
65
70
-* cb/git-daemon-tests (2012-01-04) 1 commit
71
- (merged to 'next' on 2012-01-05 at 86f3e93)
72
- + daemon: add tests
66
+* nd/clone-single-branch (2012-01-08) 1 commit
67
+ (merged to 'next' on 2012-01-09 at 6c3c759)
68
+ + clone: add --single-branch to fetch only one branch
69
74
-It stirred a related discussion on how the process termination should be
75
-handled in the daemon, but the test queued should be OK as-is on systems
76
-that have "pkill" (which is outside POSIX).
70
+Looked reasonable.
71
+Not urgent.
72
+
73
+* jn/gitweb-unspecified-action (2012-01-09) 1 commit
74
+ - gitweb: Fix actionless dispatch for non-existent objects
75
+
76
+--------------------------------------------------
77
+[Graduated to "master"]
78
79
* jc/show-sig (2012-01-05) 6 commits
80
(merged to 'next' on 2012-01-05 at 5da3ae2)
@@ -87,83 +88,98 @@ that have "pkill" (which is outside POSIX).
88
89
Finishing touches to the already graduated "pull signed tags" topic.
90
90
-Will merge to 'master' by 1.7.9 final.
91
+* jc/signed-commit (2011-11-29) 5 commits
92
+ (merged to 'next' on 2011-12-21 at 8fcbf00)
93
+ + gpg-interface: allow use of a custom GPG binary
94
+ + pretty: %G[?GS] placeholders
95
+ + test "commit -S" and "log --show-signature"
96
+ + log: --show-signature
97
+ + commit: teach --gpg-sign option
98
+ (this branch is used by jc/show-sig.)
99
+
100
+* jh/fetch-head-update (2012-01-03) 1 commit
101
+ (merged to 'next' on 2012-01-04 at b5778e1)
102
+ + write first for-merge ref to FETCH_HEAD first
103
+
104
+* jk/credentials (2012-01-08) 1 commit
105
+ (merged to 'next' on 2012-01-08 at 48766c9)
106
+ + credentials: unable to connect to cache daemon
107
108
* jm/stash-diff-disambiguate (2012-01-01) 1 commit
109
(merged to 'next' on 2012-01-05 at 75a283b)
110
+ stash: Don't fail if work dir contains file named 'HEAD'
111
96
-Will merge to 'master' by 1.7.9 final.
112
+* mh/ref-api-less-extra-refs (2012-01-06) 3 commits
113
+ (merged to 'next' on 2012-01-06 at 3105696)
114
+ + write_head_info(): handle "extra refs" locally
115
+ + show_ref(): remove unused "flag" and "cb_data" arguments
116
+ + receive-pack: move more work into write_head_info()
117
118
* mm/maint-gitweb-project-maxdepth (2012-01-04) 1 commit
99
- - gitweb: accept trailing "/" in $project_list
119
+ (merged to 'next' on 2012-01-06 at bcf3818)
120
+ + gitweb: accept trailing "/" in $project_list
121
122
Looked quite sensible.
102
-Will merge to 'master' by 1.7.9 final.
123
104
-* nd/shallow-clone-without-tag-following (2012-01-05) 1 commit
105
- - Limit refs to fetch to minimum in shallow clones
124
+* pw/p4-view-updates (2012-01-03) 6 commits
125
+ (merged to 'next' on 2012-01-03 at c3b5872)
126
+ + git-p4: view spec documentation
127
+ + git-p4: rewrite view handling
128
+ + git-p4: support single file p4 client view maps
129
+ + git-p4: sort client views by reverse View number
130
+ + git-p4: fix test for unsupported P4 Client Views
131
+ + git-p4: test client view handling
132
107
-Needs adjustment of t5500 at least, and possibly an option to ask for the
108
-traditional "shallowly clone all branches" behaviour.
133
+--------------------------------------------------
134
+[Stalled]
135
110
-* jk/parse-object-cached (2012-01-05) 1 commit
111
- - parse_object: try internal cache before reading object db
136
+* jc/advise-push-default (2011-12-18) 1 commit
137
+ - push: hint to use push.default=upstream when appropriate
138
113
-This is a bit scary change, but I do not think of a way it would break
114
-anything that is currently working correctly.
139
+Peff had a good suggestion outlining an updated code structure so that
140
+somebody new can try to dip his or her toes in the development. Any
141
+takers?
142
116
-* jn/maint-gitweb-grep-fix (2012-01-05) 2 commits
117
- - gitweb: Harden "grep" search against filenames with ':'
118
- - gitweb: Fix file links in "grep" search
143
+Waiting for a reroll.
144
120
-Waiting for a confirmation from bug reporter.
145
+* jc/split-blob (2011-12-01) 6 commits
146
+ . WIP (streaming chunked)
147
+ - chunked-object: fallback checkout codepaths
148
+ - bulk-checkin: support chunked-object encoding
149
+ - bulk-checkin: allow the same data to be multiply hashed
150
+ - new representation types in the packstream
151
+ - varint-in-pack: refactor varint encoding/decoding
152
122
---------------------------------------------------
123
-[Graduated to "master"]
153
+Not ready.
154
125
-* jv/maint-config-set (2011-12-27) 1 commit
126
- (merged to 'next' on 2011-12-27 at 551ac8f)
127
- + Fix an incorrect reference to --set-all.
128
-
129
-* pw/p4-docs-and-tests (2011-12-27) 11 commits
130
- (merged to 'next' on 2011-12-28 at 8acf26e)
131
- + git-p4: document and test submit options
132
- + git-p4: test and document --use-client-spec
133
- + git-p4: test --keep-path
134
- + git-p4: test --max-changes
135
- + git-p4: document and test --import-local
136
- + git-p4: honor --changesfile option and test
137
- + git-p4: document and test clone --branch
138
- + git-p4: test cloning with two dirs, clarify doc
139
- + git-p4: clone does not use --git-dir
140
- + git-p4: introduce asciidoc documentation
141
- + rename git-p4 tests
155
+At least pack-objects and fsck need to learn the new encoding for the
156
+series to be usable locally, and then index-pack/unpack-objects needs to
157
+learn it to be used remotely.
158
143
---------------------------------------------------
144
-[Stalled]
159
+* jc/advise-i18n (2011-12-22) 1 commit
160
+ - i18n of multi-line advice messages
161
146
-* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit
147
- - Work around sed portability issue in t8006-blame-textconv
162
+Allow localization of advice messages that tend to be longer and
163
+multi-line formatted. For now this is deliberately limited to advise()
164
+interface and not vreportf() in general as touching the latter has
165
+interactions with error() that has plumbing callers whose prefix "error: "
166
+should never be translated.
167
149
-Waiting for a clarification of the reasoning in the log message.
168
+--------------------------------------------------
169
+[Cooking]
170
151
-* nd/index-pack-no-recurse (2011-12-27) 4 commits
152
- - fixup! 3413d4d
171
+* nd/index-pack-no-recurse (2012-01-09) 3 commits
172
- index-pack: eliminate unlimited recursion in get_delta_base()
173
- index-pack: eliminate recursion in find_unresolved_deltas
174
- Eliminate recursion in setting/clearing marks in commit list
175
157
-Expecting a reroll.
176
+The first one looked sensible; I am not sure if the second and third ones
177
+take the right approach.
178
159
-* jc/advise-push-default (2011-12-18) 1 commit
160
- - push: hint to use push.default=upstream when appropriate
161
-
162
-Peff had a good suggestion outlining an updated code structure so that
163
-somebody new can try to dip his or her toes in the development. Any
164
-takers?
179
+* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit
180
+ - Work around sed portability issue in t8006-blame-textconv
181
166
-Waiting for a reroll.
182
+Waiting for a clarification of the reasoning in the log message.
183
184
* mh/ref-api-rest (2011-12-12) 35 commits
185
- repack_without_ref(): call clear_packed_ref_cache()
@@ -203,65 +219,44 @@ Waiting for a reroll.
219
- do_for_each_ref(): correctly terminate while processesing extra_refs
220
221
The API for extra anchoring points may require rethought first; that would
206
-hopefully make the "ref" part a lot simpler.
222
+hopefully make the "ref" part a lot simpler. And that is happening in
223
+another topic (which has graduated to 'master').
224
208
-Waiting for a reroll.
225
+Will defer till the next cycle.
226
210
-* jc/split-blob (2011-12-01) 6 commits
211
- . WIP (streaming chunked)
212
- - chunked-object: fallback checkout codepaths
213
- - bulk-checkin: support chunked-object encoding
214
- - bulk-checkin: allow the same data to be multiply hashed
215
- - new representation types in the packstream
216
- - varint-in-pack: refactor varint encoding/decoding
217
-
218
-Not ready.
219
-
220
-At least pack-objects and fsck need to learn the new encoding for the
221
-series to be usable locally, and then index-pack/unpack-objects needs to
222
-learn it to be used remotely.
227
+* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
228
+ - fixup! 15eaaf4
229
+ - git-svn, perl/Git.pm: extend Git::prompt helper for querying users
230
+ (merged to 'next' on 2012-01-05 at 954f125)
231
+ + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
232
224
-* jc/advise-i18n (2011-12-22) 1 commit
225
- - i18n of multi-line advice messages
233
+The bottom one has been replaced with a rewrite based on comments from
234
+Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
235
+give precedence to tty over SSH_ASKPASS when terminal is available.
236
227
-Allow localization of advice messages that tend to be longer and
228
-multi-line formatted. For now this is deliberately limited to advise()
229
-interface and not vreportf() in general as touching the latter has
230
-interactions with error() that has plumbing callers whose prefix "error: "
231
-should never be translated.
237
+Will defer till the next cycle.
238
233
---------------------------------------------------
234
-[Cooking]
239
+* cb/git-daemon-tests (2012-01-08) 5 commits
240
+ (merged to 'next' on 2012-01-08 at 1db8351)
241
+ + git-daemon tests: wait until daemon is ready
242
+ + git-daemon: produce output when ready
243
+ + git-daemon: add tests
244
+ + dashed externals: kill children on exit
245
+ + run-command: optionally kill children on exit
246
236
-* jh/fetch-head-update (2012-01-03) 1 commit
237
- (merged to 'next' on 2012-01-04 at b5778e1)
238
- + write first for-merge ref to FETCH_HEAD first
247
+Will defer till the next cycle.
248
240
-Will merge to 'master' by 1.7.9 final.
249
+* jk/parse-object-cached (2012-01-06) 3 commits
250
+ (merged to 'next' on 2012-01-08 at 8c6fa4a)
251
+ + upload-pack: avoid parsing tag destinations
252
+ + upload-pack: avoid parsing objects during ref advertisement
253
+ + parse_object: try internal cache before reading object db
254
242
-* jc/signed-commit (2011-11-29) 5 commits
243
- (merged to 'next' on 2011-12-21 at 8fcbf00)
244
- + gpg-interface: allow use of a custom GPG binary
245
- + pretty: %G[?GS] placeholders
246
- + test "commit -S" and "log --show-signature"
247
- + log: --show-signature
248
- + commit: teach --gpg-sign option
249
- (this branch is used by jc/show-sig.)
255
+These are a bit scary changes, but I do think they are worth doing.
256
+Will defer till the next cycle.
257
251
-The infrastructure this series adds is used by the finishing touches to
252
-the earlier "pull signed tags" topic, so this will graduate to "master"
253
-together with it when the latter matures, hopefully before 1.7.9 final.
258
+* jn/maint-gitweb-grep-fix (2012-01-05) 2 commits
259
+ - gitweb: Harden "grep" search against filenames with ':'
260
+ - gitweb: Fix file links in "grep" search
261
255
---------------------------------------------------
256
-[Discarded]
257
-
258
-* ss/git-svn-askpass (2011-12-27) 5 commits
259
- - make askpass_prompt a global prompt method for asking users
260
- - ignore empty *_ASKPASS variables
261
- - honour *_ASKPASS for querying username and for querying further actions like unknown certificates
262
- - switch to central prompt method
263
- - add central method for prompting a user using GIT_ASKPASS or SSH_ASKPASS
264
-
265
-This has become more about "prompt without terminal", and was rerolled
266
-into a two-patch series, which is structured a lot nicer than this
267
-original.
262
+Waiting for a confirmation from bug reporter.