What's cooking (2011/11 #03)
Junio C Hamano committed
Nov 13, 2011 at 19:44 UTC
aadd6ba8329364062253a58491caa6664dcb4b84
1 file changed
+136
-105
whats-cooking.txt
+136
-105
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2011, #02; Sun, 6)
3
-X-master-at: ee6dfb2d83ba1b057943e705f707fa27e34e47f9
4
-X-next-at: a49516f7bc4c2895be5b0abffee87963c65486fa
2
+Subject: What's cooking in git.git (Nov 2011, #03; Sun, 13)
3
+X-master-at: bc1bbe0c19a6ff39522b4fa3259f34150e308e1f
4
+X-next-at: 72bb2d5b6710462dbf2e8d479ac63e2a74695332
5
6
-What's cooking in git.git (Nov 2011, #02; Sun, 6)
6
+What's cooking in git.git (Nov 2011, #03; Sun, 13)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -23,18 +23,11 @@ With only maint and master:
23
git://git.sourceforge.jp/gitroot/git-core/git.git
24
git://git-core.git.sourceforge.net/gitroot/git-core/git-core
25
26
-With all the topics and integration branches but not todo, html or man:
26
+With all the topics and integration branches:
27
28
https://github.com/gitster/git
29
30
-I will stop pushing the generated documentation branches to the above
31
-repositories, as they are not sources. The only reason the source
32
-repository at k.org has hosted these branches was because it was the only
33
-repository over there that was writable by me; it was an ugly historical
34
-and administrative workaround and not a demonstration of the best
35
-practice.
36
-
37
-These branches are pushed to their own separate repositories instead:
30
+The preformatted documentation in HTML and man format are found in:
31
32
git://git.kernel.org/pub/scm/git/git-{htmldocs,manpages}.git/
33
git://repo.or.cz/git-{htmldocs,manpages}.git/
@@ -44,75 +37,42 @@ These branches are pushed to their own separate repositories instead:
37
--------------------------------------------------
38
[New Topics]
39
47
-* jc/pull-signed-tag (2011-11-04) 10 commits
48
- - merge: force edit mode when merging a tag object
49
- - fmt-merge-msg: Add contents of merged tag in the merge message
50
- - fmt-merge-msg: package options into a structure
51
- - fmt-merge-msg: avoid early returns
52
- - refs DWIMmery: use the same rule for both "git fetch" and others
53
- - tests: distinguish merges of tags and commits
54
- - fetch: allow "git fetch $there v1.0" to fetch a tag
55
- - merge: notice local merging of tags and keep it unwrapped
56
- - fetch: do not store peeled tag object names in FETCH_HEAD
57
- - Split GPG interface into its own helper library
58
-
59
-Fourth round but needs further updates.
60
-Will keep in 'pu' for now.
61
-
62
-* sn/http-auth-with-netrc-fix (2011-11-04) 1 commit
63
- (merged to 'next' on 2011-11-06 at 60b7f96)
64
- + http: don't always prompt for password
65
-
66
-Regression fix for the upcoming release.
67
-Will merge by 1.7.8 final.
40
+* jc/commit-tree-extra (2011-11-12) 2 commits
41
+ - commit-tree: teach -C <extra-commit>
42
+ - commit-tree: teach -x <extra>
43
+ (this branch uses jc/pull-signed-tag; is tangled with jc/signed-commit.)
44
69
-* ab/clang-lints (2011-11-06) 2 commits
70
- - cast variable in call to free() in builtin/diff.c and submodule.c
71
- - apply: get rid of useless x < 0 comparison on a size_t type
45
+* nd/resolve-ref (2011-11-13) 2 commits
46
+ - Copy resolve_ref() return value for longer use
47
+ - Convert many resolve_ref() calls to read_ref*() and ref_exists()
48
73
-Not urgent.
49
+--------------------------------------------------
50
+[Graduated to "master"]
51
52
* ab/i18n-test-fix (2011-11-05) 2 commits
53
(merged to 'next' on 2011-11-06 at f1de9a6)
54
+ t/t7508-status.sh: use test_i18ncmp
55
+ t/t6030-bisect-porcelain.sh: use test_i18ngrep
56
80
-Will merge by 1.7.8 final.
81
-
82
-* ab/pull-rebase-config (2011-11-06) 1 commit
83
- - pull: introduce a pull.rebase option to enable --rebase
57
+* fc/remote-seturl-usage-fix (2011-11-06) 1 commit
58
+ (merged to 'next' on 2011-11-06 at 6c8328c)
59
+ + remote: fix remote set-url usage
60
85
-Not urgent.
86
-
87
-* eh/grep-scale-to-cpunum (2011-11-05) 1 commit
88
- - grep: detect number of CPUs for thread spawning
89
-
90
-Kills I/O parallelism and needs to be improved or discarded.
91
-
92
-* nd/fsck-progress (2011-11-05) 4 commits
93
- - fsck: print progress
94
- - fsck: avoid reading every object twice
95
- - Stop verify_packfile() as soon as an error occurs
96
- - fsck: return error code when verify_pack() goes wrong
97
-
98
-Not urgent.
99
-
100
-* nd/prune-progress (2011-11-05) 1 commit
101
- - prune: show progress while marking reachable objects
102
-
103
-Not urgent.
61
+* jc/remote-setbranches-usage-fix (2011-11-06) 1 commit
62
+ (merged to 'next' on 2011-11-06 at 017606d)
63
+ + remote: fix set-branches usage
64
65
* pw/p4-appledouble-fix (2011-11-05) 1 commit
66
(merged to 'next' on 2011-11-06 at 2ec0af3)
67
+ git-p4: ignore apple filetype
68
69
Regression fix for the upcoming release.
110
-Will merge by 1.7.8 final.
70
112
-* sr/fix-fast-export-tips (2011-11-05) 3 commits
113
- - fast-export: output reset command for commandline revs
114
- - fast-export: do not refer to non-existing marks
115
- - t9350: point out that refs are not updated correctly
71
+* sn/http-auth-with-netrc-fix (2011-11-04) 1 commit
72
+ (merged to 'next' on 2011-11-06 at 60b7f96)
73
+ + http: don't always prompt for password
74
+
75
+Regression fix for the upcoming release.
76
77
--------------------------------------------------
78
[Stalled]
@@ -130,8 +90,22 @@ looked somewhat suboptimal.
90
- t5800: point out that deleting branches does not work
91
- t5800: document inability to push new branch with old content
92
133
-Perhaps 281eee4 (revision: keep track of the end-user input from the
134
-command line, 2011-08-25) would help.
93
+See comments on sr/fix-fast-export-tips topic.
94
+
95
+* sr/fix-fast-export-tips (2011-11-05) 3 commits
96
+ - fast-export: output reset command for commandline revs
97
+ - fast-export: do not refer to non-existing marks
98
+ - t9350: point out that refs are not updated correctly
99
+
100
+The bottom commit from the stalled sr/transport-helper-fix-rfc topic is
101
+fixed with this. It may make sense to drop the other topic and include
102
+that commit in this series.
103
+
104
+The command line parser is still too lax and accepts malformed input, but
105
+this is a step in the right direction and tightening the command line now
106
+should be doable without a low level surgery that touches codepaths that
107
+are unrelated to the command line processing like the previous attempt
108
+used to do.
109
110
* jc/lookup-object-hash (2011-08-11) 6 commits
111
- object hash: replace linear probing with 4-way cuckoo hashing
@@ -156,9 +130,89 @@ it would soon realize the don't.
130
131
Will keep in 'pu' as a showcase for a while and then will drop.
132
133
+* eh/grep-scale-to-cpunum (2011-11-05) 1 commit
134
+ - grep: detect number of CPUs for thread spawning
135
+
136
+Kills I/O parallelism and needs to be improved or discarded.
137
+
138
+* vr/msvc (2011-10-31) 3 commits
139
+ - MSVC: Remove unneeded header stubs
140
+ - Compile fix for MSVC: Include <io.h>
141
+ - Compile fix for MSVC: Do not include sys/resources.h
142
+
143
+It seems this needs to be rehashed with msysgit folks.
144
+
145
+* na/strtoimax (2011-11-05) 3 commits
146
+ - Support sizes >=2G in various config options accepting 'g' sizes.
147
+ - Compatibility: declare strtoimax() under NO_STRTOUMAX
148
+ - Add strtoimax() compatibility function.
149
+
150
+It seems this needs to be rehashed with msysgit folks.
151
+
152
--------------------------------------------------
153
[Cooking]
154
155
+* jc/signed-commit (2011-11-12) 4 commits
156
+ - pretty: %G[?GS] placeholders
157
+ - test "commit -S" and "log --show-signature"
158
+ - log: --show-signature
159
+ - commit: teach --gpg-sign option
160
+ (this branch uses jc/pull-signed-tag; is tangled with jc/commit-tree-extra.)
161
+
162
+Rebased on top of jc/pull-signed-tag topic, after reverting the old one
163
+out of 'next'.
164
+
165
+* jc/pull-signed-tag (2011-11-12) 15 commits
166
+ - commit-tree: teach -m/-F options to read logs from elsewhere
167
+ - commit-tree: update the command line parsing
168
+ - commit: teach --amend to carry forward extra headers
169
+ - merge: force edit and no-ff mode when merging a tag object
170
+ - commit: copy merged signed tags to headers of merge commit
171
+ - merge: record tag objects without peeling in MERGE_HEAD
172
+ - merge: make usage of commit->util more extensible
173
+ - fmt-merge-msg: Add contents of merged tag in the merge message
174
+ - fmt-merge-msg: package options into a structure
175
+ - fmt-merge-msg: avoid early returns
176
+ - refs DWIMmery: use the same rule for both "git fetch" and others
177
+ - fetch: allow "git fetch $there v1.0" to fetch a tag
178
+ - merge: notice local merging of tags and keep it unwrapped
179
+ - fetch: do not store peeled tag object names in FETCH_HEAD
180
+ - Split GPG interface into its own helper library
181
+ (this branch is used by jc/commit-tree-extra and jc/signed-commit.)
182
+
183
+Further updated to allow "commit --amend" to retain the mergetag
184
+headers. I think this is ready for the cycle after upcoming 1.7.8.
185
+
186
+* ab/clang-lints (2011-11-06) 2 commits
187
+ (merged to 'next' on 2011-11-13 at a573aec)
188
+ + cast variable in call to free() in builtin/diff.c and submodule.c
189
+ + apply: get rid of useless x < 0 comparison on a size_t type
190
+
191
+Will keep in 'next' during this cycle.
192
+
193
+* ab/pull-rebase-config (2011-11-07) 1 commit
194
+ (merged to 'next' on 2011-11-13 at 72bb2d5)
195
+ + pull: introduce a pull.rebase option to enable --rebase
196
+
197
+Will keep in 'next' during this cycle.
198
+
199
+* nd/fsck-progress (2011-11-06) 4 commits
200
+ (merged to 'next' on 2011-11-13 at 8831811)
201
+ + fsck: print progress
202
+ + fsck: avoid reading every object twice
203
+ + verify_packfile(): check as many object as possible in a pack
204
+ + fsck: return error code when verify_pack() goes wrong
205
+
206
+Will keep in 'next' during this cycle.
207
+
208
+* nd/prune-progress (2011-11-07) 3 commits
209
+ (merged to 'next' on 2011-11-13 at c5722ac)
210
+ + reachable: per-object progress
211
+ + prune: handle --progress/no-progress
212
+ + prune: show progress while marking reachable objects
213
+
214
+Will keep in 'next' during this cycle.
215
+
216
* jc/stream-to-pack (2011-11-03) 4 commits
217
- Bulk check-in
218
- finish_tmp_packfile(): a helper function
@@ -183,13 +237,6 @@ was done in the previous "large file support" topic in the 1.7.7 cycle.
237
238
Replaces a series from Kato Kazuyoshi on the same topic.
239
186
-* vr/msvc (2011-10-31) 3 commits
187
- - MSVC: Remove unneeded header stubs
188
- - Compile fix for MSVC: Include <io.h>
189
- - Compile fix for MSVC: Do not include sys/resources.h
190
-
191
-It seems this needs to be rehashed with msysgit folks.
192
-
240
* mf/curl-select-fdset (2011-11-04) 4 commits
241
(merged to 'next' on 2011-11-06 at a49516f)
242
+ http: drop "local" member from request struct
@@ -199,11 +246,6 @@ It seems this needs to be rehashed with msysgit folks.
246
247
Reduces unnecessary waits.
248
202
-* na/strtoimax (2011-11-05) 3 commits
203
- - Support sizes >=2G in various config options accepting 'g' sizes.
204
- - Compatibility: declare strtoimax() under NO_STRTOUMAX
205
- - Add strtoimax() compatibility function.
206
-
249
* nd/misc-cleanups (2011-10-27) 6 commits
250
(merged to 'next' on 2011-10-28 at 2527a49)
251
+ unpack_object_header_buffer(): clear the size field upon error
@@ -255,16 +297,6 @@ serve as the basis for the sequencer.
297
298
Will keep in 'next' during this cycle.
299
258
-* jc/check-ref-format-fixup (2011-10-19) 2 commits
259
- (merged to 'next' on 2011-10-19 at 98981be)
260
- + Revert "Restrict ref-like names immediately below $GIT_DIR"
261
- (merged to 'next' on 2011-10-15 at 8e89bc5)
262
- + Restrict ref-like names immediately below $GIT_DIR
263
-
264
-This became a no-op except for the bottom one which is part of the other
265
-topic now.
266
-Will discard once the other topic graduates to 'master'.
267
-
300
* cb/daemon-permission-errors (2011-10-17) 2 commits
301
- daemon: report permission denied error to clients
302
- daemon: add tests
@@ -292,19 +324,6 @@ Will keep in 'pu' until hearing a convincing argument for the patch.
324
325
Will keep in 'next' during this cycle.
326
295
-* jc/signed-commit (2011-10-21) 7 commits
296
- (merged to 'next' on 2011-10-23 at 03eec25)
297
- + pretty: %G[?GS] placeholders
298
- + parse_signed_commit: really use the entire commit log message
299
- + test "commit -S" and "log --show-signature"
300
- + t7004: extract generic "GPG testing" bits
301
- + log: --show-signature
302
- + commit: teach --gpg-sign option
303
- + Split GPG interface into its own helper library
304
-
305
-This is to replace the earlier "signed push" experiments.
306
-Will keep in 'next' during this cycle.
307
-
327
* sg/complete-refs (2011-10-21) 9 commits
328
(merged to 'next' on 2011-10-26 at d65e2b4)
329
+ completion: remove broken dead code from __git_heads() and __git_tags()
@@ -319,7 +338,9 @@ Will keep in 'next' during this cycle.
338
339
Will keep in 'next' until an Ack or two from completion folks.
340
322
-* jc/request-pull-show-head-4 (2011-10-15) 11 commits
341
+* jc/request-pull-show-head-4 (2011-11-09) 12 commits
342
+ (merged to 'next' on 2011-11-13 at e473fd2)
343
+ + request-pull: use the annotated tag contents
344
(merged to 'next' on 2011-10-15 at 7e340ff)
345
+ fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
346
(merged to 'next' on 2011-10-10 at 092175e)
@@ -337,7 +358,8 @@ Will keep in 'next' until an Ack or two from completion folks.
358
+ Merge branch 'bk/ancestry-path' into jc/branch-desc
359
360
Allow setting "description" for branches and use it to help communications
340
-between humans in various workflow elements.
361
+between humans in various workflow elements. It also allows requesting for
362
+a signed tag to be pulled and shows the tag message in the generated message.
363
364
Will keep in 'next' during this cycle.
365
@@ -347,3 +369,12 @@ Will keep in 'next' during this cycle.
369
* kk/gitweb-side-by-side-diff (2011-10-17) 2 commits
370
. gitweb: add a feature to show side-by-side diff
371
. gitweb: change format_diff_line() to remove leading SP from $diff_class
372
+
373
+* jc/check-ref-format-fixup (2011-10-19) 2 commits
374
+ (merged to 'next' on 2011-10-19 at 98981be)
375
+ + Revert "Restrict ref-like names immediately below $GIT_DIR"
376
+ (merged to 'next' on 2011-10-15 at 8e89bc5)
377
+ + Restrict ref-like names immediately below $GIT_DIR
378
+
379
+This became a no-op except for the bottom one which is part of the other
380
+topic now.