What's cooking (2011/04 #04)
Junio C Hamano committed
Apr 12, 2011 at 15:42 UTC
2309986900ed1a5744b3a81c507943593000ce32
1 file changed
+176
-50
whats-cooking.txt
+176
-50
@@ -1,51 +1,95 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2011, #03; Fri, 8)
3
-X-master-at: c3f6163b0b6e2cfae1422050c9607db1130cded0
4
-X-next-at: 86d60b025fb96d44086c93b52801c971999e0b0f
2
+Subject: What's cooking in git.git (Apr 2011, #04; Tue, 12)
3
+X-master-at: 9db19414582fdb154384ff1ca457cbf9095fef48
4
+X-next-at: d93e7e3f2508f46a0fb8be7796d959f6c18e83bb
5
6
-What's cooking in git.git (Apr 2011, #03; Fri, 8)
6
+What's cooking in git.git (Apr 2011, #04; Tue, 12)
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
+As we are already in pre-release feature freeze, some of the trivially
13
+correct features and fixes to non-regression bugs are only queued to
14
+'next' but not in 'master'. They are marked as post 1.7.5 candidates in
15
+this list.
16
+
17
--------------------------------------------------
18
[New Topics]
19
15
-* dm/stash-k-i-p (2011-04-07) 2 commits
16
- - stash: ensure --no-keep-index and --patch can be used in any order
17
- - stash: add two more tests for --no-keep-index
20
+* ef/maint-strbuf-init (2011-04-10) 2 commits
21
+ (merged to 'next' on 2011-04-11 at 1dd34d9)
22
+ + config: support values longer than 1023 bytes
23
+ + strbuf: make sure buffer is zero-terminated
24
+
25
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
26
+release.
27
+
28
+* jh/dirstat (2011-04-12) 4 commits
29
+ (merged to 'next' on 2011-04-12 at dd2c308)
30
+ + --dirstat: In case of renames, use target filename instead of source filename
31
+ (merged to 'next' on 2011-04-11 at 33d0417)
32
+ + Teach --dirstat not to completely ignore rearranged lines within a file
33
+ + --dirstat-by-file: Make it faster and more correct
34
+ + --dirstat: Describe non-obvious differences relative to --stat or regular diff
35
+
36
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
37
+releases.
38
+
39
+* jm/mergetool-submodules (2011-04-08) 1 commit
40
+ - mergetool: Teach about submodules
41
+
42
+Looked sane if inefficient when both branches have the submodule but was
43
+dubious in delete/modify conflict case. Awaiting response and possibly a
44
+reroll.
45
+
46
+* rj/sparse (2011-04-07) 7 commits
47
+ - sparse: Fix some "symbol not declared" warnings
48
+ - sparse: Fix errors due to missing target-specific variables
49
+ - sparse: Fix an "symbol 'merge_file' not decared" warning
50
+ - sparse: Fix an "symbol 'format_subject' not declared" warning
51
+ - sparse: Fix some "Using plain integer as NULL pointer" warnings
52
+ - sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
53
+ - Makefile: Use cgcc rather than sparse in the check target
54
+
55
+* ab/i18n-fixup (2011-04-12) 8 commits
56
+ (merged to 'next' on 2011-04-12 at a94aa85)
57
+ + i18n: do not overuse C_LOCALE_OUTPUT
58
+ + i18n: mark init-db messages for translation
59
+ + i18n: mark checkout plural warning for translation
60
+ + i18n: mark checkout --detach messages for translation
61
+ + i18n: mark clone nonexistent repository message for translation
62
+ + i18n: mark merge CHERRY_PICK_HEAD messages for translation
63
+ + i18n: mark merge "upstream" messages for translation
64
+ + i18n: mark merge "Could not read from" message for translation
65
+
66
+It would be nice to have this before 1.7.5 final; even if we didn't, we
67
+would have to force people to build on top of this, not on 1.7.5, which
68
+would essentially mean that we would commit to this series anyway.
69
+
70
+* cn/format-patch-quiet (2011-04-12) 2 commits
71
+ (merged to 'next' on 2011-04-12 at 915a915)
72
+ + format-patch: document --quiet option
73
+ + format-patch: don't pass on the --quiet flag
74
+
75
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
76
+release.
77
19
-* jc/magic-pathspec (2011-04-06) 3 commits
20
- (merged to 'next' on 2011-04-08 at c5247ce)
21
- + magic pathspec: add ":(icase)path" to match case insensitively
22
- + magic pathspec: futureproof shorthand form
23
- + magic pathspec: add tentative ":/path/from/top/level" pathspec support
24
- (this branch is tangled with jc/add-u-migration-2.)
25
-
26
-Thanks to Peff, Duy, and Michael for helping to whip the syntax and
27
-the basic semantics into a not-so-horrible shape. Will not merge until
28
-the 1.7.5 ships, though.
78
+--------------------------------------------------
79
+[Stalled]
80
81
* jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits
82
- "add -p": work-around an old laziness that does not coalesce hunks
83
- add--interactive.perl: factor out repeated --recount option
84
34
-* jc/merge-dash-previous (2011-04-07) 1 commit
35
- - merge: allow "-" as a short-hand for "previous branch"
36
-
37
-* rr/doc-content-type (2011-04-07) 4 commits
38
- - Documentation: Allow custom diff tools to be specified in 'diff.tool'
39
- - Documentation: Add diff.<driver>.* to config
40
- - Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
41
- - Documentation: Add filter.<driver>.* to config
42
-
43
---------------------------------------------------
44
-[Stalled]
85
+This came from http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000;
86
+we may want to add tests before moving it forward.
87
88
* jh/gitweb-localtime (2011-03-23) 1 commit
89
- gitweb: javascript ability to adjust time based on timezone
90
91
+Re-roll posted on the list, but I haven't picked it up.
92
+
93
* mg/show-without-prune (2011-04-01) 1 commit
94
- builtin/show: do not prune by pathspec
95
(this branch uses mg/reflog-with-options.)
@@ -82,42 +126,113 @@ current usage context.
126
--------------------------------------------------
127
[Cooking]
128
129
+* dm/stash-k-i-p (2011-04-07) 2 commits
130
+ (merged to 'next' on 2011-04-11 at 8349531)
131
+ + stash: ensure --no-keep-index and --patch can be used in any order
132
+ + stash: add two more tests for --no-keep-index
133
+
134
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
135
+releases.
136
+
137
+* jc/magic-pathspec (2011-04-06) 3 commits
138
+ (merged to 'next' on 2011-04-08 at c5247ce)
139
+ + magic pathspec: add ":(icase)path" to match case insensitively
140
+ + magic pathspec: futureproof shorthand form
141
+ + magic pathspec: add tentative ":/path/from/top/level" pathspec support
142
+ (this branch is tangled with jc/add-u-migration-2.)
143
+
144
+Thanks to Peff, Duy, and Michael for helping to whip the syntax and
145
+the basic semantics into a not-so-horrible shape. Will not merge until
146
+the 1.7.5 ships, though.
147
+
148
+* jc/merge-dash-previous (2011-04-07) 1 commit
149
+ (merged to 'next' on 2011-04-11 at 06480d1)
150
+ + merge: allow "-" as a short-hand for "previous branch"
151
+
152
+Should graduate soon after 1.7.5 ships.
153
+
154
+* rr/doc-content-type (2011-04-07) 4 commits
155
+ (merged to 'next' on 2011-04-11 at dca8914)
156
+ + Documentation: Allow custom diff tools to be specified in 'diff.tool'
157
+ + Documentation: Add diff.<driver>.* to config
158
+ + Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
159
+ + Documentation: Add filter.<driver>.* to config
160
+
161
+Is everybody happy with the new wording?
162
+
163
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
164
+releases.
165
+
166
* dm/http-cleanup (2011-03-30) 2 commits
167
- http-push: refactor curl_easy_setup madness
168
- http: make curl callbacks match contracts from curl header
169
170
+I didn't see anything glaringly wrong with this, but I would appreciate
171
+extra sets of eyeballs from people who have worked on HTTP transports to
172
+double check.
173
+
174
* jc/pack-objects-bigfile (2011-04-05) 1 commit
90
- - Teach core.bigfilethreashold to pack-objects
175
+ (merged to 'next' on 2011-04-11 at 86c52b1)
176
+ + Teach core.bigfilethreashold to pack-objects
177
+
178
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
179
+releases.
180
181
* jk/maint-stash-oob (2011-04-06) 2 commits
93
- - stash: fix false positive in the invalid ref test.
94
- - stash: fix accidental apply of non-existent stashes
182
+ (merged to 'next' on 2011-04-11 at d882935)
183
+ + stash: fix false positive in the invalid ref test.
184
+ + stash: fix accidental apply of non-existent stashes
185
+
186
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
187
+releases.
188
189
* nk/blame-abbrev (2011-04-06) 1 commit
97
- - blame: add --abbrev command line option and make it honor core.abbrev
190
+ (merged to 'next' on 2011-04-11 at 19e8676)
191
+ + blame: add --abbrev command line option and make it honor core.abbrev
192
+
193
+Should graduate soon after 1.7.5 ships.
194
195
* nm/submodule-update-force (2011-04-01) 1 commit
100
- - submodule: Add --force option for git submodule update
196
+ (merged to 'next' on 2011-04-11 at d94f6f3)
197
+ + submodule: Add --force option for git submodule update
198
+
199
+Are submodule users happy with this change?
200
+
201
+Should graduate soon after 1.7.5 ships.
202
203
* jk/maint-upload-pack-shallow (2011-04-06) 1 commit
103
- - upload-pack: start pack-objects before async rev-list
204
+ (merged to 'next' on 2011-04-11 at 9104545)
205
+ + upload-pack: start pack-objects before async rev-list
206
+
207
+A sensible and low-impact fix. Should graduate soon after 1.7.5 ships
208
+and merged to 1.7.4.X and 1.7.5.1 releases.
209
210
* jk/stash-loosen-safety (2011-04-05) 1 commit
106
- - stash: drop dirty worktree check on apply
211
+ (merged to 'next' on 2011-04-11 at b59c533)
212
+ + stash: drop dirty worktree check on apply
213
+
214
+Should graduate soon after 1.7.5 ships.
215
216
* dm/color-palette (2011-04-05) 1 commit
217
(merged to 'next' on 2011-04-04 at 0244ef9)
218
+ Share color list between graph and show-branch
219
220
+Should graduate soon after 1.7.5 ships.
221
+
222
* mg/sha1-path-advise (2011-03-31) 2 commits
223
(merged to 'next' on 2011-04-04 at e429e0c)
224
+ sha1_name: Suggest commit:./file for path in subdir
225
+ t1506: factor out test for "Did you mean..."
226
227
+Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
228
+
229
* ar/clean-rmdir-empty (2011-04-01) 1 commit
230
(merged to 'next' on 2011-04-03 at c63fac8)
231
+ clean: unreadable directory may still be rmdir-able if it is empty
232
233
+Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
234
+releases.
235
+
236
* jk/maint-push-async-hang (2011-03-31) 4 commits
237
- send-pack: abort sideband demuxer on pack-objects error
238
- run-command: allow aborting async code prematurely
@@ -130,6 +245,9 @@ current usage context.
245
- Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
246
(this branch uses jk/maint-push-async-hang.)
247
248
+These two series aim for a good goal, but needs reroll after 1.7.5 with
249
+sign-offs.
250
+
251
* mg/reflog-with-options (2011-04-01) 3 commits
252
(merged to 'next' on 2011-04-03 at e69a95c)
253
+ reflog: fix overriding of command line options
@@ -137,7 +255,7 @@ current usage context.
255
+ builtin/log.c: separate default and setup of cmd_log_init()
256
(this branch is used by mg/show-without-prune.)
257
140
-Reasonable, but can wait.
258
+Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
259
260
* mh/git-svn-automkdirs (2011-04-01) 1 commit
261
(merged to 'next' on 2011-04-03 at 7fa4978)
@@ -149,21 +267,25 @@ Should be safe, but I'd like an Ack from git-svn folks.
267
(merged to 'next' on 2011-04-03 at 5a23b23)
268
+ git diff -D: omit the preimage of deletes
269
152
-Unstuck, thanks to Michael J Gruber.
270
+Should graduate soon after 1.7.5 ships.
271
272
* jh/notes-add-ui (2011-03-30) 1 commit
155
- - Make "git notes add" more user-friendly when there are existing notes
273
+ (merged to 'next' on 2011-04-11 at 72e7c39)
274
+ + Make "git notes add" more user-friendly when there are existing notes
275
+
276
+Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
277
278
* jk/notes-ui-updates (2011-03-30) 7 commits
158
- - log/pretty-options: Document --[no-]notes and deprecate old notes options
159
- - revision.c: make --no-notes reset --notes list
160
- - revision.c: support --notes command-line option
161
- - notes: refactor display notes default handling
162
- - notes: refactor display notes extra refs field
163
- - revision.c: refactor notes ref expansion
164
- - notes: make expand_notes_ref globally accessible
279
+ (merged to 'next' on 2011-04-11 at 313d6c4)
280
+ + log/pretty-options: Document --[no-]notes and deprecate old notes options
281
+ + revision.c: make --no-notes reset --notes list
282
+ + revision.c: support --notes command-line option
283
+ + notes: refactor display notes default handling
284
+ + notes: refactor display notes extra refs field
285
+ + revision.c: refactor notes ref expansion
286
+ + notes: make expand_notes_ref globally accessible
287
166
-I like what this does, but it probably can wait.
288
+Should graduate soon after 1.7.5 ships.
289
290
* nd/maint-setup (2011-03-26) 2 commits
291
(merged to 'next' on 2011-03-31 at 2c36f6a)
@@ -171,8 +293,9 @@ I like what this does, but it probably can wait.
293
+ setup: return correct prefix if worktree is '/'
294
295
This benefits only the minority who use /.git at the root level of the
174
-filesystem, but the changed code is used from many codepaths; will not
175
-merge before 1.7.5.
296
+filesystem, but the changed code is used from many codepaths.
297
+
298
+Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
299
300
* mz/rebase (2011-02-28) 34 commits
301
(merged to 'next' on 2011-03-31 at 3b1343c)
@@ -224,6 +347,8 @@ there is no user visible improvements up to this point.
347
+ merge: handle renames with replacement content
348
+ t3030: fix accidental success in symlink rename
349
350
+Peff wanted to reroll this.
351
+
352
* mz/maint-rename-unmerged (2011-03-23) 1 commit
353
(merged to 'next' on 2011-03-31 at c7b3d9a)
354
+ diffcore-rename: don't consider unmerged path as source
@@ -231,7 +356,8 @@ there is no user visible improvements up to this point.
356
Will cook until 1.7.5 final.
357
358
* nd/struct-pathspec (2011-04-05) 5 commits
234
- - pathspec: rename per-item field has_wildcard to use_wildcard
359
+ (merged to 'next' on 2011-04-11 at ee794a5)
360
+ + pathspec: rename per-item field has_wildcard to use_wildcard
361
(merged to 'next' on 2011-03-31 at 66cbb7d)
362
+ Improve tree_entry_interesting() handling code
363
+ Convert read_tree{,_recursive} to support struct pathspec
@@ -247,7 +373,7 @@ Will cook until 1.7.5 final.
373
+ diffcore-rename: refactor "too many candidates" logic
374
+ builtin/diff.c: remove duplicated call to diff_result_code()
375
250
-Will hold.
376
+Should graduate soon after 1.7.5 ships.
377
378
* cn/system-path-tweak (2011-03-17) 1 commit
379
- system_path: use a static buffer