What's cooking (2011/06 #04)
Junio C Hamano committed
Jun 22, 2011 at 17:20 UTC
ea161214bfd72325adcebf6fba83af1ab2fccb50
1 file changed
+153
-66
whats-cooking.txt
+153
-66
@@ -1,22 +1,127 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2011, #03; Fri, 17)
3
-X-master-at: 36bfb0e5f6004e4c4ac9334107dc185c316839a7
4
-X-next-at: a2eb42042a14044c35525779dcf76ee92f3305a7
2
+Subject: What's cooking in git.git (Jun 2011, #04; Wed, 22)
3
+X-master-at: 7af4fc9cf3e3538a9bfb8b14feeacdeb7f6db7d5
4
+X-next-at: cb7154dc1f1bd87d1e3d1944b736c15bdbae1d91
5
6
-What's cooking in git.git (Jun 2011, #03; Fri, 17)
6
+What's cooking in git.git (Jun 2011, #04; Wed, 22)
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
-We have passed v1.7.6-rc2 and it seems things are really in releaseable
13
-form, so I am tempted to skip -rc3 and tag the final sometime next week.
12
+I ended up tagging 1.7.6-rc3; please test it well. The final expected to
13
+be at around the end of the week.
14
15
--------------------------------------------------
16
[New Topics]
17
18
-* aw/rebase-i-p (2011-06-13) 1 commit
19
- - rebase -i -p: doesn't pick certain merge commits that are children of "upstream"
18
+* ak/gcc46-profile-feedback (2011-06-20) 3 commits
19
+ - Add explanation of the profile feedback build to the README
20
+ - Add profile feedback build to git
21
+ - Add option to disable NORETURN
22
+
23
+* sr/transport-helper-fix (2011-06-19) 20 commits
24
+ - transport-helper: implement marks location as capability
25
+ - transport-helper: Use capname for gitdir capability too
26
+ - transport-helper: export is no longer always the last command
27
+ - transport-helper: change import semantics
28
+ - transport-helper: update ref status after push with export
29
+ - transport-helper: use the new done feature where possible
30
+ - transport-helper: check status code of finish_command
31
+ - transport-helper: factor out push_update_refs_status
32
+ - fast-export: support done feature
33
+ - fast-import: introduce 'done' command
34
+ - git-remote-testgit: fix error handling
35
+ - git-remote-testgit: only push for non-local repositories
36
+ - remote-curl: accept empty line as terminator
37
+ - git_remote_helpers: push all refs during a non-local export
38
+ - transport-helper: don't feed bogus refs to export push
39
+ - teach remote-testgit to import non-HEAD refs
40
+ - t5800: document some non-functional parts of remote helpers
41
+ - t5800: use skip_all instead of prereq
42
+ - t5800: factor out some ref tests
43
+ - transport-helper: fix minor leak in push_refs_with_export
44
+
45
+At least Patch 10/20 (git-remote-testgit: fix error handling) and Patch
46
+15/20 (transport-helper: use the new done feature where possible) need a
47
+reroll.
48
+
49
+* jc/maint-cygwin-trust-executable-bit-default (2011-06-20) 1 commit
50
+ - cygwin: trust executable bit by default
51
+
52
+Fix for an ancient regression.
53
+
54
+* jk/tag-list-multiple-patterns (2011-06-20) 1 commit
55
+ - tag: accept multiple patterns for --list
56
+
57
+* jl/maint-fetch-recursive-fix (2011-06-20) 1 commit
58
+ - fetch: Also fetch submodules in subdirectories in on-demand mode
59
+
60
+* rr/revert-cherry-pick-continue (2011-06-21) 13 commits
61
+ - revert: Introduce --continue to continue the operation
62
+ - revert: Introduce skip-all to cleanup sequencer data
63
+ - revert: Introduce a layer of indirection over pick_commits
64
+ - revert: Persist data for continuation
65
+ - revert: Catch incompatible command-line options early
66
+ - revert: Separate cmdline parsing from functional code
67
+ - revert: Introduce struct to keep command-line options
68
+ - revert: Rename no_replay to record_origin
69
+ - revert: Eliminate global "commit" variable
70
+ - revert: Propogate errors upwards from do_pick_commit
71
+ - revert: Don't check lone argument in get_encoding
72
+ - revert: Factor out add_message_to_msg function
73
+ - advice: Introduce error_resolve_conflict
74
+
75
+Under discussion, just queued here so that it is not lost.
76
+
77
+* fk/relink-upon-ldflags-update (2011-06-22) 1 commit
78
+ - Makefile: Track changes to LDFLAGS and relink when necessary
79
+
80
+* jk/maint-config-param (2011-06-22) 6 commits
81
+ - config: use strbuf_split_str instead of a temporary strbuf
82
+ - strbuf: allow strbuf_split to work on non-strbufs
83
+ - config: avoid segfault when parsing command-line config
84
+ - config: die on error in command-line config
85
+ - fix "git -c" parsing of values with equals signs
86
+ - strbuf_split: add a max parameter
87
+ (this branch is used by jk/clone-cmdline-config.)
88
+
89
+Separated earlier parts of jk/clone-cmdline-config for maint.
90
+
91
+* jm/mergetool-pathspec (2011-06-22) 2 commits
92
+ - mergetool: Don't assume paths are unmerged
93
+ - mergetool: Add tests for filename with whitespace
94
+
95
+I think this is a good idea, but it probably needs a re-roll.
96
+
97
+* jn/gitweb-split-header-html (2011-06-22) 1 commit
98
+ - gitweb: Refactor git_header_html
99
+
100
+--------------------------------------------------
101
+[Stalled]
102
+
103
+* jh/receive-count-limit (2011-05-23) 10 commits
104
+ - receive-pack: Allow server to refuse pushes with too many objects
105
+ - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
106
+ - send-pack/receive-pack: Allow server to refuse pushing too large packs
107
+ - pack-objects: Allow --max-pack-size to be used together with --stdout
108
+ - send-pack/receive-pack: Allow server to refuse pushes with too many commits
109
+ - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
110
+ - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
111
+ - Tighten rules for matching server capabilities in server_supports()
112
+ - send-pack: Attempt to retrieve remote status even if pack-objects fails
113
+ - Update technical docs to reflect side-band-64k capability in receive-pack
114
+
115
+Would need another round to separate per-pack and per-session limits.
116
+Not urgent. Will not merge before 1.7.6.
117
+
118
+--------------------------------------------------
119
+[Cooking]
120
+
121
+* aw/rebase-i-p (2011-06-19) 1 commit
122
+ - rebase -i -p: include non-first-parent commits in todo list
123
+
124
+Rerolled with a minor tweak.
125
126
* en/merge-recursive (2011-06-13) 49 commits
127
- t3030: fix accidental success in symlink rename
@@ -69,6 +174,8 @@ form, so I am tempted to skip -rc3 and tag the final sometime next week.
174
- t6042: Add failing testcase for rename/modify/add-source conflict
175
- t6042: Add a testcase where git deletes an untracked file
176
177
+Haven't looked at the whole series yet.
178
+
179
* fg/submodule-keep-updating (2011-06-13) 3 commits
180
- git-submodule.sh: clarify the "should we die now" logic
181
- submodule update: continue when a checkout fails
@@ -91,47 +198,18 @@ form, so I am tempted to skip -rc3 and tag the final sometime next week.
198
- t1301-*.sh: Fix the 'forced modes' test on cygwin
199
- help.c: Fix detection of custom merge strategy on cygwin
200
94
-* di/no-no-existant (2011-06-16) 1 commit
95
- - Fix typo: existant->existent
96
-
97
-* jk/archive-tar-filter (2011-06-15) 7 commits
201
+* jk/archive-tar-filter (2011-06-22) 9 commits
202
+ - upload-archive: allow user to turn off filters
203
- archive: provide builtin .tar.gz filter
99
- - archive: match extensions from user-configured formats
100
- - archive: refactor format-guessing from filename
101
- - archive: advertise user tar-filters in --list
102
- - archive: support user tar-filters via --format
103
- - archive: add user-configurable tar-filter infrastructure
204
+ - archive: implement configurable tar filters
205
+ - archive: refactor file extension format-guessing
206
+ - archive: move file extension format-guessing lower
207
+ - archive: pass archiver struct to write_archive callback
208
+ - archive: refactor list of archive formats
209
+ - archive-tar: don't reload default config options
210
- archive: reorder option parsing and config reading
211
106
---------------------------------------------------
107
-[Stalled]
108
-
109
-* js/ref-namespaces (2011-06-07) 4 commits
110
- . ref namespaces: documentation
111
- . ref namespaces: support remote repositories via upload-pack and receive-pack
112
- . ref namespaces: infrastructure
113
- . Fix prefix handling in ref iteration functions
114
-
115
-Fairly involved feature enhancement, and breaks tests when merged to 'pu'.
116
-Not urgent. Will not merge before 1.7.6.
117
-
118
-* jh/receive-count-limit (2011-05-23) 10 commits
119
- - receive-pack: Allow server to refuse pushes with too many objects
120
- - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
121
- - send-pack/receive-pack: Allow server to refuse pushing too large packs
122
- - pack-objects: Allow --max-pack-size to be used together with --stdout
123
- - send-pack/receive-pack: Allow server to refuse pushes with too many commits
124
- - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
125
- - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
126
- - Tighten rules for matching server capabilities in server_supports()
127
- - send-pack: Attempt to retrieve remote status even if pack-objects fails
128
- - Update technical docs to reflect side-band-64k capability in receive-pack
129
-
130
-Would need another round to separate per-pack and per-session limits.
131
-Not urgent. Will not merge before 1.7.6.
132
-
133
---------------------------------------------------
134
-[Cooking]
212
+Rerolled.
213
214
* jc/index-pack (2011-06-05) 9 commits
215
- verify-pack: use index-pack --verify
@@ -155,14 +233,13 @@ Not urgent. Will not merge before 1.7.6.
233
+ mingw.c: move definition of mingw_getenv down
234
+ sh-i18n--envsubst: do not crash when no arguments are given
235
158
-Looked sane but will wait for msysgit folks to take a look.
236
Not urgent. Will not merge before 1.7.6.
237
238
* an/shallow-doc (2011-06-08) 2 commits
239
- Document the underlying protocol used by shallow repositories and --depth commands.
240
- Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
241
165
-Waiting for a review, but looked sensible.
242
+Not waiting for a review any longer; looked sensible.
243
244
* jc/legacy-loose-object (2011-06-08) 1 commit
245
- sha1_file.c: "legacy" is really the current format
@@ -179,17 +256,15 @@ Waiting for a review, but looked sensible.
256
This replaces the earlier attempt to deal with the mismatch between our
257
expectation and what zlib API actually offers piecemeal.
258
182
-* jk/clone-cmdline-config (2011-06-11) 10 commits
259
+* jk/clone-cmdline-config (2011-06-22) 4 commits
260
- clone: accept config options on the command line
261
- config: make git_config_parse_parameter a public function
262
- remote: use new OPT_STRING_LIST
263
- parse-options: add OPT_STRING_LIST helper
187
- - config: use strbuf_split_str instead of a temporary strbuf
188
- - strbuf: allow strbuf_split to work on non-strbufs
189
- - config: avoid segfault when parsing command-line config
190
- - config: die on error in command-line config
191
- - fix "git -c" parsing of values with equals signs
192
- - strbuf_split: add a max parameter
264
+ (this branch uses jk/maint-config-param.)
265
+
266
+Separated the earlier parts out to make it mergeable to the maintenance
267
+track.
268
269
* jk/tag-contains-ab (2011-06-11) 4 commits
270
- Why is "git tag --contains" so slow?
@@ -197,16 +272,6 @@ expectation and what zlib API actually offers piecemeal.
272
- limit "contains" traversals based on commit timestamp
273
- tag: speed up --contains calculation
274
200
-* jk/transport-helper-fix (2011-06-07) 8 commits
201
- - git_remote_helpers: push all refs during a non-local export
202
- - transport-helper: don't feed bogus refs to export push
203
- - teach remote-testgit to import multiple refs
204
- - teach remote-testgit to import non-HEAD refs
205
- - t5800: document some non-functional parts of remote helpers
206
- - t5800: factor out some ref tests
207
- - git-remote-testgit: exit gracefully after push
208
- - transport-helper: fix minor leak in push_refs_with_export
209
-
275
* db/http-cookies (2011-06-03) 1 commit
276
(merged to 'next' on 2011-06-06 at 90d736a)
277
+ http: pass http.cookiefile using CURLOPT_COOKIEFILE
@@ -405,4 +470,26 @@ Not urgent. Will not merge before 1.7.6.
470
+ i18n: git-am add git-sh-i18n
471
472
Rerolled.
408
-Will cook a bit longer.
473
+
474
+--------------------------------------------------
475
+[Discarded]
476
+
477
+* jk/transport-helper-fix (2011-06-07) 8 commits
478
+ . git_remote_helpers: push all refs during a non-local export
479
+ . transport-helper: don't feed bogus refs to export push
480
+ . teach remote-testgit to import multiple refs
481
+ . teach remote-testgit to import non-HEAD refs
482
+ . t5800: document some non-functional parts of remote helpers
483
+ . t5800: factor out some ref tests
484
+ . git-remote-testgit: exit gracefully after push
485
+ . transport-helper: fix minor leak in push_refs_with_export
486
+
487
+sr/transport-helper-fix is a superset of this.
488
+
489
+* js/ref-namespaces (2011-06-07) 4 commits
490
+ . ref namespaces: documentation
491
+ . ref namespaces: support remote repositories via upload-pack and receive-pack
492
+ . ref namespaces: infrastructure
493
+ . Fix prefix handling in ref iteration functions
494
+
495
+Fairly involved feature enhancement, and breaks tests when merged to 'pu'.