What's cooking (2011/11 #04)
Junio C Hamano committed
Nov 16, 2011 at 22:45 UTC
67b04653e372766e43b4568210fd5ed706208f8c
1 file changed
+151
-116
whats-cooking.txt
+151
-116
@@ -1,14 +1,17 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2011, #03; Sun, 13)
3
-X-master-at: bc1bbe0c19a6ff39522b4fa3259f34150e308e1f
4
-X-next-at: 72bb2d5b6710462dbf2e8d479ac63e2a74695332
2
+Subject: What's cooking in git.git (Nov 2011, #04; Wed, 16)
3
+X-master-at: 09116a1c31e3754cb18bb69ef057342cd7808935
4
+X-next-at: cc761519149511482c8cf0afc615993437266af7
5
6
-What's cooking in git.git (Nov 2011, #03; Sun, 13)
6
+What's cooking in git.git (Nov 2011, #04; Wed, 16)
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 'next'.
11
12
+One nasty regression killed, hopefully we are good to go for the third
13
+release candidate tomorrow.
14
+
15
Here are the repositories that have my integration branches:
16
17
With maint, master, next, pu, todo:
@@ -37,42 +40,50 @@ The preformatted documentation in HTML and man format are found in:
40
--------------------------------------------------
41
[New Topics]
42
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.)
43
+* jk/refresh-porcelain-output (2011-11-14) 5 commits
44
+ - perhaps squash? show intent-to-add entries as "A" in verbose refresh
45
+ - refresh_index: notice typechanges in output
46
+ - read-cache: let refresh_cache_ent pass up changed flags
47
+ - refresh_index: mark deletions in porcelain output
48
+ - refresh_index: rename format variables
49
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()
50
+The tip two commits need to be squashed into one.
51
49
---------------------------------------------------
50
-[Graduated to "master"]
52
+* ab/enable-i18n (2011-11-14) 1 commit
53
+ - i18n: add infrastructure for translating Git with gettext
54
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
55
+* gh/userdiff-matlab (2011-11-15) 1 commit
56
+ - Add built-in diff patterns for MATLAB code
57
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
58
+* jc/maint-pack-object-cycle (2011-11-16) 1 commit
59
+ - pack-object: tolerate broken packs that have duplicated objects
60
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
61
+Make the client side more robust against bogus pack stream; the problem
62
+was discovered by accident while repacking a clone obtained from somewhat
63
+buggy test server.
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
65
+* jc/index-pack-reject-dups (2011-11-16) 1 commit
66
+ - receive-pack, fetch-pack: reject bogus pack that records objects twice
67
69
-Regression fix for the upcoming release.
68
+And this is the prevention to reject such pack stream in the first place.
69
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
70
+* jc/maint-name-rev-all (2011-11-15) 1 commit
71
+ - name-rev --all: do not even attempt to describe non-commit object
72
75
-Regression fix for the upcoming release.
73
+Fix for a corner-case bug? that was present from day one of the command.
74
+
75
+* ml/mailmap (2011-11-16) 1 commit
76
+ - mailmap: xcalloc mailmap_info
77
+
78
+An obvious(ly correct) cleanup.
79
+
80
+* rr/misc-fixes (2011-11-15) 4 commits
81
+ - git-compat-util: don't assume value for undefined variable
82
+ - sha1_file: don't mix enum with int
83
+ - convert: don't mix enum with int
84
+ - http: remove unused function hex()
85
+
86
+Obvious(ly correct) cleanups.
87
88
--------------------------------------------------
89
[Stalled]
@@ -86,6 +97,21 @@ Regression fix for the upcoming release.
97
What the topic aims to achieve may make sense, but the implementation
98
looked somewhat suboptimal.
99
100
+* sg/complete-refs (2011-10-21) 9 commits
101
+ (merged to 'next' on 2011-10-26 at d65e2b4)
102
+ + completion: remove broken dead code from __git_heads() and __git_tags()
103
+ + completion: fast initial completion for config 'remote.*.fetch' value
104
+ + completion: improve ls-remote output filtering in __git_refs_remotes()
105
+ + completion: query only refs/heads/ in __git_refs_remotes()
106
+ + completion: support full refs from remote repositories
107
+ + completion: improve ls-remote output filtering in __git_refs()
108
+ + completion: make refs completion consistent for local and remote repos
109
+ + completion: optimize refs completion
110
+ + completion: document __gitcomp()
111
+
112
+Will keep in 'next' during this cycle.
113
+Needs an Ack or two from completion folks before going forward.
114
+
115
* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
116
- t5800: point out that deleting branches does not work
117
- t5800: document inability to push new branch with old content
@@ -135,22 +161,38 @@ Will keep in 'pu' as a showcase for a while and then will drop.
161
162
Kills I/O parallelism and needs to be improved or discarded.
163
164
+* jc/commit-tree-extra (2011-11-12) 2 commits
165
+ - commit-tree: teach -C <extra-commit>
166
+ - commit-tree: teach -x <extra>
167
+ (this branch uses jc/pull-signed-tag; is tangled with jc/signed-commit.)
168
+
169
+Not absolutely needed; parked in 'pu' but may drop.
170
+
171
+--------------------------------------------------
172
+[Cooking]
173
+
174
+* nd/resolve-ref (2011-11-13) 2 commits
175
+ - Copy resolve_ref() return value for longer use
176
+ - Convert many resolve_ref() calls to read_ref*() and ref_exists()
177
+
178
+A fix for an error-reporting codepath that is not a regression, that
179
+turned into a patch that touches many callsite.
180
+
181
* 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
182
+ (merged to 'next' on 2011-11-14 at f46d021)
183
+ + MSVC: Remove unneeded header stubs
184
+ + Compile fix for MSVC: Include <io.h>
185
+ + Compile fix for MSVC: Do not include sys/resources.h
186
143
-It seems this needs to be rehashed with msysgit folks.
187
+Will keep in 'next' during this cycle.
188
189
* 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.
190
+ (merged to 'next' on 2011-11-14 at b64e1cb)
191
+ + Support sizes >=2G in various config options accepting 'g' sizes.
192
+ + Compatibility: declare strtoimax() under NO_STRTOUMAX
193
+ + Add strtoimax() compatibility function.
194
150
-It seems this needs to be rehashed with msysgit folks.
151
-
152
---------------------------------------------------
153
-[Cooking]
195
+Will keep in 'next' during this cycle.
196
197
* jc/signed-commit (2011-11-12) 4 commits
198
- pretty: %G[?GS] placeholders
@@ -163,26 +205,54 @@ Rebased on top of jc/pull-signed-tag topic, after reverting the old one
205
out of 'next'.
206
207
* 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
208
+ (merged to 'next' on 2011-11-14 at 25e8838)
209
+ + commit-tree: teach -m/-F options to read logs from elsewhere
210
+ + commit-tree: update the command line parsing
211
+ + commit: teach --amend to carry forward extra headers
212
+ + merge: force edit and no-ff mode when merging a tag object
213
+ + commit: copy merged signed tags to headers of merge commit
214
+ + merge: record tag objects without peeling in MERGE_HEAD
215
+ + merge: make usage of commit->util more extensible
216
+ + fmt-merge-msg: Add contents of merged tag in the merge message
217
+ + fmt-merge-msg: package options into a structure
218
+ + fmt-merge-msg: avoid early returns
219
+ + refs DWIMmery: use the same rule for both "git fetch" and others
220
+ + fetch: allow "git fetch $there v1.0" to fetch a tag
221
+ + merge: notice local merging of tags and keep it unwrapped
222
+ + fetch: do not store peeled tag object names in FETCH_HEAD
223
+ + Split GPG interface into its own helper library
224
(this branch is used by jc/commit-tree-extra and jc/signed-commit.)
225
226
Further updated to allow "commit --amend" to retain the mergetag
227
headers. I think this is ready for the cycle after upcoming 1.7.8.
228
229
+Will keep in 'next' during this cycle.
230
+
231
+* jc/request-pull-show-head-4 (2011-11-09) 12 commits
232
+ (merged to 'next' on 2011-11-13 at e473fd2)
233
+ + request-pull: use the annotated tag contents
234
+ (merged to 'next' on 2011-10-15 at 7e340ff)
235
+ + fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
236
+ (merged to 'next' on 2011-10-10 at 092175e)
237
+ + environment.c: Fix an sparse "symbol not declared" warning
238
+ + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
239
+ (merged to 'next' on 2011-10-07 at fcaeca0)
240
+ + fmt-merge-msg: use branch.$name.description
241
+ (merged to 'next' on 2011-10-06 at fa5e0fe)
242
+ + request-pull: use the branch description
243
+ + request-pull: state what commit to expect
244
+ + request-pull: modernize style
245
+ + branch: teach --edit-description option
246
+ + format-patch: use branch description in cover letter
247
+ + branch: add read_branch_desc() helper function
248
+ + Merge branch 'bk/ancestry-path' into jc/branch-desc
249
+
250
+Allow setting "description" for branches and use it to help communications
251
+between humans in various workflow elements. It also allows requesting for
252
+a signed tag to be pulled and shows the tag message in the generated message.
253
+
254
+Will keep in 'next' during this cycle.
255
+
256
* ab/clang-lints (2011-11-06) 2 commits
257
(merged to 'next' on 2011-11-13 at a573aec)
258
+ cast variable in call to free() in builtin/diff.c and submodule.c
@@ -245,6 +315,7 @@ Replaces a series from Kato Kazuyoshi on the same topic.
315
+ http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
316
317
Reduces unnecessary waits.
318
+Will keep in 'next' during this cycle.
319
320
* nd/misc-cleanups (2011-10-27) 6 commits
321
(merged to 'next' on 2011-10-28 at 2527a49)
@@ -267,7 +338,9 @@ Will keep in 'next' during this cycle.
338
339
Will keep in 'next' during this cycle.
340
270
-* mh/ref-api-3 (2011-10-19) 11 commits
341
+* mh/ref-api-3 (2011-11-16) 26 commits
342
+ (merged to 'next' on 2011-11-16 at cc76151)
343
+ + refs: loosen over-strict "format" check
344
(merged to 'next' on 2011-10-23 at 92e2d35)
345
+ is_refname_available(): reimplement using do_for_each_ref_in_array()
346
+ names_conflict(): simplify implementation
@@ -280,7 +353,22 @@ Will keep in 'next' during this cycle.
353
+ parse_ref_line(): add a check that the refname is properly formatted
354
+ repack_without_ref(): remove temporary
355
+ Rename another local variable name -> refname
283
- (this branch uses mh/ref-api-2.)
356
+ (merged to 'next' on 2011-10-19 at cc89f0e)
357
+ + resolve_gitlink_ref_recursive(): change to work with struct ref_cache
358
+ + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
359
+ + resolve_gitlink_ref(): improve docstring
360
+ + get_ref_dir(): change signature
361
+ + refs: change signatures of get_packed_refs() and get_loose_refs()
362
+ + is_dup_ref(): extract function from sort_ref_array()
363
+ + add_ref(): add docstring
364
+ + parse_ref_line(): add docstring
365
+ + is_refname_available(): remove the "quiet" argument
366
+ + clear_ref_array(): rename from free_ref_array()
367
+ + refs: rename parameters result -> sha1
368
+ + refs: rename "refname" variables
369
+ + struct ref_entry: document name member
370
+ + cache.h: add comments for git_path() and git_path_submodule()
371
+ (this branch is tangled with mh/ref-api-2.)
372
373
Will keep in 'next' during this cycle.
374
@@ -304,7 +392,9 @@ Will keep in 'next' during this cycle.
392
The tip commit might be loosening things a bit too much.
393
Will keep in 'pu' until hearing a convincing argument for the patch.
394
307
-* mh/ref-api-2 (2011-10-17) 14 commits
395
+* mh/ref-api-2 (2011-11-16) 15 commits
396
+ (merged to 'next' on 2011-11-16 at 511457f)
397
+ + refs: loosen over-strict "format" check
398
(merged to 'next' on 2011-10-19 at cc89f0e)
399
+ resolve_gitlink_ref_recursive(): change to work with struct ref_cache
400
+ Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
@@ -320,61 +410,6 @@ Will keep in 'pu' until hearing a convincing argument for the patch.
410
+ refs: rename "refname" variables
411
+ struct ref_entry: document name member
412
+ cache.h: add comments for git_path() and git_path_submodule()
323
- (this branch is used by mh/ref-api-3.)
324
-
325
-Will keep in 'next' during this cycle.
326
-
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()
330
- + completion: fast initial completion for config 'remote.*.fetch' value
331
- + completion: improve ls-remote output filtering in __git_refs_remotes()
332
- + completion: query only refs/heads/ in __git_refs_remotes()
333
- + completion: support full refs from remote repositories
334
- + completion: improve ls-remote output filtering in __git_refs()
335
- + completion: make refs completion consistent for local and remote repos
336
- + completion: optimize refs completion
337
- + completion: document __gitcomp()
338
-
339
-Will keep in 'next' until an Ack or two from completion folks.
340
-
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)
347
- + environment.c: Fix an sparse "symbol not declared" warning
348
- + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
349
- (merged to 'next' on 2011-10-07 at fcaeca0)
350
- + fmt-merge-msg: use branch.$name.description
351
- (merged to 'next' on 2011-10-06 at fa5e0fe)
352
- + request-pull: use the branch description
353
- + request-pull: state what commit to expect
354
- + request-pull: modernize style
355
- + branch: teach --edit-description option
356
- + format-patch: use branch description in cover letter
357
- + branch: add read_branch_desc() helper function
358
- + Merge branch 'bk/ancestry-path' into jc/branch-desc
359
-
360
-Allow setting "description" for branches and use it to help communications
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.
413
+ (this branch is tangled with mh/ref-api-3.)
414
415
Will keep in 'next' during this cycle.
365
-
366
---------------------------------------------------
367
-[Discarded]
368
-
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.