What's cooking (2013/05 #01)
Junio C Hamano committed
May 3, 2013 at 16:05 UTC
9eb21aa5c2d7429928e2a917c710d6e1313b36d6
1 file changed
+191
-156
whats-cooking.txt
+191
-156
@@ -1,30 +1,23 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2013, #10; Mon, 29)
4
-X-master-at: 7e6a0cc47da79dd22c0338aee8750fda92ced5d9
5
-X-next-at: 06c29dc5775bfd65329e6072358821bb781a6deb
3
+Subject: What's cooking in git.git (May 2013, #01; Fri, 3)
4
+X-master-at: 7d3ccdffb5d28970dd7a4d177cfcca690ccd0c22
5
+X-next-at: 3fadc6125b27e103d8f0ce6c19c749a972da4d25
6
7
-What's cooking in git.git (Apr 2013, #10; Mon, 29)
7
+What's cooking in git.git (May 2013, #01; Fri, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-There are a few more topics in flight that look sane and trivially
15
-correct that I would feel safe to merge down to 'master', but what
16
-we have in 'master' should be a pretty similar to the final, from
17
-the point of view of features and new fixes. I'd like to see people
18
-focus on catching and fixing last minute regressions and
19
-incompleteness in the topics that have already in 'master' for the
20
-upcoming release.
21
-
22
-New topics that are not relevant for the goal to release a complete
23
-and regression-free 1.8.3 may not be queued even on 'pu' until final
24
-to reduce hassles on integration testing (I do not mean that it is
25
-forbidden to work on and discussing new topics on the list. It is
26
-just the patches won't be considered as formal submission and they
27
-won't hit 'pu').
14
+The tip of the 'master' branch is tagged as v1.8.3-rc1. We seem to
15
+have a few interesting topics that are being discussed but it is
16
+unlikely I'll be picking them up in 'pu'. As we already have merged
17
+enough changes to 'master' during this cycle that can potentially
18
+cause unforseen regressions, let's not merge topics that are not
19
+regression fixes from 'next' to 'master', either, until the final
20
+release.
21
22
You can find the changes described here in the integration branches
23
of the repositories listed at
@@ -34,62 +27,13 @@ of the repositories listed at
27
--------------------------------------------------
28
[Graduated to "master"]
29
37
-* fc/zsh-completion (2013-04-28) 2 commits
38
- + complete: zsh: use zsh completion for the main cmd
39
- + complete: zsh: trivial simplification
40
-
41
-
42
---------------------------------------------------
43
-[New Topics]
44
-
45
-* fc/completion (2013-04-27) 9 commits
46
- - completion: remove __git_index_file_list_filter()
47
- - completion: add space after completed filename
48
- - completion: add hack to enable file mode in bash < 4
49
- - completion: refactor __git_complete_index_file()
50
- - completion: refactor diff_index wrappers
51
- - completion: use __gitcompadd for __gitcomp_file
52
- - completion; remove unuseful comments
53
- - completion: document tilde expansion failure in tests
54
- - completion: add file completion tests
55
-
56
- I saw this discussed somewhat. Is everybody happy with this
57
- version? This is its v2, in the $gmane/222682 thread.
58
-
59
-
60
-* jk/test-output (2013-04-29) 2 commits
61
- - test output: respect $TEST_OUTPUT_DIRECTORY
62
- - t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
63
-
64
- Allows "sh tXXXX-*.sh --root=$there" to correctly use the moved
65
- output directory when summarizing the results.
66
-
67
- Will merge to 'next'.
68
-
69
-
70
-* rj/mingw-cygwin (2013-04-28) 2 commits
71
- - cygwin: Remove the CYGWIN_V15_WIN32API build variable
72
- - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
73
-
74
- Cygwin portability; both were reviewed by Jonathan, and the tip one
75
- seems to want a bit further explanation. Needs positive report
76
- from Cygwin 1.7 users who have been on 1.7 to make sure it does not
77
- regress for them.
78
-
30
+* hb/git-pm-tempfile (2013-04-29) 1 commit
31
+ (merged to 'next' on 2013-04-29 at fecc6b0)
32
+ + Git.pm: call tempfile from File::Temp as a regular function
33
80
-* rj/sparse (2013-04-28) 10 commits
81
- - sparse: Fix mingw_main() argument number/type errors
82
- - compat/mingw.c: Fix some sparse warnings
83
- - compat/win32mmap.c: Fix some sparse warnings
84
- - compat/poll/poll.c: Fix a sparse warning
85
- - compat/win32/pthread.c: Fix a sparse warning
86
- - compat/unsetenv.c: Fix a sparse warning
87
- - compat/nedmalloc: Fix compiler warnings on linux
88
- - compat/nedmalloc: Fix some sparse warnings
89
- - compat/fnmatch/fnmatch.c: Fix a sparse error
90
- - compat/regex/regexec.c: Fix some sparse warnings
34
92
- Will merge to 'next'.
35
+* mb/relnotes-1.8.3-typofix (2013-04-30) 1 commit
36
+ - Fix grammar in the 1.8.3 release notes.
37
38
39
* rs/pp-user-info-without-extra-allocation (2013-04-25) 3 commits
@@ -98,34 +42,65 @@ of the repositories listed at
42
+ pretty: simplify output line length calculation in pp_user_info()
43
+ pretty: simplify input line length calculation in pp_user_info()
44
101
- Will merge to 'master'.
45
46
+* tr/remote-tighten-commandline-parsing (2013-04-24) 3 commits
47
+ (merged to 'next' on 2013-04-29 at 46a1043)
48
+ + remote: 'show' and 'prune' can take more than one remote
49
+ + remote: check for superfluous arguments in 'git remote add'
50
+ + remote: add a test for extra arguments, according to docs
51
104
-* hb/git-pm-tempfile (2013-04-29) 1 commit
105
- (merged to 'next' on 2013-04-29 at fecc6b0)
106
- + Git.pm: call tempfile from File::Temp as a regular function
52
108
- Will merge to 'master'.
53
+* tr/unpack-entry-use-after-free-fix (2013-04-30) 1 commit
54
+ - unpack_entry: avoid freeing objects in base cache
55
110
-
111
-* js/transport-helper-error-reporting-fix (2013-04-28) 3 commits
112
- (merged to 'next' on 2013-04-29 at 8cc4bb8)
113
- + git-remote-testgit: build it to run under $SHELL_PATH
114
- + git-remote-testgit: further remove some bashisms
115
- + git-remote-testgit: avoid process substitution
116
- (this branch uses fc/transport-helper-error-reporting.)
117
-
118
- Finishing touches to fc/transport-helper-error-reporting topic.
119
- Will cook in 'next'.
56
+ Fix for use-after-free regression in 1.8.3-rc0.
57
58
122
-* mh/fetch-into-shallow (2013-04-28) 1 commit
123
- (merged to 'next' on 2013-04-29 at a167d3e)
124
- + upload-pack: ignore 'shallow' lines with unknown obj-ids
59
+* zk/prompt-rebase-step (2013-04-25) 1 commit
60
+ (merged to 'next' on 2013-04-25 at a8264bf)
61
+ + bash-prompt.sh: show where rebase is at when stopped
62
126
- May want to have a few tests. $gmane/222774
127
- Will cook in 'next'.
63
+--------------------------------------------------
64
+[New Topics]
65
66
+* fc/at-head (2013-05-02) 5 commits
67
+ - Add new @ shortcut for HEAD
68
+ - sha1_name: refactor reinterpret()
69
+ - sha1_name: compare variable with constant, not constant with variable
70
+ - sha1_name: remove unnecessary braces
71
+ - sha1_name: remove no-op
72
+
73
+ People are too lazy to type four capital letters "HEAD" and want to
74
+ use a single line-noise "@" instead.
75
+
76
+
77
+* fc/remote-bzr (2013-04-30) 18 commits
78
+ - remote-bzr: access branches only when needed
79
+ - remote-bzr: delay peer branch usage
80
+ - remote-bzr: iterate revisions properly
81
+ - remote-bzr: improve progress reporting
82
+ - remote-bzr: add option to specify branches
83
+ - remote-bzr: add custom method to find branches
84
+ - remote-bzr: improve author sanitazion
85
+ - remote-bzr: add support for shared repo
86
+ - remote-bzr: fix branch names
87
+ - remote-bzr: add support for bzr repos
88
+ - remote-bzr: use branch variable when appropriate
89
+ - remote-bzr: fix partially pushed merge
90
+ - remote-bzr: fixes for branch diverge
91
+ - remote-bzr: add support to push merges
92
+ - remote-bzr: always try to update the worktree
93
+ - remote-bzr: fix order of locking in CustomTree
94
+ - remote-bzr: delay blob fetching until the very end
95
+ - remote-bzr: cleanup CustomTree
96
+
97
+
98
+* jk/lookup-object-prefer-latest (2013-05-02) 1 commit
99
+ - lookup_object: prioritize recently found objects
100
+
101
+
102
+* jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit
103
+ - contrib/subtree: don't delete remote branches if split fails
104
105
--------------------------------------------------
106
[Stalled]
@@ -194,29 +169,93 @@ of the repositories listed at
169
--------------------------------------------------
170
[Cooking]
171
197
-* kb/full-history-compute-treesame-carefully (2013-04-27) 3 commits
198
- - simplify-merges: drop merge from irrelevant side branch
199
- - simplify-merges: never remove all TREESAME parents
200
- - revision.c: tighten up TREESAME handling of merges
172
+* fc/completion (2013-04-27) 9 commits
173
+ - completion: remove __git_index_file_list_filter()
174
+ - completion: add space after completed filename
175
+ - completion: add hack to enable file mode in bash < 4
176
+ - completion: refactor __git_complete_index_file()
177
+ - completion: refactor diff_index wrappers
178
+ - completion: use __gitcompadd for __gitcomp_file
179
+ - completion; remove unuseful comments
180
+ - completion: document tilde expansion failure in tests
181
+ - completion: add file completion tests
182
202
- Another improved redesign coming. This touches a very core part of
203
- the system and will not be a 1.8.3 material.
183
+ I saw this discussed somewhat. Is everybody happy with this
184
+ version? This is its v2, in the $gmane/222682 thread.
185
186
206
-* tr/remote-tighten-commandline-parsing (2013-04-24) 3 commits
207
- (merged to 'next' on 2013-04-29 at 46a1043)
208
- + remote: 'show' and 'prune' can take more than one remote
209
- + remote: check for superfluous arguments in 'git remote add'
210
- + remote: add a test for extra arguments, according to docs
187
+* jk/test-output (2013-04-29) 2 commits
188
+ (merged to 'next' on 2013-05-01 at 63827c9)
189
+ + test output: respect $TEST_OUTPUT_DIRECTORY
190
+ + t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
191
212
- Will merge to 'master'.
192
+ When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat
193
+ inconsistently between the test framework and t/Makefile, and logic
194
+ to summarize the results looked at a wrong place.
195
196
+ Will cook in 'next'.
197
215
-* zk/prompt-rebase-step (2013-04-25) 1 commit
216
- (merged to 'next' on 2013-04-25 at a8264bf)
217
- + bash-prompt.sh: show where rebase is at when stopped
198
219
- Will merge to 'master'.
199
+* rj/mingw-cygwin (2013-04-28) 2 commits
200
+ - cygwin: Remove the CYGWIN_V15_WIN32API build variable
201
+ - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
202
+
203
+ Cygwin portability; both were reviewed by Jonathan, and the tip one
204
+ seems to want a bit further explanation. Needs positive report
205
+ from Cygwin 1.7 users who have been on 1.7 to make sure it does not
206
+ regress for them.
207
+
208
+
209
+* rj/sparse (2013-04-28) 10 commits
210
+ (merged to 'next' on 2013-05-01 at 649e16c)
211
+ + sparse: Fix mingw_main() argument number/type errors
212
+ + compat/mingw.c: Fix some sparse warnings
213
+ + compat/win32mmap.c: Fix some sparse warnings
214
+ + compat/poll/poll.c: Fix a sparse warning
215
+ + compat/win32/pthread.c: Fix a sparse warning
216
+ + compat/unsetenv.c: Fix a sparse warning
217
+ + compat/nedmalloc: Fix compiler warnings on linux
218
+ + compat/nedmalloc: Fix some sparse warnings
219
+ + compat/fnmatch/fnmatch.c: Fix a sparse error
220
+ + compat/regex/regexec.c: Fix some sparse warnings
221
+
222
+ Will cook in 'next'.
223
+
224
+
225
+* js/transport-helper-error-reporting-fix (2013-04-28) 3 commits
226
+ (merged to 'next' on 2013-04-29 at 8cc4bb8)
227
+ + git-remote-testgit: build it to run under $SHELL_PATH
228
+ + git-remote-testgit: further remove some bashisms
229
+ + git-remote-testgit: avoid process substitution
230
+ (this branch uses fc/transport-helper-error-reporting.)
231
+
232
+ Finishing touches to fc/transport-helper-error-reporting topic.
233
+ Will cook in 'next'.
234
+
235
+
236
+* mh/fetch-into-shallow (2013-05-02) 2 commits
237
+ (merged to 'next' on 2013-05-03 at 3fadc61)
238
+ + t5500: add test for fetching with an unknown 'shallow'
239
+ (merged to 'next' on 2013-04-29 at a167d3e)
240
+ + upload-pack: ignore 'shallow' lines with unknown obj-ids
241
+
242
+ Will cook in 'next'.
243
+
244
+
245
+* kb/full-history-compute-treesame-carefully (2013-04-30) 8 commits
246
+ - revision.c: discount UNINTERESTING parents
247
+ - simplify-merges: drop merge from irrelevant side branch
248
+ - simplify-merges: never remove all TREESAME parents
249
+ - t6012: update test for tweaked full-history traversal
250
+ - revision.c: Make --full-history consider more merges
251
+ - rev-list-options.txt: correct TREESAME for P
252
+ - t6019: test file dropped in -s ours merge
253
+ - decorate.c: compact table when growing
254
+
255
+ Major update to a very core part of the system to improve culling
256
+ of irrelevant parents while traversing a mergy history.
257
+
258
+ Will not be a 1.8.3 material.
259
260
261
* jh/checkout-auto-tracking (2013-04-21) 8 commits
@@ -246,7 +285,7 @@ of the repositories listed at
285
+ api-parse-options.txt: document "no-" for non-boolean options
286
+ git-gc.txt, git-reflog.txt: document new expiry options
287
+ date.c: add parse_expiry_date()
249
- (this branch is tangled with mh/packed-refs-various.)
288
+ (this branch is used by mh/packed-refs-various.)
289
290
We used the approxidate() parser for "--expire=<timestamp>" options
291
of various commands, but it is better to treat --expire=all and
@@ -257,7 +296,9 @@ of the repositories listed at
296
Will cook in 'next'.
297
298
260
-* as/check-ignore (2013-04-11) 5 commits
299
+* as/check-ignore (2013-04-29) 6 commits
300
+ (merged to 'next' on 2013-04-30 at 646931f)
301
+ + t0008: use named pipe (FIFO) to test check-ignore streaming
302
(merged to 'next' on 2013-04-21 at 7515aa8)
303
+ Documentation: add caveats about I/O buffering for check-{attr,ignore}
304
+ check-ignore: allow incremental streaming of queries via --stdin
@@ -268,56 +309,50 @@ of the repositories listed at
309
Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
310
over bidi-pipes.
311
271
- Waiting for a follow-up.
272
- $gmane/222235
273
-
274
- The test in the second from the tip needs to be updated.
275
-
276
-
277
-* mh/packed-refs-various (2013-04-24) 36 commits
278
- - refs: handle the main ref_cache specially
279
- - refs: change do_for_each_*() functions to take ref_cache arguments
280
- - pack_one_ref(): do some cheap tests before a more expensive one
281
- - pack_one_ref(): use write_packed_entry() to do the writing
282
- - pack_one_ref(): use function peel_entry()
283
- - refs: inline function do_not_prune()
284
- - pack_refs(): change to use do_for_each_entry()
285
- - refs: use same lock_file object for both ref-packing functions
286
- - pack_one_ref(): rename "path" parameter to "refname"
287
- - pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
288
- - pack-refs: rename handle_one_ref() to pack_one_ref()
289
- - refs: extract a function write_packed_entry()
290
- - repack_without_ref(): write peeled refs in the rewritten file
291
- - t3211: demonstrate loss of peeled refs if a packed ref is deleted
292
- - refs: change how packed refs are deleted
293
- - search_ref_dir(): return an index rather than a pointer
294
- - repack_without_ref(): silence errors for dangling packed refs
295
- - t3210: test for spurious error messages for dangling packed refs
296
- - refs: change the internal reference-iteration API
297
- - refs: extract a function peel_entry()
298
- - peel_ref(): fix return value for non-peelable, not-current reference
299
- - peel_object(): give more specific information in return value
300
- - refs: extract function peel_object()
301
- - refs: extract a function ref_resolves_to_object()
302
- - repack_without_ref(): use function get_packed_ref()
303
- - peel_ref(): use function get_packed_ref()
304
- - get_packed_ref(): return a ref_entry
305
- - do_for_each_ref_in_dirs(): remove dead code
306
- - refs: define constant PEELED_LINE_LENGTH
307
- - refs: document how current_ref is used
308
- - refs: document do_for_each_ref() and do_one_ref()
309
- - refs: document the fields of struct ref_value
310
- - refs: document flags constants REF_*
311
- (merged to 'next' on 2013-04-22 at b00ccf6)
312
- + api-parse-options.txt: document "no-" for non-boolean options
313
- + git-gc.txt, git-reflog.txt: document new expiry options
314
- + date.c: add parse_expiry_date()
315
- (this branch is tangled with jc/prune-all.)
312
+ Will cook in 'next'.
313
+
314
+
315
+* mh/packed-refs-various (2013-05-01) 33 commits
316
+ (merged to 'next' on 2013-05-01 at e527153)
317
+ + refs: handle the main ref_cache specially
318
+ + refs: change do_for_each_*() functions to take ref_cache arguments
319
+ + pack_one_ref(): do some cheap tests before a more expensive one
320
+ + pack_one_ref(): use write_packed_entry() to do the writing
321
+ + pack_one_ref(): use function peel_entry()
322
+ + refs: inline function do_not_prune()
323
+ + pack_refs(): change to use do_for_each_entry()
324
+ + refs: use same lock_file object for both ref-packing functions
325
+ + pack_one_ref(): rename "path" parameter to "refname"
326
+ + pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
327
+ + pack-refs: rename handle_one_ref() to pack_one_ref()
328
+ + refs: extract a function write_packed_entry()
329
+ + repack_without_ref(): write peeled refs in the rewritten file
330
+ + t3211: demonstrate loss of peeled refs if a packed ref is deleted
331
+ + refs: change how packed refs are deleted
332
+ + search_ref_dir(): return an index rather than a pointer
333
+ + repack_without_ref(): silence errors for dangling packed refs
334
+ + t3210: test for spurious error messages for dangling packed refs
335
+ + refs: change the internal reference-iteration API
336
+ + refs: extract a function peel_entry()
337
+ + peel_ref(): fix return value for non-peelable, not-current reference
338
+ + peel_object(): give more specific information in return value
339
+ + refs: extract function peel_object()
340
+ + refs: extract a function ref_resolves_to_object()
341
+ + repack_without_ref(): use function get_packed_ref()
342
+ + peel_ref(): use function get_packed_ref()
343
+ + get_packed_ref(): return a ref_entry
344
+ + do_for_each_ref_in_dirs(): remove dead code
345
+ + refs: define constant PEELED_LINE_LENGTH
346
+ + refs: document how current_ref is used
347
+ + refs: document do_for_each_ref() and do_one_ref()
348
+ + refs: document the fields of struct ref_value
349
+ + refs: document flags constants REF_*
350
+ (this branch uses jc/prune-all.)
351
352
Updates reading and updating packed-refs file, correcting corner
353
case bugs.
354
320
- Will merge to 'next' after rebasing on the tip of jc/prune-all.
355
+ Will cook in 'next'.
356
357
358
* fc/transport-helper-error-reporting (2013-04-25) 10 commits