What's cooking (2012/05 #07)
Junio C Hamano committed
May 31, 2012 at 16:01 UTC
aa4b9301c9e4242f7b4be85d037054bef783e8ba
1 file changed
+184
-149
whats-cooking.txt
+184
-149
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2012, #06; Wed, 23)
3
-X-master-at: bd578b507fa79f94009ae1c1a436dc14cf7e6002
4
-X-next-at: be95121998f97475e9491ebbe005f08e85f054ef
2
+Subject: What's cooking in git.git (May 2012, #07; Thu, 31)
3
+X-master-at: b2478aa0858811c29061ed32c2686468b89d7296
4
+X-next-at: 11af7cdeca7ffbfb4387fb8253081fd22c3dd697
5
6
-What's cooking in git.git (May 2012, #06; Wed, 23)
6
+What's cooking in git.git (May 2012, #07; Thu, 31)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -17,49 +17,24 @@ repositories listed at
17
--------------------------------------------------
18
[Graduated to "master"]
19
20
-* bp/diff-no-index-strbuf-fix (2012-05-16) 2 commits
21
- (merged to 'next' on 2012-05-18 at b2c26bb)
22
- + diff --no-index: don't leak buffers in queue_diff
23
- + diff --no-index: reset temporary buffer lengths on directory iteration
20
+* ap/checkout-no-progress-for-non-tty (2012-05-24) 1 commit
21
+ (merged to 'next' on 2012-05-24 at dc473bd)
22
+ + checkout: no progress messages if !isatty(2).
23
25
-Fix regressions to "git diff --no-index" when it recurses down.
24
+"git checkout" gave progress display even when the standard error
25
+stream was not connected to the tty, which made little sense.
26
27
-* hv/submodule-alt-odb (2012-05-14) 1 commit
28
- (merged to 'next' on 2012-05-18 at 2f17ac8)
29
- + teach add_submodule_odb() to look for alternates
30
-
31
-When peeking into object stores of submodules, the code forgot that they
32
-might borrow objects from alternate object stores on their own.
33
-
34
-* js/rebase-i-p-test-fix (2012-05-18) 1 commit
35
- (merged to 'next' on 2012-05-18 at b7482fc)
36
- + Fix t3411.3 to actually rebase something
37
-
38
-* js/rev-parse-doc-fix (2012-05-18) 1 commit
39
- (merged to 'next' on 2012-05-18 at c16f1c7)
40
- + rev-parse doc: --git-dir does not always show a relative path
41
-
42
-* rs/archive-tree-in-tip-simplify (2012-05-18) 2 commits
43
- (merged to 'next' on 2012-05-18 at a8ca614)
44
- + archive-tar: keep const in checksum calculation
45
- + archive: simplify refname handling
46
-
47
---------------------------------------------------
48
-[New Topics]
49
-
50
-* fc/git-prompt-script (2012-05-22) 5 commits
51
- - completion: split __git_ps1 into a separate script
52
- - completion: remove executable mode
53
- - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
54
- - tests: add tests for the bash prompt functions in the completion script
55
- - tests: move code to run tests under bash into a helper library
56
- (this branch is tangled with sg/bash-prompt.)
27
+* fc/git-complete-helper-fix (2012-05-20) 2 commits
28
+ (merged to 'next' on 2012-05-23 at 6124da2)
29
+ + completion: add support for backwards compatibility
30
+ + completion: rename internal helpers _git and _gitk
31
58
-Looked reasonable from my point of view, but I am not familiar with the
59
-direction in which larger "bash completion" project folks are going, so
60
-people more knowledgeable than myself need to help me guiding this topic.
32
+Would help people who relied on (unofficial) _git/_gitk helper in their
33
+completion tweaks.
34
62
-* jk/fetch-pack-remove-dups-optim (2012-05-22) 5 commits
35
+* jk/fetch-pack-remove-dups-optim (2012-05-24) 6 commits
36
+ (merged to 'next' on 2012-05-24 at cf56fe6)
37
+ + fetch-pack: sort incoming heads list earlier
38
(merged to 'next' on 2012-05-23 at 6057c21)
39
+ fetch-pack: avoid quadratic loop in filter_refs
40
+ fetch-pack: sort the list of incoming refs
@@ -67,10 +42,41 @@ people more knowledgeable than myself need to help me guiding this topic.
42
+ fetch-pack: avoid quadratic behavior in remove_duplicates
43
+ fetch-pack: sort incoming heads
44
70
-The way "fetch-pack" taht is given multiple references to fetch tried to
45
+The way "fetch-pack" that is given multiple references to fetch tried to
46
remove duplicates was very inefficient.
47
73
-Will merge to master.
48
+* jk/format-person-part-buffer-limit (2012-05-22) 1 commit
49
+ (merged to 'next' on 2012-05-23 at ef025b0)
50
+ + pretty: avoid buffer overflow in format_person_part
51
+
52
+* jk/ident-gecos-strbuf (2012-05-24) 22 commits
53
+ (merged to 'next' on 2012-05-24 at 7148763)
54
+ + format-patch: do not use bogus email addresses in message ids
55
+ + ident: reject bogus email addresses with IDENT_STRICT
56
+ + ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT
57
+ + format-patch: use GIT_COMMITTER_EMAIL in message ids
58
+ + ident: let callers omit name with fmt_indent
59
+ + ident: refactor NO_DATE flag in fmt_ident
60
+ + ident: reword empty ident error message
61
+ (merged to 'next' on 2012-05-23 at 6fce816)
62
+ + format-patch: refactor get_patch_filename
63
+ + ident: trim whitespace from default name/email
64
+ + ident: use a dynamic strbuf in fmt_ident
65
+ + ident: use full dns names to generate email addresses
66
+ + ident: report passwd errors with a more friendly message
67
+ + drop length limitations on gecos-derived names and emails
68
+ + ident: don't write fallback username into git_default_name
69
+ + fmt_ident: drop IDENT_WARN_ON_NO_NAME code
70
+ + format-patch: use default email for generating message ids
71
+ + ident: trim trailing newline from /etc/mailname
72
+ + move git_default_* variables to ident.c
73
+ + move identity config parsing to ident.c
74
+ + fmt-merge-msg: don't use static buffer in record_person
75
+ + http-push: do not access git_default_email directly
76
+ + ident: split setup_ident into separate functions
77
+
78
+Fixes quite a lot of brokenness when ident information needs to be taken
79
+from the system and cleans up the code.
80
81
* jk/ident-split-fix (2012-05-22) 1 commit
82
(merged to 'next' on 2012-05-23 at 811c9ec)
@@ -79,14 +85,10 @@ Will merge to master.
85
An author/committer name that is a single character was mishandled as an
86
invalid name by mistake.
87
82
-Will merge to master and later to maint.
83
-
88
* jk/pretty-commit-header-incomplete-line (2012-05-22) 1 commit
89
(merged to 'next' on 2012-05-23 at f788433)
90
+ avoid segfault when reading header of malformed commits
91
88
-Will merge to master and later to maint.
89
-
92
* mh/fetch-pack-constness (2012-05-22) 4 commits
93
(merged to 'next' on 2012-05-23 at be95121)
94
+ cmd_fetch_pack(): respect constness of argv parameter
@@ -96,6 +98,42 @@ Will merge to master and later to maint.
98
99
Tighten constness of some local variables in a callchain.
100
101
+* mh/ref-api (2012-05-24) 1 commit
102
+ (merged to 'next' on 2012-05-24 at c8d54c0)
103
+ + Avoid sorting if references are added to ref_cache in order
104
+
105
+* mh/ref-api-lazy-loose (2012-05-20) 1 commit
106
+ (merged to 'next' on 2012-05-23 at c41a30a)
107
+ + free_ref_entry(): do not trigger reading of loose refs
108
+
109
+The code to lazily read loose refs by mistake unnecessarily read the refs
110
+in a subhierarchy when we free the data for the subhierarchy.
111
+
112
+* mh/test-keep-prove-cache (2012-05-20) 1 commit
113
+ (merged to 'next' on 2012-05-23 at 870d1f9)
114
+ + t/Makefile: retain cache t/.prove across prove runs
115
+
116
+* ng/pack-objects-cleanup (2012-05-18) 2 commits
117
+ (merged to 'next' on 2012-05-23 at f90b1ba)
118
+ + pack-objects: refactor write_object() into helper functions
119
+ + pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."
120
+
121
+* rs/dir-strbuf-read-recursive-fix (2012-05-11) 2 commits
122
+ (merged to 'next' on 2012-05-23 at 2e22549)
123
+ + dir: simplify fill_directory()
124
+ + dir: respect string length argument of read_directory_recursive()
125
+
126
+* rs/maint-grep-F (2012-05-21) 4 commits
127
+ (merged to 'next' on 2012-05-23 at b24143c)
128
+ + grep: stop leaking line strings with -f
129
+ + grep: support newline separated pattern list
130
+ + grep: factor out do_append_grep_pat()
131
+ + grep: factor out create_grep_pat()
132
+
133
+"git grep -e '$pattern'", unlike the case where the patterns are read from
134
+a file, did not treat individual lines in the given pattern argument as
135
+separate regular expressions as it should.
136
+
137
* rs/refs-string-slice (2012-05-22) 4 commits
138
(merged to 'next' on 2012-05-23 at d224de1)
139
+ refs: do not create ref_entry when searching
@@ -106,34 +144,78 @@ Tighten constness of some local variables in a callchain.
144
Avoid unnecessary temporary allocations while looking for matching refs
145
inside refs API.
146
109
-* cr/persistent-https (2012-05-23) 1 commit
110
- - Add persistent-https to contrib
147
+* rs/xdiff-fast-hash-fix (2012-05-23) 3 commits
148
+ (merged to 'next' on 2012-05-23 at 8df26a5)
149
+ + xdiff: import new 32-bit version of count_masked_bytes()
150
+ + xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
151
+ + xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines
152
112
-A remote helper that acts as a proxy that caches ssl session for the
113
-https:// transport is added to the contrib/ area.
153
+* sp/sh-windows-pwd (2012-05-16) 1 commit
154
+ (merged to 'next' on 2012-05-23 at 63004c3)
155
+ + git-sh-setup: define workaround wrappers before they are used
156
115
-* jk/format-person-part-buffer-limit (2012-05-22) 1 commit
116
- (merged to 'next' on 2012-05-23 at ef025b0)
117
- + pretty: avoid buffer overflow in format_person_part
157
+* va/git-p4-test (2012-05-23) 2 commits
158
+ - git-p4: Verify detection of "empty" branch creation
159
+ - git-p4: Test changelists touching two branches
160
119
-Will merge to master and later to maint.
161
+Rerolled and Acked by Pete.
162
121
-* nd/stream-index-pack (2012-05-23) 6 commits
122
- - sha1_loose_object_info: do not complain out loud on non-existent objects
123
- - index-pack: avoid collision test when verifying in-repo pack
124
- - index-pack: use streaming interface for collision test on large blobs
125
- - index-pack: factor out unpack core from get_data_from_pack
126
- - index-pack: use streaming interface on large blobs (most of the time)
127
- - index-pack: hash non-delta objects while reading from stream
163
+--------------------------------------------------
164
+[New Topics]
165
129
-Use streaming API to read from the object store to avoid having to hold
130
-a large blob object in-core while running index-pack.
166
+* jl/submodule-report-new-path-once (2012-05-29) 1 commit
167
+ (merged to 'next' on 2012-05-30 at e482dd9)
168
+ + submodules: print "registered for path" message only once
169
132
-The later 3 patches in the series looked a bit suspect.
170
+Will merge to master by 1.7.11 final.
171
134
-* va/git-p4-test (2012-05-23) 2 commits
135
- - git-p4: Verify detection of "empty" branch creation
136
- - git-p4: Test changelists touching two branches
172
+* mm/levenstein-penalize-deletion-less (2012-05-29) 1 commit
173
+ (merged to 'next' on 2012-05-30 at b2a0346)
174
+ + Reduce cost of deletion in levenstein distance (4 -> 3)
175
+
176
+Will merge to master by 1.7.11 final.
177
+
178
+* nd/exclude-workaround-top-heavy (2012-05-29) 2 commits
179
+ - exclude: do strcmp as much as possible before fnmatch
180
+ - Unindent excluded_from_list()
181
+
182
+* nd/stream-pack-objects (2012-05-29) 1 commit
183
+ - pack-objects: use streaming interface for reading large loose blobs
184
+
185
+* vr/rebase-autosquash-does-not-imply-i (2012-05-29) 1 commit
186
+ (merged to 'next' on 2012-05-30 at 10dd3af)
187
+ + Do not autosquash in case of an implied interactive rebase
188
+
189
+Will merge to master by 1.7.11 final.
190
+
191
+* nh/empty-rebase (2012-05-29) 1 commit
192
+ (merged to 'next' on 2012-05-30 at 270703a)
193
+ + cherry-pick: regression fix for empty commits
194
+
195
+Will merge to master by 1.7.11 final.
196
+
197
+* ef/maint-rebase-error-message (2012-05-30) 1 commit
198
+ (merged to 'next' on 2012-05-30 at 5194fe3)
199
+ + rebase: report invalid commit correctly
200
+
201
+Will merge to master by 1.7.11 final.
202
+
203
+* jk/clone-local (2012-05-30) 2 commits
204
+ - clone: allow --no-local to turn off local optimizations
205
+ - docs/clone: mention that --local may be ignored
206
+
207
+* jk/no-more-asciidoc7 (2012-05-30) 2 commits
208
+ - docs: drop antique comment from Makefile
209
+ - docs: drop asciidoc7compatible flag
210
+
211
+* jk/no-op-push-message (2012-05-30) 1 commit
212
+ - improve no-op push output
213
+
214
+* ef/http-o-depends-on-gvf (2012-05-31) 1 commit
215
+ (merged to 'next' on 2012-05-31 at 11af7cd)
216
+ + Makefile: add missing GIT-VERSION-FILE dependency
217
+
218
+Will merge to master by 1.7.11 final.
219
220
--------------------------------------------------
221
[Stalled]
@@ -170,7 +252,6 @@ topic so a reroll, if comes, should build on top of them.
252
- apply: split load_preimage() helper function out
253
- apply: refactor read_file_or_gitlink()
254
- apply: clear_image() clears things a bit more
173
- (this branch is tangled with jc/wip-apply-3way.)
255
256
"git apply" learns to wiggle the base version and perform three-way merge
257
when a patch does not exactly apply to the version you have.
@@ -229,91 +310,38 @@ not working :-(.
310
--------------------------------------------------
311
[Cooking]
312
232
-* jk/ident-gecos-strbuf (2012-05-22) 15 commits
233
- (merged to 'next' on 2012-05-23 at 6fce816)
234
- + format-patch: refactor get_patch_filename
235
- + ident: trim whitespace from default name/email
236
- + ident: use a dynamic strbuf in fmt_ident
237
- + ident: use full dns names to generate email addresses
238
- + ident: report passwd errors with a more friendly message
239
- + drop length limitations on gecos-derived names and emails
240
- + ident: don't write fallback username into git_default_name
241
- + fmt_ident: drop IDENT_WARN_ON_NO_NAME code
242
- + format-patch: use default email for generating message ids
243
- + ident: trim trailing newline from /etc/mailname
244
- + move git_default_* variables to ident.c
245
- + move identity config parsing to ident.c
246
- + fmt-merge-msg: don't use static buffer in record_person
247
- + http-push: do not access git_default_email directly
248
- + ident: split setup_ident into separate functions
249
-
250
-Fixes quite a lot of brokenness when ident information needs to be taken
251
-from the system and cleans up the code.
252
-
253
-Will merge to master.
254
-
255
-* js/submodule-relative (2012-05-23) 2 commits
256
- - submodule: fix handling of relative superproject origin URLs
257
- - submodule: document handling of relative superproject origin URLs
258
-
259
-* mh/ref-api-lazy-loose (2012-05-20) 1 commit
260
- (merged to 'next' on 2012-05-23 at c41a30a)
261
- + free_ref_entry(): do not trigger reading of loose refs
262
-
263
-The code to lazily read loose refs by mistake unnecessarily read the refs
264
-in a subhierarchy when we free the data for the subhierarchy.
265
-
266
-Will merge to master.
267
-
268
-* mh/test-keep-prove-cache (2012-05-20) 1 commit
269
- (merged to 'next' on 2012-05-23 at 870d1f9)
270
- + t/Makefile: retain cache t/.prove across prove runs
271
-
272
-* ng/pack-objects-cleanup (2012-05-18) 2 commits
273
- (merged to 'next' on 2012-05-23 at f90b1ba)
274
- + pack-objects: refactor write_object() into helper functions
275
- + pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."
276
-
277
-* rs/maint-grep-F (2012-05-21) 4 commits
278
- (merged to 'next' on 2012-05-23 at b24143c)
279
- + grep: stop leaking line strings with -f
280
- + grep: support newline separated pattern list
281
- + grep: factor out do_append_grep_pat()
282
- + grep: factor out create_grep_pat()
283
-
284
-"git grep -F", unlike the case where it reads from a file, did not treat
285
-individual lines in the given pattern argument as separate patterns as it
286
-should.
287
-
288
-Will merge to master and later to maint.
289
-
290
-* rs/xdiff-fast-hash-fix (2012-05-23) 3 commits
291
- (merged to 'next' on 2012-05-23 at 8df26a5)
292
- + xdiff: import new 32-bit version of count_masked_bytes()
293
- + xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
294
- + xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines
313
+* fc/git-prompt-script (2012-05-22) 5 commits
314
+ - completion: split __git_ps1 into a separate script
315
+ - completion: remove executable mode
316
+ - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
317
+ - tests: add tests for the bash prompt functions in the completion script
318
+ - tests: move code to run tests under bash into a helper library
319
+ (this branch is tangled with sg/bash-prompt.)
320
296
-Will merge to master.
321
+The last remaining sticking point is what to do with the duplicated shell
322
+function.
323
298
-* sp/sh-windows-pwd (2012-05-16) 1 commit
299
- (merged to 'next' on 2012-05-23 at 63004c3)
300
- + git-sh-setup: define workaround wrappers before they are used
324
+* cr/persistent-https (2012-05-30) 1 commit
325
+ - Add persistent-https to contrib
326
302
-Will merge to master.
327
+A remote helper that acts as a proxy that caches ssl session for the
328
+https:// transport is added to the contrib/ area.
329
304
-* fc/git-complete-helper-fix (2012-05-20) 2 commits
305
- (merged to 'next' on 2012-05-23 at 6124da2)
306
- + completion: add support for backwards compatibility
307
- + completion: rename internal helpers _git and _gitk
330
+* nd/stream-index-pack (2012-05-24) 4 commits
331
+ - index-pack: use streaming interface for collision test on large blobs
332
+ - index-pack: factor out unpack core from get_data_from_pack
333
+ - index-pack: use streaming interface on large blobs (most of the time)
334
+ - index-pack: hash non-delta objects while reading from stream
335
309
-Will merge to master.
336
+Use streaming API to read from the object store to avoid having to hold
337
+a large blob object in-core while running index-pack.
338
311
-* rs/dir-strbuf-read-recursive-fix (2012-05-11) 2 commits
312
- (merged to 'next' on 2012-05-23 at 2e22549)
313
- + dir: simplify fill_directory()
314
- + dir: respect string length argument of read_directory_recursive()
339
+* js/submodule-relative (2012-05-29) 3 commits
340
+ - t7403-*.sh: Avoid use of the nonportable '==' operator
341
+ - submodule: fix handling of relative superproject origin URLs
342
+ - submodule: document handling of relative superproject origin URLs
343
316
-Will merge to master.
344
+Reroll went to v7 but hasn't settled yet.
345
346
* mm/push-default-switch-warning (2012-04-26) 2 commits
347
- t5541: warning message is given even with --quiet
@@ -331,3 +359,10 @@ Will squash the two, but this has to wait for a few release cycles.
359
+ git-daemon wrapper to wait until daemon is ready
360
361
Reverted from 'next' to replace it with js/daemon-test-race-fix.
362
+
363
+* jc/revert-nh-empty-rebase (2012-05-23) 1 commit
364
+ . Revert nh/empty-rebase topic
365
+
366
+The earlier series was found to regress the more important "cherry-pick";
367
+I'd prefer to see it fixed, but in case if it does not happen soon, this
368
+is a fallback measure that can be merged before 1.7.11 final.