What's cooking (2011/08 #01)
Junio C Hamano committed
Aug 3, 2011 at 17:30 UTC
5fe51da2c7de1676598a7ff17152e8472148725c
1 file changed
+176
-105
whats-cooking.txt
+176
-105
@@ -1,28 +1,134 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2011, #05; Sun, 31)
3
-X-master-at: b35acb53458d0f99ba2400b902980b35e5acc2d3
4
-X-next-at: ec3e38edaac75ed4160d114e62c74b1d1d55c320
2
+Subject: What's cooking in git.git (Aug 2011, #01; Wed, 3)
3
+X-master-at: 6a319e393b856461bab89ffe332a02e71befee40
4
+X-next-at: b06e80e736fa17ec470db045b45ab3a5e6a5bd3a
5
6
-What's cooking in git.git (Jul 2011, #05; Sun, 31)
6
+What's cooking in git.git (Aug 2011, #01; Wed, 3)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
+There are a few 'fixup!' commits queued in topics still in 'pu', so that
13
+authors have a choice to just say "that fix looks good, squash it in!"
14
+instead of going through an extra round.
15
+
16
+I should start making noises about the feature freeze by now, but with a
17
+vacation week in the US early in July, my half-absense during OSCON last
18
+week, and just because it is summer in general, this round is going slower
19
+than planned. Let's shoot for the feature freeze in two weeks and decide
20
+which stragglers to postpone to the next round.
21
+
22
--------------------------------------------------
23
[New Topics]
24
15
-* cb/maint-exec-error-report (2011-07-31) 1 commit
16
- - error_routine: use parent's stderr if exec fails
25
+* ac/describe-dirty-refresh (2011-08-01) 2 commits
26
+ - fixup! describe: Refresh the index when run with --dirty
27
+ - describe: Refresh the index when run with --dirty
28
18
-* cb/maint-quiet-push (2011-07-31) 1 commit
19
- - propagate --quiet to send-pack/receive-pack
29
+* cb/maint-ls-files-error-report (2011-08-01) 2 commits
30
+ - squash! ls-files: fix pathspec display on error
31
+ - ls-files: fix pathspec display on error
32
21
-* jl/submodule-update-quiet (2011-07-28) 1 commit
22
- - submodule: update and add must honor --quiet flag
33
+* ef/ipv4-connect-error-report (2011-08-01) 2 commits
34
+ (merged to 'next' on 2011-08-03 at ea4842b)
35
+ + connect: only log if all attempts failed (ipv4)
36
+ + Merge branch 'maint' into ef/ipv4-connect-error-report
37
24
-* jn/gitweb-config-list-case (2011-07-31) 1 commit
25
- - gitweb: Git config keys are case insensitive, make config search too
38
+* jl/submodule-status-summary-doc (2011-08-01) 1 commit
39
+ (merged to 'next' on 2011-08-03 at 88f97a9)
40
+ + Documentation/submodule: add command references and update options
41
+
42
+* js/bisect-no-checkout (2011-08-03) 9 commits
43
+ - bisect: add documentation for --no-checkout option.
44
+ - fixup! bisect: add tests for the --no-checkout option
45
+ - bisect: add tests for the --no-checkout option.
46
+ - fixup! bisect: introduce --no-checkout support into porcelain
47
+ - bisect: introduce --no-checkout support into porcelain.
48
+ - bisect: introduce support for --no-checkout option.
49
+ - bisect: add tests to document expected behaviour in presence of broken trees.
50
+ - bisect: use && to connect statements that are deferred with eval.
51
+ - bisect: move argument parsing before state modification.
52
+
53
+Getting there; I have a couple of trivial fix-ups queued there, though.
54
+
55
+* ms/reflog-show-is-default (2011-08-01) 1 commit
56
+ (merged to 'next' on 2011-08-03 at ae9cf6f)
57
+ + reflog: actually default to subcommand 'show'
58
+
59
+* oa/pull-reflog (2011-08-01) 1 commit
60
+ (merged to 'next' on 2011-08-03 at faeff94)
61
+ + pull: remove extra space from reflog message
62
+
63
+* rs/grep-function-context (2011-08-01) 2 commits
64
+ - grep: long context options
65
+ - grep: add option to show whole function as context
66
+
67
+Will merge to "next".
68
+
69
+* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
70
+ (merged to 'next' on 2011-08-03 at 6918f69)
71
+ + commit: allow partial commits with relative paths
72
+
73
+* mh/check-attr-relative (2011-08-02) 7 commits
74
+ - fixup! builtin/check-attr.c and test-path-utils.c
75
+ - test-path-utils: Add subcommand "prefix_path"
76
+ - test-path-utils: Add subcommand "absolute_path"
77
+ - git-check-attr: Normalize paths
78
+ - git-check-attr: Demonstrate problems with relative paths
79
+ - git-check-attr: Demonstrate problems with unnormalized paths
80
+ - git-check-attr: test that no output is written to stderr
81
+ (this branch uses mh/check-attr-listing.)
82
+
83
+--------------------------------------------------
84
+[Graduated to "master"]
85
+
86
+* jc/maint-reset-unmerged-path (2011-07-13) 1 commit
87
+ (merged to 'next' on 2011-07-19 at bbc2d54)
88
+ + reset [<commit>] paths...: do not mishandle unmerged paths
89
+ (this branch is used by jc/diff-index-refactor.)
90
+
91
+* jc/streaming-filter (2011-07-22) 1 commit
92
+ (merged to 'next' on 2011-07-22 at 2081cd7)
93
+ + streaming: free git_istream upon closing
94
+
95
+A large leak found and plugged.
96
+
97
+* jk/clone-detached (2011-06-07) 4 commits
98
+ (merged to 'next' on 2011-07-25 at 013d7d0)
99
+ + clone: always fetch remote HEAD
100
+ + make copy_ref globally available
101
+ + consider only branches in guess_remote_head
102
+ + t: add tests for cloning remotes with detached HEAD
103
+
104
+* sr/transport-helper-fix (2011-07-19) 21 commits
105
+ (merged to 'next' on 2011-07-19 at e1ef414)
106
+ + transport-helper: die early on encountering deleted refs
107
+ + transport-helper: implement marks location as capability
108
+ + transport-helper: Use capname for refspec capability too
109
+ + transport-helper: change import semantics
110
+ + transport-helper: update ref status after push with export
111
+ + transport-helper: use the new done feature where possible
112
+ + transport-helper: check status code of finish_command
113
+ + transport-helper: factor out push_update_refs_status
114
+ + fast-export: support done feature
115
+ + fast-import: introduce 'done' command
116
+ + git-remote-testgit: fix error handling
117
+ + git-remote-testgit: only push for non-local repositories
118
+ + remote-curl: accept empty line as terminator
119
+ + remote-helpers: export GIT_DIR variable to helpers
120
+ + git_remote_helpers: push all refs during a non-local export
121
+ + transport-helper: don't feed bogus refs to export push
122
+ + git-remote-testgit: import non-HEAD refs
123
+ + t5800: document some non-functional parts of remote helpers
124
+ + t5800: use skip_all instead of prereq
125
+ + t5800: factor out some ref tests
126
+ + transport-helper: fix minor leak in push_refs_with_export
127
+ (this branch is used by sr/transport-helper-fix-rfc.)
128
+
129
+* vi/make-test-vector-less-specific (2011-07-19) 1 commit
130
+ (merged to 'next' on 2011-07-25 at 1973192)
131
+ + tests: cleanup binary test vector files
132
133
--------------------------------------------------
134
[Stalled]
@@ -74,23 +180,30 @@ numbers is already in; backburnered.
180
--------------------------------------------------
181
[Cooking]
182
77
-* jc/streaming-filter (2011-07-22) 1 commit
78
- (merged to 'next' on 2011-07-22 at 2081cd7)
79
- + streaming: free git_istream upon closing
183
+* cb/maint-exec-error-report (2011-08-01) 2 commits
184
+ - notice error exit from pager
185
+ - error_routine: use parent's stderr if exec fails
186
81
-A large leak found and plugged.
82
-Will merge to "master".
187
+* cb/maint-quiet-push (2011-07-31) 1 commit
188
+ (merged to 'next' on 2011-08-01 at 87df938)
189
+ + propagate --quiet to send-pack/receive-pack
190
84
-* jn/gitweb-system-config (2011-07-24) 1 commit
85
- - gitweb: Introduce common system-wide settings for convenience
191
+* jl/submodule-update-quiet (2011-07-28) 1 commit
192
+ (merged to 'next' on 2011-08-01 at c611587)
193
+ + submodule: update and add must honor --quiet flag
194
87
-Will merge to "next".
195
+* jn/gitweb-config-list-case (2011-07-31) 1 commit
196
+ (merged to 'next' on 2011-08-01 at 9268738)
197
+ + gitweb: Git config keys are case insensitive, make config search too
198
89
-* js/ls-tree-error (2011-07-25) 2 commits
90
- - Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
91
- - Add a test to check that git ls-tree sets non-zero exit code on error.
199
+* jn/gitweb-system-config (2011-07-24) 1 commit
200
+ (merged to 'next' on 2011-08-01 at 4941e45)
201
+ + gitweb: Introduce common system-wide settings for convenience
202
93
-Will merge to "next".
203
+* js/ls-tree-error (2011-07-25) 2 commits
204
+ (merged to 'next' on 2011-08-01 at 61bae55)
205
+ + Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
206
+ + Add a test to check that git ls-tree sets non-zero exit code on error.
207
208
* jc/merge-reword (2011-05-25) 2 commits
209
- merge: mark the final "Merge made by..." message for l10n
@@ -99,9 +212,8 @@ Will merge to "next".
212
Probably the topmost commit should be dropped.
213
214
* jk/reset-reflog-message-fix (2011-07-22) 1 commit
102
- - reset: give better reflog messages
103
-
104
-Will merge to "next".
215
+ (merged to 'next' on 2011-08-01 at 6c88837)
216
+ + reset: give better reflog messages
217
218
* jk/add-i-hunk-filter (2011-07-27) 5 commits
219
- add--interactive: add option to autosplit hunks
@@ -110,7 +222,7 @@ Will merge to "next".
222
- add--interactive: factor out regex error handling
223
- add--interactive: refactor patch mode argument processing
224
113
-* mh/check-attr-listing (2011-07-27) 19 commits
225
+* mh/check-attr-listing (2011-08-02) 19 commits
226
- Rename struct git_attr_check to git_attr_value
227
- git-check-attr: Fix command-line handling to match docs
228
- git-check-attr: Drive two tests using the same raw data
@@ -130,49 +242,34 @@ Will merge to "next".
242
- Remove anachronism from comment
243
- doc: Correct git_attr() calls in example code
244
- doc: Add a link from gitattributes(5) to git-check-attr(1)
245
+ (this branch is used by mh/check-attr-relative.)
246
134
-Need to replace this with a more recent reroll.
135
-
136
-* jc/maint-reset-unmerged-path (2011-07-13) 1 commit
137
- (merged to 'next' on 2011-07-19 at bbc2d54)
138
- + reset [<commit>] paths...: do not mishandle unmerged paths
139
- (this branch is used by jc/diff-index-refactor.)
140
-
141
-Will merge to "master".
247
+Except for a few nits, this seems mostly ready.
248
249
* jc/diff-index-refactor (2011-07-13) 2 commits
144
- - diff-lib: refactor run_diff_index() and do_diff_cache()
145
- - diff-lib: simplify do_diff_cache()
146
- (this branch uses jc/maint-reset-unmerged-path.)
147
-
148
-Will merge to "next".
250
+ (merged to 'next' on 2011-08-01 at 98d8b08)
251
+ + diff-lib: refactor run_diff_index() and do_diff_cache()
252
+ + diff-lib: simplify do_diff_cache()
253
254
* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
255
- t5800: point out that deleting branches does not work
256
- t5800: document inability to push new branch with old content
153
- (this branch uses sr/transport-helper-fix.)
257
155
-* vi/make-test-vector-less-specific (2011-07-19) 1 commit
156
- (merged to 'next' on 2011-07-25 at 1973192)
157
- + tests: cleanup binary test vector files
158
-
159
-Will merge to "master".
160
-
161
-* jk/http-auth-keyring (2011-07-21) 14 commits
162
- - credentials: add "getpass" helper
163
- - credentials: add "store" helper
164
- - credentials: add "cache" helper
165
- - docs: end-user documentation for the credential subsystem
166
- - http: use hostname in credential description
167
- - allow the user to configure credential helpers
168
- - look for credentials in config before prompting
169
- - http: use credential API to get passwords
170
- - fixup! introduce credentials API
171
- - introduce credentials API
172
- - http: retry authentication failures for all http requests
173
- - remote-curl: don't retry auth failures with dumb protocol
174
- - improve httpd auth tests
175
- - url: decode buffers that are not NUL-terminated
258
+* jk/http-auth-keyring (2011-08-03) 13 commits
259
+ (merged to 'next' on 2011-08-03 at b06e80e)
260
+ + credentials: add "getpass" helper
261
+ + credentials: add "store" helper
262
+ + credentials: add "cache" helper
263
+ + docs: end-user documentation for the credential subsystem
264
+ + http: use hostname in credential description
265
+ + allow the user to configure credential helpers
266
+ + look for credentials in config before prompting
267
+ + http: use credential API to get passwords
268
+ + introduce credentials API
269
+ + http: retry authentication failures for all http requests
270
+ + remote-curl: don't retry auth failures with dumb protocol
271
+ + improve httpd auth tests
272
+ + url: decode buffers that are not NUL-terminated
273
274
Looked mostly reasonable except for the limitation that it is not clear
275
how to deal with a site at which a user needs to use different passwords
@@ -182,42 +279,6 @@ for different repositories.
279
(merged to 'next' on 2011-07-25 at 36ad29f)
280
+ Makefile: add Minix configuration options.
281
185
-* sr/transport-helper-fix (2011-07-19) 21 commits
186
- (merged to 'next' on 2011-07-19 at e1ef414)
187
- + transport-helper: die early on encountering deleted refs
188
- + transport-helper: implement marks location as capability
189
- + transport-helper: Use capname for refspec capability too
190
- + transport-helper: change import semantics
191
- + transport-helper: update ref status after push with export
192
- + transport-helper: use the new done feature where possible
193
- + transport-helper: check status code of finish_command
194
- + transport-helper: factor out push_update_refs_status
195
- + fast-export: support done feature
196
- + fast-import: introduce 'done' command
197
- + git-remote-testgit: fix error handling
198
- + git-remote-testgit: only push for non-local repositories
199
- + remote-curl: accept empty line as terminator
200
- + remote-helpers: export GIT_DIR variable to helpers
201
- + git_remote_helpers: push all refs during a non-local export
202
- + transport-helper: don't feed bogus refs to export push
203
- + git-remote-testgit: import non-HEAD refs
204
- + t5800: document some non-functional parts of remote helpers
205
- + t5800: use skip_all instead of prereq
206
- + t5800: factor out some ref tests
207
- + transport-helper: fix minor leak in push_refs_with_export
208
- (this branch is used by sr/transport-helper-fix-rfc.)
209
-
210
-Will merge to "master".
211
-
212
-* jk/clone-detached (2011-06-07) 4 commits
213
- (merged to 'next' on 2011-07-25 at 013d7d0)
214
- + clone: always fetch remote HEAD
215
- + make copy_ref globally available
216
- + consider only branches in guess_remote_head
217
- + t: add tests for cloning remotes with detached HEAD
218
-
219
-Will merge to "master".
220
-
282
* jc/pack-order-tweak (2011-07-08) 2 commits
283
(merged to 'next' on 2011-07-25 at 1460c31)
284
+ pack-objects: optimize "recency order"
@@ -231,7 +292,14 @@ Will merge to "master".
292
+ ref namespaces: infrastructure
293
+ Fix prefix handling in ref iteration functions
294
234
-* rc/histogram-diff (2011-07-12) 7 commits
295
+* rc/histogram-diff (2011-08-03) 13 commits
296
+ - fixup! xdiff/xhistogram: rework handling of recursed results
297
+ - xdiff/xhistogram: drop need for additional variable
298
+ - xdiff/xhistogram: rely on xdl_trim_ends()
299
+ - xdiff/xhistogram: rework handling of recursed results
300
+ - xdiff: do away with xdl_mmfile_next()
301
+ (merged to 'next' on 2011-08-03 at f9e2328)
302
+ + Make test number unique
303
(merged to 'next' on 2011-07-25 at 3351028)
304
+ xdiff/xprepare: use a smaller sample size for histogram diff
305
+ xdiff/xprepare: skip classification
@@ -241,9 +309,10 @@ Will merge to "master".
309
+ xdiff/xprepare: refactor abort cleanups
310
+ xdiff/xprepare: use memset()
311
244
-* rr/revert-cherry-pick-continue (2011-07-27) 18 commits
312
+* rr/revert-cherry-pick-continue (2011-08-01) 18 commits
313
+ - revert: Propagate errors upwards from do_pick_commit
314
- revert: Introduce --continue to continue the operation
246
- - revert: Don't implictly stomp pending sequencer operation
315
+ - revert: Don't implicitly stomp pending sequencer operation
316
- revert: Remove sequencer state when no commits are pending
317
- reset: Make reset remove the sequencer state
318
- revert: Introduce --reset to remove sequencer state
@@ -254,14 +323,14 @@ Will merge to "master".
323
- revert: Separate cmdline parsing from functional code
324
- revert: Introduce struct to keep command-line options
325
- revert: Eliminate global "commit" variable
257
- - revert: Propogate errors upwards from do_pick_commit
326
- revert: Rename no_replay to record_origin
327
- revert: Don't check lone argument in get_encoding
328
- revert: Simplify and inline add_message_to_msg
329
- config: Introduce functions to write non-standard file
330
- advice: Introduce error_resolve_conflict
331
264
-Need to replace this with a more recent reroll.
332
+Rerolled (v5) and looked reasonably clean.
333
+Will merge to "next".
334
335
* en/merge-recursive (2011-07-14) 50 commits
336
- fixup! Do not assume that qsort is stable
@@ -315,4 +384,6 @@ Need to replace this with a more recent reroll.
384
- t6042: Add failing testcase for rename/modify/add-source conflict
385
- t6042: Add a testcase where git deletes an untracked file
386
318
-Looked at up to 38/48; looks basically sound.
387
+The tip one should be squashed somewhere. I wanted to push this out in
388
+'next' today, but this seems to regress a rather trivial renaming merge,
389
+so I had to rewind and rebuild 'next' before pushing it out.