What's cooking (2011/04 #01)
Junio C Hamano committed
Apr 3, 2011 at 16:20 UTC
f0ee024a35aed9753dee1e5bdcbba7d886f76dff
1 file changed
+209
-188
whats-cooking.txt
+209
-188
@@ -1,82 +1,189 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2011, #06; Thu, 31)
3
-X-master-at: 6acef043581d69597860f3343ec2691c72b0803c
4
-X-next-at: ae5b80d74263fcfbdcca7004dee1552cb35a2a9d
2
+Subject: What's cooking in git.git (Apr 2011, #01; Sun, 3)
3
+X-master-at: 44bc573436c98b7c6cd798af04c538f6e76f0f6e
4
+X-next-at: c63fac87daebf1437e8dc8c7ead5a4c7cadf15e0
5
6
-What's cooking in git.git (Mar 2011, #06; Thu, 31)
6
+What's cooking in git.git (Apr 2011, #01; Sun, 3)
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
-It's been two months since v1.7.4 and -rc0 was way overdue. I'll do a -rc1
13
-sometime next week, hoping that we can finish this cycle by mid April.
12
+Hopefully we will have 1.7.5-rc1 coming Wednesday.
13
15
-Which means that from now on, we wouldn't be interested in topics that are
16
-mostly internal clean-ups, new features that is not already in 'master',
17
-nor fixes for nontrivial bugs that are not regressions. A bug that
18
-existed since v1.7.0 is something we have lived with long enough that it
19
-is not worth the risk of introducing other new bugs by trying to fix it
20
-before 1.7.5 final).
14
+--------------------------------------------------
15
+[New Topics]
16
+
17
+* ar/clean-rmdir-empty (2011-04-01) 1 commit
18
+ (merged to 'next' on 2011-04-03 at c63fac8)
19
+ + clean: unreadable directory may still be rmdir-able if it is empty
20
+
21
+This should be very safe and Ok to merge before -rc1; it is not urgent,
22
+though.
23
+
24
+* jc/rev-list-options-fix (2011-04-01) 1 commit
25
+ (merged to 'next' on 2011-04-03 at 91f19de)
26
+ + "log --cherry-pick" documentation regression fix
27
+
28
+We should merge this before -rc1, but there might be other similar
29
+breakages in the text flow due to the same f98fd43 (git-log.txt,
30
+rev-list-options.txt: put option blocks in proper order, 2011-03-08).
31
+
32
+* jk/maint-push-async-hang (2011-03-31) 4 commits
33
+ - send-pack: abort sideband demuxer on pack-objects error
34
+ - run-command: allow aborting async code prematurely
35
+ - finish_async: be quiet when waiting for async process
36
+ - teach wait_or_whine a "quiet" mode
37
+ (this branch is used by jk/maint-push-async-hang-threads.)
38
+
39
+* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
40
+ - run-command: implement abort_async for pthreads
41
+ - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
42
+ (this branch uses jk/maint-push-async-hang.)
43
+
44
+* mg/doc-revisions-txt (2011-04-01) 3 commits
45
+ - revisions.txt: language improvements
46
+ - revisions.txt: structure with a labelled list
47
+ - revisions.txt: consistent use of quotes
48
+
49
+Most parts looked reasonable except for some nits.
50
+
51
+* mg/reflog-with-options (2011-04-01) 3 commits
52
+ (merged to 'next' on 2011-04-03 at e69a95c)
53
+ + reflog: fix overriding of command line options
54
+ + t/t1411: test reflog with formats
55
+ + builtin/log.c: separate default and setup of cmd_log_init()
56
+ (this branch is used by mg/show-without-prune.)
57
+
58
+Reasonable, but can wait.
59
+
60
+* mg/show-without-prune (2011-04-01) 1 commit
61
+ - builtin/show: do not prune by pathspec
62
+ (this branch uses mg/reflog-with-options.)
63
+
64
+I wanted to like this, but it still feels like too much magic.
65
+
66
+* mh/git-svn-automkdirs (2011-04-01) 1 commit
67
+ (merged to 'next' on 2011-04-03 at 7fa4978)
68
+ + git-svn: add an option to skip the creation of empty directories
69
+
70
+Should be safe, but I'd like an Ack from git-svn folks.
71
+
72
+* nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit
73
+ (merged to 'next' on 2011-04-03 at 40c5094)
74
+ + submodule: process conflicting submodules only once
75
22
-What we would want to see are regression fixes. There are quite a few new
23
-topics that have already graduated in 'master', or have been cooking and
24
-should be in 'master' shortly. If they introduce new bugs that didn't
25
-exist in v1.7.4, they need to be squashed before anything else.
76
+A fix to a rather common operation and the implementation looked
77
+low-impact enough. Do submodule people want this in 1.7.5?
78
27
-The criteria is a bit looser for documentation updates. Simple grammar
28
-and spelling fixes are usually safe; changes in the structure and markups
29
-are riskier.
79
+* dm/color-palette (2011-03-30) 1 commit
80
+ - Share color list between graph and show-branch
81
31
-In any case, please use your best judgement and help polishing v1.7.5
32
-release.
82
+* mg/sha1-path-advise (2011-03-31) 2 commits
83
+ - sha1_name: Suggest commit:./file for path in subdir
84
+ - t1506: factor out test for "Did you mean..."
85
86
--------------------------------------------------
35
-[New Topics]
87
+[Graduated to "master"]
88
37
-* jh/notes-add-ui (2011-03-30) 1 commit
38
- - Make "git notes add" more user-friendly when there are existing notes
89
+* ab/i18n-st (2011-02-22) 69 commits
90
+ (merged to 'next' on 2011-03-23 at e2732e2)
91
+ + i18n: git-shortlog basic messages
92
+ + i18n: git-revert split up "could not revert/apply" message
93
+ + i18n: git-revert literal "me" messages
94
+ + i18n: git-revert "Your local changes" message
95
+ + i18n: git-revert basic messages
96
+ + i18n: git-notes GIT_NOTES_REWRITE_MODE error message
97
+ + i18n: git-notes basic commands
98
+ + i18n: git-gc "Auto packing the repository" message
99
+ + i18n: git-gc basic messages
100
+ + i18n: git-describe basic messages
101
+ + i18n: git-clean clean.requireForce messages
102
+ + i18n: git-clean basic messages
103
+ + i18n: git-bundle basic messages
104
+ + i18n: git-archive basic messages
105
+ + i18n: git-status "renamed: " message
106
+ + i18n: git-status "Initial commit" message
107
+ + i18n: git-status "Changes to be committed" message
108
+ + i18n: git-status shortstatus messages
109
+ + i18n: git-status "nothing to commit" messages
110
+ + i18n: git-status basic messages
111
+ + i18n: git-push "prevent you from losing" message
112
+ + i18n: git-push basic messages
113
+ + i18n: git-tag tag_template message
114
+ + i18n: git-tag basic messages
115
+ + i18n: git-reset "Unstaged changes after reset" message
116
+ + i18n: git-reset reset_type_names messages
117
+ + i18n: git-reset basic messages
118
+ + i18n: git-rm basic messages
119
+ + i18n: git-mv "bad" messages
120
+ + i18n: git-mv basic messages
121
+ + i18n: git-merge "Wonderful" message
122
+ + i18n: git-merge "You have not concluded your merge" messages
123
+ + i18n: git-merge "Updating %s..%s" message
124
+ + i18n: git-merge basic messages
125
+ + i18n: git-log "--OPT does not make sense" messages
126
+ + i18n: git-log basic messages
127
+ + i18n: git-grep "--open-files-in-pager" message
128
+ + i18n: git-grep basic messages
129
+ + i18n: git-fetch split up "(non-fast-forward)" message
130
+ + i18n: git-fetch update_local_ref messages
131
+ + i18n: git-fetch formatting messages
132
+ + i18n: git-fetch basic messages
133
+ + i18n: git-diff basic messages
134
+ + i18n: git-commit advice messages
135
+ + i18n: git-commit "enter the commit message" message
136
+ + i18n: git-commit print_summary messages
137
+ + i18n: git-commit formatting messages
138
+ + i18n: git-commit "middle of a merge" message
139
+ + i18n: git-commit basic messages
140
+ + i18n: git-checkout "Switched to a .. branch" message
141
+ + i18n: git-checkout "HEAD is now at" message
142
+ + i18n: git-checkout describe_detached_head messages
143
+ + i18n: git-checkout: our/their version message
144
+ + i18n: git-checkout basic messages
145
+ + i18n: git-branch "(no branch)" message
146
+ + i18n: git-branch "git branch -v" messages
147
+ + i18n: git-branch "Deleted branch [...]" message
148
+ + i18n: git-branch "remote branch '%s' not found" message
149
+ + i18n: git-branch basic messages
150
+ + i18n: git-add "Unstaged changes" message
151
+ + i18n: git-add "remove '%s'" message
152
+ + i18n: git-add "did not match any files" message
153
+ + i18n: git-add "The following paths are ignored" message
154
+ + i18n: git-add basic messages
155
+ + i18n: git-clone "Cloning into" message
156
+ + i18n: git-clone "Cloning into" message
157
+ + i18n: git-clone basic messages
158
+ + i18n: git-init "Initialized [...] repository" message
159
+ + i18n: git-init basic messages
160
40
-* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
41
- - remote: deprecate --mirror
42
- - remote: separate the concept of push and fetch mirrors
43
- - remote: disallow some nonsensical option combinations
161
+* jc/merge-sans-branch (2011-03-23) 2 commits
162
+ (merged to 'next' on 2011-03-31 at 754a6af)
163
+ + merge: merge with the default upstream branch without argument
164
+ + merge: match the help text with the documentation
165
45
-* jk/notes-ui-updates (2011-03-30) 7 commits
46
- - log/pretty-options: Document --[no-]notes and deprecate old notes options
47
- - revision.c: make --no-notes reset --notes list
48
- - revision.c: support --notes command-line option
49
- - notes: refactor display notes default handling
50
- - notes: refactor display notes extra refs field
51
- - revision.c: refactor notes ref expansion
52
- - notes: make expand_notes_ref globally accessible
166
+* jk/pull-into-empty (2011-03-25) 2 commits
167
+ (merged to 'next' on 2011-03-31 at d4dd598)
168
+ + pull: do not clobber untracked files on initial pull
169
+ + merge: merge unborn index before setting ref
170
171
* jr/grep-en-config (2011-03-30) 1 commit
172
(merged to 'next' on 2011-03-31 at 2a73028)
173
+ grep: allow -E and -n to be turned on by default via configuration
174
58
-This is low impact, isolated, and has no risk of breaking the system as a
59
-whole. May merge by rc1.
60
-
61
-* nd/maint-setup (2011-03-26) 2 commits
62
- (merged to 'next' on 2011-03-31 at 2c36f6a)
63
- + Kill off get_relative_cwd()
64
- + setup: return correct prefix if worktree is '/'
175
+* nd/init-gitdir (2011-03-19) 2 commits
176
+ (merged to 'next' on 2011-03-31 at 3b8fb40)
177
+ + init, clone: support --separate-git-dir for .git file
178
+ + git-init.txt: move description section up
179
66
-This benefits only the minority who use /.git at the root level of the
67
-filesystem, but the changed code is used from many codepaths; will not
68
-merge before 1.7.5.
180
+* sb/sparse-more (2011-03-21) 1 commit
181
+ (merged to 'next' on 2011-03-23 at 4bec1d1)
182
+ + Makefile: Cover more files with make check
183
184
--------------------------------------------------
185
[Stalled]
186
73
-* jc/diff-irreversible-delete (2011-02-28) 1 commit
74
- - git diff -D: omit the preimage of deletes
75
-
76
-"diff -B -D" should omit the deleting half of a broken pair from the
77
-output. This is low impact, isolated, and has no risk of breaking the
78
-system as a whole, but the topic needs documentation and tests.
79
-
187
* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
188
- Look for password in both CVS and CVSNT password files.
189
@@ -104,19 +211,46 @@ flags needs to be rethought, or at least the helper needs to be moved to
211
builtin/tag.c to make it clear that it should not be used outside the
212
current usage context.
213
107
-* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
108
- - [wip] commit: allow editing notes in commit message editor
214
+--------------------------------------------------
215
+[Cooking]
216
+
217
+* jc/diff-irreversible-delete (2011-02-28) 1 commit
218
+ (merged to 'next' on 2011-04-03 at 5a23b23)
219
+ + git diff -D: omit the preimage of deletes
220
+
221
+Unstuck, thanks to Michael J Gruber.
222
+
223
+* jh/notes-add-ui (2011-03-30) 1 commit
224
+ - Make "git notes add" more user-friendly when there are existing notes
225
+
226
+* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
227
+ (merged to 'next' on 2011-04-03 at ccc9c1a)
228
+ + remote: deprecate --mirror
229
+ + remote: separate the concept of push and fetch mirrors
230
+ + remote: disallow some nonsensical option combinations
231
+
232
+May want to merge by 1.7.5 as this avoids a nonsense configuration to be
233
+created to confuse unsuspecting users.
234
+
235
+* jk/notes-ui-updates (2011-03-30) 7 commits
236
+ - log/pretty-options: Document --[no-]notes and deprecate old notes options
237
+ - revision.c: make --no-notes reset --notes list
238
+ - revision.c: support --notes command-line option
239
+ - notes: refactor display notes default handling
240
+ - notes: refactor display notes extra refs field
241
+ - revision.c: refactor notes ref expansion
242
- notes: make expand_notes_ref globally accessible
243
111
-* mg/grep-full-tree (2011-03-01) 2 commits
112
- - grep: make --full-tree work with pathspecs
113
- - grep: --full-tree
244
+I like what this does, but it probably can wait.
245
115
-Do not merge; it would be preferable to use ":/" or whatever magic
116
-pathspec that is relative to the root of the working tree.
246
+* nd/maint-setup (2011-03-26) 2 commits
247
+ (merged to 'next' on 2011-03-31 at 2c36f6a)
248
+ + Kill off get_relative_cwd()
249
+ + setup: return correct prefix if worktree is '/'
250
118
---------------------------------------------------
119
-[Cooking]
251
+This benefits only the minority who use /.git at the root level of the
252
+filesystem, but the changed code is used from many codepaths; will not
253
+merge before 1.7.5.
254
255
* mz/rebase (2011-02-28) 34 commits
256
(merged to 'next' on 2011-03-31 at 3b1343c)
@@ -162,16 +296,6 @@ a response to regression concerns raised by J6t, but ended up merging it
296
after giving another look. Will not merge before 1.7.5, as there is no
297
user visible improvements up to this point.
298
165
-* jc/merge-sans-branch (2011-03-23) 2 commits
166
- (merged to 'next' on 2011-03-31 at 754a6af)
167
- + merge: merge with the default upstream branch without argument
168
- + merge: match the help text with the documentation
169
-
170
-Allow running "git merge" without telling it what to merge. It will merge
171
-with the "upstream" of the current branch if configured. This is low
172
-impact, isolated, and has no risk of major regression. May merge before
173
-rc1, but it is Ok to wait.
174
-
299
* jh/gitweb-localtime (2011-03-23) 1 commit
300
- gitweb: javascript ability to adjust time based on timezone
301
@@ -183,14 +307,6 @@ rc1, but it is Ok to wait.
307
308
May merge before rc1, but it is Ok to wait.
309
186
-* jk/pull-into-empty (2011-03-25) 2 commits
187
- (merged to 'next' on 2011-03-31 at d4dd598)
188
- + pull: do not clobber untracked files on initial pull
189
- + merge: merge unborn index before setting ref
190
-
191
-This is low impact, isolated, and has no risk of major regression. Will
192
-merge before rc1.
193
-
310
* mz/maint-rename-unmerged (2011-03-23) 1 commit
311
(merged to 'next' on 2011-03-31 at c7b3d9a)
312
+ diffcore-rename: don't consider unmerged path as source
@@ -219,20 +335,6 @@ as a whole, but I would wait until the ":/" magic pathspec materializes,
335
as the advice message would have to become different, and the way to get
336
more stable semantics will become more direct.
337
222
-* jk/progress-with-pager (2011-03-24) 4 commits
223
- - diff: turn on rename detection progress reporting
224
- - show: turn on rename detection progress reporting
225
- - progress: use pager's original_stderr if available
226
- - pager: save the original stderr when redirecting to pager
227
-
228
-Will cook until 1.7.5 final.
229
-
230
-* sb/sparse-more (2011-03-21) 1 commit
231
- (merged to 'next' on 2011-03-23 at 4bec1d1)
232
- + Makefile: Cover more files with make check
233
-
234
-Will merge.
235
-
338
* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
339
(merged to 'next' on 2011-03-31 at 8d685d7)
340
+ diffcore-rename: fall back to -C when -C -C busts the rename limit
@@ -255,13 +357,6 @@ Will hold.
357
358
I am not happy with these magic band aids. Will hold.
359
258
-* nd/init-gitdir (2011-03-19) 2 commits
259
- (merged to 'next' on 2011-03-31 at 3b8fb40)
260
- + init, clone: support --separate-git-dir for .git file
261
- + git-init.txt: move description section up
262
-
263
-Will merge.
264
-
360
* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
361
(merged to 'next' on 2011-03-20 at a5e452d)
362
+ fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
@@ -274,96 +369,22 @@ Will merge.
369
370
Will merge.
371
277
-* ab/i18n-st (2011-02-22) 69 commits
278
- (merged to 'next' on 2011-03-23 at e2732e2)
279
- + i18n: git-shortlog basic messages
280
- + i18n: git-revert split up "could not revert/apply" message
281
- + i18n: git-revert literal "me" messages
282
- + i18n: git-revert "Your local changes" message
283
- + i18n: git-revert basic messages
284
- + i18n: git-notes GIT_NOTES_REWRITE_MODE error message
285
- + i18n: git-notes basic commands
286
- + i18n: git-gc "Auto packing the repository" message
287
- + i18n: git-gc basic messages
288
- + i18n: git-describe basic messages
289
- + i18n: git-clean clean.requireForce messages
290
- + i18n: git-clean basic messages
291
- + i18n: git-bundle basic messages
292
- + i18n: git-archive basic messages
293
- + i18n: git-status "renamed: " message
294
- + i18n: git-status "Initial commit" message
295
- + i18n: git-status "Changes to be committed" message
296
- + i18n: git-status shortstatus messages
297
- + i18n: git-status "nothing to commit" messages
298
- + i18n: git-status basic messages
299
- + i18n: git-push "prevent you from losing" message
300
- + i18n: git-push basic messages
301
- + i18n: git-tag tag_template message
302
- + i18n: git-tag basic messages
303
- + i18n: git-reset "Unstaged changes after reset" message
304
- + i18n: git-reset reset_type_names messages
305
- + i18n: git-reset basic messages
306
- + i18n: git-rm basic messages
307
- + i18n: git-mv "bad" messages
308
- + i18n: git-mv basic messages
309
- + i18n: git-merge "Wonderful" message
310
- + i18n: git-merge "You have not concluded your merge" messages
311
- + i18n: git-merge "Updating %s..%s" message
312
- + i18n: git-merge basic messages
313
- + i18n: git-log "--OPT does not make sense" messages
314
- + i18n: git-log basic messages
315
- + i18n: git-grep "--open-files-in-pager" message
316
- + i18n: git-grep basic messages
317
- + i18n: git-fetch split up "(non-fast-forward)" message
318
- + i18n: git-fetch update_local_ref messages
319
- + i18n: git-fetch formatting messages
320
- + i18n: git-fetch basic messages
321
- + i18n: git-diff basic messages
322
- + i18n: git-commit advice messages
323
- + i18n: git-commit "enter the commit message" message
324
- + i18n: git-commit print_summary messages
325
- + i18n: git-commit formatting messages
326
- + i18n: git-commit "middle of a merge" message
327
- + i18n: git-commit basic messages
328
- + i18n: git-checkout "Switched to a .. branch" message
329
- + i18n: git-checkout "HEAD is now at" message
330
- + i18n: git-checkout describe_detached_head messages
331
- + i18n: git-checkout: our/their version message
332
- + i18n: git-checkout basic messages
333
- + i18n: git-branch "(no branch)" message
334
- + i18n: git-branch "git branch -v" messages
335
- + i18n: git-branch "Deleted branch [...]" message
336
- + i18n: git-branch "remote branch '%s' not found" message
337
- + i18n: git-branch basic messages
338
- + i18n: git-add "Unstaged changes" message
339
- + i18n: git-add "remove '%s'" message
340
- + i18n: git-add "did not match any files" message
341
- + i18n: git-add "The following paths are ignored" message
342
- + i18n: git-add basic messages
343
- + i18n: git-clone "Cloning into" message
344
- + i18n: git-clone "Cloning into" message
345
- + i18n: git-clone basic messages
346
- + i18n: git-init "Initialized [...] repository" message
347
- + i18n: git-init basic messages
348
-
349
-Will merge.
350
-
372
--------------------------------------------------
373
[Discarded]
374
354
-* jc/diff-dotdot (2011-03-23) 2 commits
355
- . warn use of "git diff A..B"
356
- . diff: remove dead code that flips arguments order
357
-
358
-This was 1/4 tongue-in-cheek. Now we seem to have a handful of volunteer
359
-cluebat bearers, and I wouldn't have to worry about this topic very much.
375
+* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
376
+ . [wip] commit: allow editing notes in commit message editor
377
+ . notes: make expand_notes_ref globally accessible
378
361
-* jh/merge-sans-branch (2011-02-10) 4 commits
362
- . merge: add support for merging from upstream by default
363
- . merge: introduce per-branch-configuration helper function
364
- . merge: introduce setup_merge_commit helper function
365
- . merge: update the usage information to be more modern
379
+* jk/progress-with-pager (2011-03-24) 4 commits
380
+ . diff: turn on rename detection progress reporting
381
+ . show: turn on rename detection progress reporting
382
+ . progress: use pager's original_stderr if available
383
+ . pager: save the original stderr when redirecting to pager
384
367
-I've been wanting to move this forward for quite some time but
368
-ended up redoing it myself (see jc/merge-sans-branch)
385
+* mg/grep-full-tree (2011-03-01) 2 commits
386
+ . grep: make --full-tree work with pathspecs
387
+ . grep: --full-tree
388
389
+It would be preferable to use ":/" or whatever magic pathspec that is
390
+relative to the root of the working tree.