What's cooking (2010/03 #3)
Junio C Hamano committed
Mar 10, 2010 at 17:16 UTC
497f5e57dcf87b04642ad84422404c42054317d6
1 file changed
+107
-212
whats-cooking.txt
+107
-212
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2010, #02; Sun, 07)
3
-X-master-at: b7e7f6fb0005f861ca8aed80473a9809d646c403
4
-X-next-at: daec67978caa3f4d202ebee1e75c4bbb27fdc4ee
2
+Subject: What's cooking in git.git (Mar 2010, #03; Wed, 10)
3
+X-master-at: 90a2bf9ca155c8e0e43d9e30197d9562dd02ea96
4
+X-next-at: fb6b9c061dfbae34a3ab97d98b4150d138dd15ef
5
6
-What's cooking in git.git (Mar 2010, #02; Sun, 07)
6
+What's cooking in git.git (Mar 2010, #03; Wed, 10)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -16,130 +16,69 @@ Let's start quieting things down on 'next' front.
16
--------------------------------------------------
17
[Graduated to "master"]
18
19
-* mw/maint-gcc-warns-unused-write (2010-01-30) 1 commit
20
- (merged to 'next' on 2010-03-04 at 17716c0)
21
- + run-command.c: fix build warnings on Ubuntu
22
-
23
-Ready for 'master'.
24
-
25
-* gb/maint-submodule-env (2010-02-25) 5 commits
26
- (merged to 'next' on 2010-02-25 at 8c22d03)
27
- + is_submodule_modified(): clear environment properly
28
- + submodules: ensure clean environment when operating in a submodule
29
- + shell setup: clear_local_git_env() function
30
- + rev-parse: --local-env-vars option
31
- + Refactor list of of repo-local env vars
32
- (this branch is used by jl/submodule-diff-dirtiness.)
33
-
34
-Ready for 'master'.
35
-
36
-* jc/fetch-param (2010-02-24) 3 commits
37
- (merged to 'next' on 2010-02-25 at e95e252)
38
- + fetch --all/--multiple: keep all the fetched branch information
39
- + builtin-fetch --all/--multi: propagate options correctly
40
- + t5521: fix and modernize
41
-
42
-Ready for 'master'.
43
-
44
-* jk/maint-push-tracking-wo-remote (2010-02-24) 1 commit
45
- (merged to 'next' on 2010-02-25 at da946ba)
46
- + push: fix segfault for odd config
47
-
48
-Ready for 'master'.
49
-
50
-* mb/shortlog-nongit-stdin (2010-02-24) 1 commit
51
- (merged to 'next' on 2010-02-25 at d17bb74)
52
- + shortlog: warn the user when there is no input
53
-
54
-Ready for 'master'.
55
-
56
-* fn/maint-mkdtemp-compat (2010-02-25) 1 commit
57
- (merged to 'next' on 2010-02-25 at 2899a47)
58
- + Fix gitmkdtemp: correct test for mktemp() return value
59
-
60
-Ready for 'master'.
61
-
62
-* ml/maint-grep-doc (2010-02-25) 4 commits
63
- (merged to 'next' on 2010-03-02 at a75dfe0)
64
- + grep docs: document --no-index option
65
- (merged to 'next' on 2010-02-25 at ec1faf8)
66
- + grep docs: --cached and <tree>... are incompatible
67
- + grep docs: use AsciiDoc literals consistently
68
- + grep docs: pluralize "Example" section
69
-
70
-Ready for 'master'.
71
-
72
-* as/maint-expire (2010-02-26) 2 commits
73
- (merged to 'next' on 2010-03-02 at 4015ae4)
74
- + reflog: honor gc.reflogexpire=never
75
- + prune: honor --expire=never
76
-
77
-Ready for 'master'.
78
-
79
-* il/loosen-remote-helper-names (2010-02-23) 1 commit
80
- (merged to 'next' on 2010-02-25 at 5c22a39)
81
- + Allow '+', '-' and '.' in remote helper names
82
-
83
-Ready for 'master'.
84
-
85
-* jk/maint-add--interactive-delete (2010-02-22) 1 commit
86
- (merged to 'next' on 2010-02-24 at 908cef8)
87
- + add-interactive: fix bogus diff header line ordering
88
-
89
-Probably ready for 'master'.
19
+* sh/am-keep-cr (2010-02-27) 4 commits
20
+ (merged to 'next' on 2010-03-02 at ffe3c5e)
21
+ + git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
22
+ + git-am: Add am.keepcr and --no-keep-cr to override it
23
+ + git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
24
+ + documentation: 'git-mailsplit --keep-cr' is not hidden anymore
25
91
-* js/runtime-prefix-trace-not-warn (2010-02-23) 1 commit
92
- (merged to 'next' on 2010-02-24 at 8d9d305)
93
- + Print RUNTIME_PREFIX warning only when GIT_TRACE is set
26
+* sd/init-template (2010-03-02) 5 commits
27
+ (merged to 'next' on 2010-03-02 at 2d87e3f)
28
+ + wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
29
+ + t/t0001-init.sh: add test for 'init with init.templatedir set'
30
+ + init: having keywords without value is not a global error.
31
+ + Add a "TEMPLATE DIRECTORY" section to git-init[1].
32
+ + Add `init.templatedir` configuration variable.
33
95
-Ready for 'master'.
34
+* lt/deepen-builtin-source (2010-02-22) 1 commit
35
+ (merged to 'next' on 2010-02-25 at 320aa74)
36
+ + Move 'builtin-*' into a 'builtin/' subdirectory
37
+ (this branch is used by nd/setup.)
38
97
-* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit
98
- (merged to 'next' on 2010-02-24 at 621fa3d)
99
- + mailinfo: do not strip leading spaces even for a header line
39
+* cp/add-u-pathspec (2010-02-09) 2 commits
40
+ (merged to 'next' on 2010-02-24 at 2f3f2bc)
41
+ + test for add with non-existent pathspec
42
+ + git add -u: die on unmatched pathspec
43
101
-Ready for 'master'.
44
+--------------------------------------------------
45
+[Stalled]
46
103
-* ne/pack-local-doc (2010-02-24) 3 commits
104
- (merged to 'next' on 2010-02-25 at 75cfba5)
105
- + pack-objects documentation: Fix --honor-pack-keep as well.
106
- + pack-objects documentation: reword "objects that appear in the standard input"
107
- + Documentation: pack-objects: Clarify --local's semantics.
47
+* js/rebase-origin-x (2010-02-05) 1 commit
48
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
49
109
-Ready for 'master'.
50
+I retract my objection against the idea of -x; needs polishing before
51
+moving forward.
52
111
-* mm/mkstemps-mode-for-packfiles (2010-02-22) 6 commits
112
- (merged to 'next' on 2010-02-24 at 31b5903)
113
- + Use git_mkstemp_mode instead of plain mkstemp to create object files
114
- + git_mkstemps_mode: don't set errno to EINVAL on exit.
115
- + Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
116
- + git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
117
- + Move gitmkstemps to path.c
118
- + Add a testcase for ACL with restrictive umask.
53
+* sd/log-decorate (2010-02-17) 3 commits
54
+ (merged to 'next' on 2010-03-08 at 58a6fba)
55
+ + log.decorate: usability fixes
56
+ + Add `log.decorate' configuration variable.
57
+ + git_config_maybe_bool()
58
120
-Ready for 'master'.
59
+Needs squelching the configuration setting when "--pretty=raw" is given,
60
+at least, or possibly when any "--pretty" is explicitly given.
61
122
-* nd/root-git (2010-02-14) 5 commits
123
- (merged to 'next' on 2010-02-25 at bff4955)
124
- + Add test for using Git at root of file system
125
- + Support working directory located at root
126
- + Move offset_1st_component() to path.c
127
- + init-db, rev-parse --git-dir: do not append redundant slash
128
- + make_absolute_path(): Do not append redundant slash
62
+--------------------------------------------------
63
+[Cooking]
64
130
-Probably ready for 'master'.
65
+* pb/log-first-parent-p-m (2010-03-09) 5 commits
66
+ - show --first-parent/-m: do not default to --cc
67
+ - show -c: show patch text
68
+ - revision: introduce setup_revision_opt
69
+ - t4013: add tests for log -p -m --first-parent
70
+ (merged to 'next' on 2010-02-17 at 2f8e5ae)
71
+ + git log -p -m: document -m and honor --first-parent
72
132
---------------------------------------------------
133
-[New Topics]
73
+I said 'We might want to teach "-m trumps implicit --cc" to "git show"',
74
+and that is what I did near the tip. Comments?
75
135
-* jl/submodule-diff-dirtiness (2010-03-05) 2 commits
136
- - git status: Show detailed dirty status of submodules in long format
76
+* jl/submodule-diff-dirtiness (2010-03-08) 2 commits
77
+ (merged to 'next' on 2010-03-08 at 33f7a57)
78
+ + git status: Show detailed dirty status of submodules in long format
79
(merged to 'next' on 2010-03-04 at 58b2645)
80
+ git diff --submodule: Show detailed dirty status of submodules
81
140
-The tip one may want to use flag bits from places different from "format",
141
-but otherwise I found the basic idea reasonably sound.
142
-
82
* cc/cherry-pick-ff (2010-03-06) 7 commits
83
(merged to 'next' on 2010-03-07 at 5589b26)
84
+ rebase -i: use new --ff cherry-pick option
@@ -150,7 +89,8 @@ but otherwise I found the basic idea reasonably sound.
89
+ builtin/merge: make checkout_fast_forward() non static
90
+ parse-options: add parse_options_concat() to concat options
91
153
-* js/async-thread (2010-03-06) 6 commits
92
+* js/async-thread (2010-03-09) 7 commits
93
+ - Enable threaded async procedures whenever pthreads is available
94
- Dying in an async procedure should only exit the thread, not the process.
95
- Reimplement async procedures using pthreads
96
- Windows: more pthreads functions
@@ -158,11 +98,14 @@ but otherwise I found the basic idea reasonably sound.
98
- Make report() from usage.c public as vreportf() and use it.
99
- Modernize t5530-upload-pack-error.
100
161
-Perhaps later we would want to enable async-by-thread on all threading
162
-capable platforms, if only to make sure we use the same code on major
163
-platforms to reduce chances of platform specific bugs.
101
+The last one is probably unsafe for 'next' until somebody goes and vets
102
+the callees that are invoked via this interface (any possible breakages
103
+are already inflicted on Windows people, though).
104
165
-* nd/setup (2010-03-07) 18 commits
105
+* nd/setup (2010-03-08) 21 commits
106
+ - index-pack: use RUN_SETUP_GENTLY
107
+ - index-pack: trust the prefix returned by setup_git_directory_gently()
108
+ - worktree setup: calculate prefix even if no worktree is found
109
- merge-file: use RUN_SETUP_GENTLY
110
- var: use RUN_SETUP_GENTLY
111
- ls-remote: use RUN_SETUP_GENTLY
@@ -181,48 +124,17 @@ platforms to reduce chances of platform specific bugs.
124
- config: use RUN_SETUP_GENTLY
125
- builtin: Support RUN_SETUP_GENTLY to set up repository early if found
126
- builtin: introduce startup_info struct
184
- (this branch uses lt/deepen-builtin-source.)
127
186
---------------------------------------------------
187
-[Stalled]
188
-
189
-* sd/log-decorate (2010-02-17) 3 commits
190
- - log.decorate: usability fixes
191
- - Add `log.decorate' configuration variable.
192
- - git_config_maybe_bool()
193
-
194
-Probably ready for 'next', except that people need to be warned about
195
-having to update their scripts to explicitly pass --no-decorate to keep
196
-them working. A good idea to disable this when --pretty was given, just
197
-like notes are disabled by default, was floated.
198
-
199
-* pb/log-first-parent-p-m (2010-02-10) 1 commit
200
- (merged to 'next' on 2010-02-17 at 2f8e5ae)
201
- + git log -p -m: document -m and honor --first-parent
202
-
203
-Needs tests but otherwise looked fine. We might want to teach "-m trumps
204
-implicit --cc" to "git show", but that is a totally separate topic.
205
-
206
-I actually care about this "log -p --first-parent" very much, but if Pasky
207
-is counting on that and procrastinating until I write the tests myself, he
208
-is in for a disappointment. I don't have that much free time these days.
209
-Help is appreciated.
210
-
211
-* js/rebase-origin-x (2010-02-05) 1 commit
212
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
213
-
214
-I retract my objection against the idea of -x; needs polishing before
215
-moving forward.
216
-
217
---------------------------------------------------
218
-[Cooking]
219
-
220
-* sd/format-patch-to (2010-02-17) 1 commit
128
+* sd/format-patch-to (2010-03-07) 4 commits
129
+ (merged to 'next' on 2010-03-08 at 739b8cd)
130
+ + send-email: add --no-cc, --no-to, and --no-bcc
131
+ + format-patch: add --no-cc, --no-to, and --no-add-headers
132
+ + format-patch: use a string_list for headers
133
(merged to 'next' on 2010-03-07 at ef7a18d)
134
+ Add 'git format-patch --to=' option and 'format.to' configuration variable.
135
224
-Squashed tests by Stephen in; it seems we will have updates to add --no-{cc,to,...}
225
-to both format-patch and send-email but that is more or less independent clean-up.
136
+Squashed tests by Stephen in.
137
+I think this is ready for 'master'. Comments?
138
139
* bg/apply-fix-blank-at-eof (2010-03-06) 5 commits
140
(merged to 'next' on 2010-03-07 at daec679)
@@ -233,10 +145,11 @@ to both format-patch and send-email but that is more or less independent clean-u
145
+ apply: Don't unnecessarily update line lengths in the preimage
146
147
* sg/bash-completion (2010-02-23) 4 commits
236
- - bash: completion for gitk aliases
237
- - bash: support user-supplied completion scripts for aliases
238
- - bash: support user-supplied completion scripts for user's git commands
239
- - bash: improve aliased command recognition
148
+ (merged to 'next' on 2010-03-08 at bc59860)
149
+ + bash: completion for gitk aliases
150
+ + bash: support user-supplied completion scripts for aliases
151
+ + bash: support user-supplied completion scripts for user's git commands
152
+ + bash: improve aliased command recognition
153
154
Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
155
@@ -246,49 +159,42 @@ Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
159
+ git-svn: Support retrieving passwords with GIT_ASKPASS
160
161
* jc/color-attrs (2010-02-27) 1 commit
249
- - color: allow multiple attributes
250
-
251
-As the output we generate is bounded, there is no need for checking
252
-overflows as long as we count the maximum correctly.
162
+ (merged to 'next' on 2010-03-08 at ba02883)
163
+ + color: allow multiple attributes
164
165
* jc/maint-add-ignored-dir (2010-02-28) 3 commits
255
- - builtin-add: fix exclude handling
256
- - tests for "git add ignored-dir/file" without -f
257
- - t0050: mark non-working test as such
166
+ (merged to 'next' on 2010-03-08 at a51762e)
167
+ + builtin-add: fix exclude handling
168
+ + tests for "git add ignored-dir/file" without -f
169
+ + t0050: mark non-working test as such
170
259
-Not quite happy, but will merge to 'next' anyway.
171
+Jeff came up with a simpler fix than the one at the tip, and we may want
172
+to replace it with his, and possibly teach globbing to the logic later.
173
174
* ml/color-grep (2010-03-07) 3 commits
262
- - grep: Colorize selected, context, and function lines
263
- - grep: Colorize filename, line number, and separator
264
- - Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
265
-
266
-Perhaps unoptimize the "reset" bit? Other than that looked Ok.
175
+ (merged to 'next' on 2010-03-08 at 24d1eb4)
176
+ + grep: Colorize selected, context, and function lines
177
+ + grep: Colorize filename, line number, and separator
178
+ + Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
179
180
* sb/notes-parse-opt (2010-02-27) 1 commit
181
- notes: rework subcommands and parse options
182
(this branch uses early parts of jh/notes and tr/notes-display.)
183
272
-* sh/am-keep-cr (2010-02-27) 4 commits
273
- (merged to 'next' on 2010-03-02 at ffe3c5e)
274
- + git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
275
- + git-am: Add am.keepcr and --no-keep-cr to override it
276
- + git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
277
- + documentation: 'git-mailsplit --keep-cr' is not hidden anymore
278
-
184
* bw/union-merge-refactor (2010-03-01) 4 commits
280
- - merge-file: add option to select union merge favor
281
- - merge-file: add option to specify the marker size
185
+ (merged to 'next' on 2010-03-10 at b917078)
186
+ + merge-file: add option to select union merge favor
187
+ + merge-file: add option to specify the marker size
188
(merged to 'next' on 2010-03-07 at 9d1eff6)
189
+ refactor merge flags into xmparam_t
190
+ make union merge an xdl merge favor
191
286
-* mg/test-svn-info (2010-03-03) 2 commits
287
- - t9119-git-svn-info.sh: test with svn 1.6.* as well
288
- - git-svn: req_svn when needed
192
+* jh/maint-submodule-status-in-void (2010-03-09) 2 commits
193
+ - git submodule summary: Handle HEAD as argument when on an unborn branch
194
+ (merged to 'next' on 2010-03-08 at 0697bf4)
195
+ + submodule summary: do not fail before the first commit
196
290
-* jh/maint-submodule-status-in-void (2010-03-03) 1 commit
291
- - submodule summary: do not fail before the first commit
197
+There are still more fix-ups comming?
198
199
* ld/push-porcelain (2010-02-26) 4 commits
200
(merged to 'next' on 2010-03-02 at d15bb1e)
@@ -297,21 +203,7 @@ Perhaps unoptimize the "reset" bit? Other than that looked Ok.
203
+ git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
204
+ git-push: fix an advice message so it goes to stderr
205
300
-* sd/init-template (2010-03-02) 5 commits
301
- (merged to 'next' on 2010-03-02 at 2d87e3f)
302
- + wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
303
- + t/t0001-init.sh: add test for 'init with init.templatedir set'
304
- + init: having keywords without value is not a global error.
305
- + Add a "TEMPLATE DIRECTORY" section to git-init[1].
306
- + Add `init.templatedir` configuration variable.
307
-
308
-* lt/deepen-builtin-source (2010-02-22) 1 commit
309
- (merged to 'next' on 2010-02-25 at 320aa74)
310
- + Move 'builtin-*' into a 'builtin/' subdirectory
311
- (this branch is used by nd/setup.)
312
-
313
-This is a painful one to keep out of 'master' for a long time, as any
314
-topic with new builtin commands will need evil merges to adjust to it.
206
+I think this is ready for 'master'. Comments?
207
208
* tc/http-cleanup (2010-03-02) 7 commits
209
(merged to 'next' on 2010-03-07 at e92db25)
@@ -323,7 +215,11 @@ topic with new builtin commands will need evil merges to adjust to it.
215
+ t554[01]-http-push: refactor, add non-ff tests
216
+ t5541-http-push: check that ref is unchanged for non-ff test
217
326
-* tr/notes-display (2010-02-23) 11 commits
218
+I think this is ready for 'master'. Comments?
219
+
220
+* tr/notes-display (2010-03-10) 13 commits
221
+ - git-notes(1): add a section about the meaning of history
222
+ - notes: track whether notes_trees were changed at all
223
- notes: add shorthand --ref to override GIT_NOTES_REF
224
- commit --amend: copy notes to the new commit
225
- rebase: support automatic notes copying
@@ -337,13 +233,13 @@ topic with new builtin commands will need evil merges to adjust to it.
233
- test-lib: unset GIT_NOTES_REF to stop it from influencing tests
234
(this branch uses early parts of jh/notes; is used by sb/notes-parse-opt.)
235
340
-Re-roll planned.
236
+Re-rolled. I think this is ready for 'next'. Comments?
237
238
* cw/test-lib-relicense (2010-02-22) 1 commit
239
. test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
240
241
Ack-collection stopped at the last three names. I am hoping Carl can take
346
-it from there without my keeping an eye on it?
242
+it from there without my keeping an eye on it.
243
244
* tc/transport-verbosity (2010-02-24) 10 commits
245
(merged to 'next' on 2010-03-07 at 898d6dd)
@@ -358,12 +254,7 @@ it from there without my keeping an eye on it?
254
+ Documentation/git-pull: put verbosity options before merge/fetch ones
255
+ Documentation/git-clone: mention progress in -v
256
361
-* cp/add-u-pathspec (2010-02-09) 2 commits
362
- (merged to 'next' on 2010-02-24 at 2f3f2bc)
363
- + test for add with non-existent pathspec
364
- + git add -u: die on unmatched pathspec
365
-
366
-Not quite happy, but will merge to 'master' shortly anyway.
257
+I think this is ready for 'master'. Comments?
258
259
* jh/notes (2010-03-04) 33 commits
260
(merged to 'next' on 2010-03-04 at 3bb921f)
@@ -406,10 +297,14 @@ Not quite happy, but will merge to 'master' shortly anyway.
297
298
Ready for 'master'.
299
409
-* cc/reset-keep (2010-01-19) 5 commits
300
+* cc/reset-keep (2010-03-09) 6 commits
301
+ (merged to 'next' on 2010-03-08 at 015ef4b)
302
+ + Documentation: improve description of "git reset --keep"
303
(merged to 'next' on 2010-03-07 at 5237d8e)
304
+ reset: disallow using --keep when there are unmerged entries
305
+ reset: disallow "reset --keep" outside a work tree
306
+ Documentation: reset: describe new "--keep" option
307
+ reset: add test cases for "--keep" option
308
+ reset: add option "--keep" to "git reset"
309
+
310
+I think this is ready for 'master'. Comments?