What's cooking (2010/03 #4)
Junio C Hamano committed
Mar 16, 2010 at 22:35 UTC
5c8814e37bb13b6a3f42fb01027e42cb43788126
1 file changed
+183
-161
whats-cooking.txt
+183
-161
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2010, #03; Wed, 10)
3
-X-master-at: 90a2bf9ca155c8e0e43d9e30197d9562dd02ea96
4
-X-next-at: fb6b9c061dfbae34a3ab97d98b4150d138dd15ef
2
+Subject: What's cooking in git.git (Mar 2010, #04; Tue, 16)
3
+X-master-at: 60dafdd37d7df358b6ff67b317dbe738b50ea6d6
4
+X-next-at: 960ece0e784e9392d8be0c804acc7385ddb9f398
5
6
-What's cooking in git.git (Mar 2010, #03; Wed, 10)
6
+What's cooking in git.git (Mar 2010, #04; Tue, 16)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,39 +11,142 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-Let's start quieting things down on 'next' front.
15
-
14
--------------------------------------------------
15
[Graduated to "master"]
16
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
-
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
-
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
-
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
17
+* sd/format-patch-to (2010-03-07) 4 commits
18
+ (merged to 'next' on 2010-03-08 at 739b8cd)
19
+ + send-email: add --no-cc, --no-to, and --no-bcc
20
+ + format-patch: add --no-cc, --no-to, and --no-add-headers
21
+ + format-patch: use a string_list for headers
22
+ (merged to 'next' on 2010-03-07 at ef7a18d)
23
+ + Add 'git format-patch --to=' option and 'format.to' configuration variable.
24
+
25
+* ld/push-porcelain (2010-03-11) 5 commits
26
+ (merged to 'next' on 2010-03-11 at c6dea6a)
27
+ + t5516: Use test_cmp when appropriate
28
+ (merged to 'next' on 2010-03-02 at d15bb1e)
29
+ + git-push: add tests for git push --porcelain
30
+ + git-push: make git push --porcelain print "Done"
31
+ + git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
32
+ + git-push: fix an advice message so it goes to stderr
33
+
34
+* tc/http-cleanup (2010-03-02) 7 commits
35
+ (merged to 'next' on 2010-03-07 at e92db25)
36
+ + remote-curl: init walker only when needed
37
+ + remote-curl: use http_fetch_ref() instead of walker wrapper
38
+ + http: init and cleanup separately from http-walker
39
+ + http-walker: cleanup more thoroughly
40
+ + http-push: remove "|| 1" to enable verbose check
41
+ + t554[01]-http-push: refactor, add non-ff tests
42
+ + t5541-http-push: check that ref is unchanged for non-ff test
43
+
44
+* tc/transport-verbosity (2010-02-24) 10 commits
45
+ (merged to 'next' on 2010-03-07 at 898d6dd)
46
+ + transport: update flags to be in running order
47
+ + fetch and pull: learn --progress
48
+ + push: learn --progress
49
+ + transport->progress: use flag authoritatively
50
+ + clone: support multiple levels of verbosity
51
+ + push: support multiple levels of verbosity
52
+ + fetch: refactor verbosity option handling into transport.[ch]
53
+ + Documentation/git-push: put --quiet before --verbose
54
+ + Documentation/git-pull: put verbosity options before merge/fetch ones
55
+ + Documentation/git-clone: mention progress in -v
56
+
57
+* jh/notes (2010-03-04) 33 commits
58
+ (merged to 'next' on 2010-03-04 at 3bb921f)
59
+ + Documentation: fix a few typos in git-notes.txt
60
+ (merged to 'next' on 2010-02-24 at c88263d)
61
+ + notes: fix malformed tree entry
62
+ + builtin-notes: Minor (mostly parse_options-related) fixes
63
+ (merged to 'next' on 2010-02-21 at 75fc451)
64
+ + builtin-notes: Add "copy" subcommand for copying notes between objects
65
+ + builtin-notes: Misc. refactoring of argc and exit value handling
66
+ + builtin-notes: Add -c/-C options for reusing notes
67
+ + builtin-notes: Refactor handling of -F option to allow combining -m and -F
68
+ + builtin-notes: Deprecate the -m/-F options for "git notes edit"
69
+ + builtin-notes: Add "append" subcommand for appending to note objects
70
+ + builtin-notes: Add "add" subcommand for adding notes to objects
71
+ + builtin-notes: Add --message/--file aliases for -m/-F options
72
+ + builtin-notes: Add "list" subcommand for listing note objects
73
+ + Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
74
+ + builtin-notes: Add "prune" subcommand for removing notes for missing objects
75
+ + Notes API: prune_notes(): Prune notes that belong to non-existing objects
76
+ + t3305: Verify that removing notes triggers automatic fanout consolidation
77
+ + builtin-notes: Add "remove" subcommand for removing existing notes
78
+ + Teach builtin-notes to remove empty notes
79
+ + Teach notes code to properly preserve non-notes in the notes tree
80
+ + t3305: Verify that adding many notes with git-notes triggers increased fanout
81
+ + t3301: Verify successful annotation of non-commits
82
+ + Builtin-ify git-notes
83
+ + Refactor notes concatenation into a flexible interface for combining notes
84
+ + Notes API: Allow multiple concurrent notes trees with new struct notes_tree
85
+ + Notes API: write_notes_tree(): Store the notes tree in the database
86
+ + Notes API: for_each_note(): Traverse the entire notes tree with a callback
87
+ + Notes API: get_note(): Return the note annotating the given object
88
+ + Notes API: remove_note(): Remove note objects from the notes tree structure
89
+ + Notes API: add_note(): Add note objects to the internal notes tree structure
90
+ + Notes API: init_notes(): Initialize the notes tree from the given notes ref
91
+ + Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
92
+ + Notes API: get_commit_notes() -> format_note() + remove the commit restriction
93
+ + Minor cosmetic fixes to notes.c
94
+ (this branch shares commits with sb/notes-parse-opt and tr/notes-display.)
95
+
96
+--------------------------------------------------
97
+[New Topics]
98
+
99
+* jk/maint-add-ignored-dir (2010-02-28) 3 commits
100
+ (merged to 'next' on 2010-03-13 at df91e32)
101
+ + tests for "git add ignored-dir/file" without -f
102
+ + dir: fix COLLECT_IGNORED on excluded prefixes
103
+ + t0050: mark non-working test as such
104
+
105
+This replaces jc/maint-add-ignored-dir.
106
+
107
+* do/rebase-i-arbitrary (2010-03-14) 1 commit
108
+ - rebase--interactive: don't require what's rebased to be a branch
109
+
110
+* ja/send-email-ehlo (2010-03-14) 3 commits
111
+ - git-send-email.perl - try to give real name of the calling host to HELO/EHLO
112
+ - git-send-email.perl: add option --smtp-debug
113
+ - git-send-email.perl: improve error message in send_message()
114
+
115
+* ak/everyday-git (2009-10-21) 1 commit
116
+ - everyday: fsck and gc are not everyday operations
117
+
118
+* bc/acl-test (2010-03-15) 5 commits
119
+ - t/t1304: make a second colon optional in the mask ACL check
120
+ - t/t1304: set the ACL effective rights mask
121
+ - t/t1304: use 'test -r' to test readability rather than looking at mode bits
122
+ - t/t1304: set the Default ACL base entries
123
+ - t/t1304: avoid -d option to setfacl
124
+
125
+* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
126
+ - daemon.c: avoid accessing ss_family member of struct sockaddr_storage
127
+
128
+* ef/cherry-abbrev (2010-03-15) 1 commit
129
+ - cherry: support --abbrev option
130
+
131
+* gh/maint-stash-show-error-message (2010-03-16) 1 commit
132
+ - Improve error messages from 'git stash show'
133
+
134
+* jc/maint-refs-dangling (2010-03-15) 1 commit
135
+ (merged to 'next' on 2010-03-16 at 376027b)
136
+ + refs: ref entry with NULL sha1 is can be a dangling symref
137
+
138
+* rs/threaded-grep-context (2010-03-15) 1 commit
139
+ - grep: enable threading for context line printing
140
141
--------------------------------------------------
142
[Stalled]
143
144
+* cw/test-lib-relicense (2010-02-22) 1 commit
145
+ . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
146
+
147
+Ack-collection stopped at the last three names. I am hoping Carl can take
148
+it from there without my keeping an eye on it.
149
+
150
* js/rebase-origin-x (2010-02-05) 1 commit
151
- [RFC w/o test and incomplete] rebase: add -x option to record original commit name
152
@@ -63,17 +166,20 @@ at least, or possibly when any "--pretty" is explicitly given.
166
[Cooking]
167
168
* 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
169
+ (merged to 'next' on 2010-03-15 at 0ae494e)
170
+ + show --first-parent/-m: do not default to --cc
171
+ + show -c: show patch text
172
+ + revision: introduce setup_revision_opt
173
+ + t4013: add tests for log -p -m --first-parent
174
(merged to 'next' on 2010-02-17 at 2f8e5ae)
175
+ git log -p -m: document -m and honor --first-parent
176
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
-
76
-* jl/submodule-diff-dirtiness (2010-03-08) 2 commits
177
+* jl/submodule-diff-dirtiness (2010-03-13) 5 commits
178
+ (merged to 'next' on 2010-03-15 at 9601fd9)
179
+ + git status: ignoring untracked files must apply to submodules too
180
+ (merged to 'next' on 2010-03-13 at f9bfd8a)
181
+ + git status: Fix false positive "new commits" output for dirty submodules
182
+ + Refactor dirty submodule detection in diff-lib.c
183
(merged to 'next' on 2010-03-08 at 33f7a57)
184
+ git status: Show detailed dirty status of submodules in long format
185
(merged to 'next' on 2010-03-04 at 58b2645)
@@ -89,6 +195,8 @@ and that is what I did near the tip. Comments?
195
+ builtin/merge: make checkout_fast_forward() non static
196
+ parse-options: add parse_options_concat() to concat options
197
198
+I think this is ready for 'master'; comments?
199
+
200
* js/async-thread (2010-03-09) 7 commits
201
- Enable threaded async procedures whenever pthreads is available
202
- Dying in an async procedure should only exit the thread, not the process.
@@ -125,17 +233,6 @@ are already inflicted on Windows people, though).
233
- builtin: Support RUN_SETUP_GENTLY to set up repository early if found
234
- builtin: introduce startup_info struct
235
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
-
136
-Squashed tests by Stephen in.
137
-I think this is ready for 'master'. Comments?
138
-
236
* bg/apply-fix-blank-at-eof (2010-03-06) 5 commits
237
(merged to 'next' on 2010-03-07 at daec679)
238
+ t3417: Add test cases for "rebase --whitespace=fix"
@@ -144,6 +241,8 @@ I think this is ready for 'master'. Comments?
241
+ apply: Remove the quick rejection test
242
+ apply: Don't unnecessarily update line lengths in the preimage
243
244
+Ready for 'master'.
245
+
246
* sg/bash-completion (2010-02-23) 4 commits
247
(merged to 'next' on 2010-03-08 at bc59860)
248
+ bash: completion for gitk aliases
@@ -158,18 +257,13 @@ Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
257
+ git-core: Support retrieving passwords with GIT_ASKPASS
258
+ git-svn: Support retrieving passwords with GIT_ASKPASS
259
260
+Perhaps ready for 'master'? I dunno.
261
+
262
* jc/color-attrs (2010-02-27) 1 commit
263
(merged to 'next' on 2010-03-08 at ba02883)
264
+ color: allow multiple attributes
265
165
-* jc/maint-add-ignored-dir (2010-02-28) 3 commits
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
-
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.
266
+Ready for 'master'.
267
268
* ml/color-grep (2010-03-07) 3 commits
269
(merged to 'next' on 2010-03-08 at 24d1eb4)
@@ -177,9 +271,11 @@ to replace it with his, and possibly teach globbing to the logic later.
271
+ grep: Colorize filename, line number, and separator
272
+ Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
273
274
+Ready for 'master'.
275
+
276
* sb/notes-parse-opt (2010-02-27) 1 commit
277
- notes: rework subcommands and parse options
182
- (this branch uses early parts of jh/notes and tr/notes-display.)
278
+ (this branch uses tr/notes-display.)
279
280
* bw/union-merge-refactor (2010-03-01) 4 commits
281
(merged to 'next' on 2010-03-10 at b917078)
@@ -189,113 +285,30 @@ to replace it with his, and possibly teach globbing to the logic later.
285
+ refactor merge flags into xmparam_t
286
+ make union merge an xdl merge favor
287
288
+Ready for 'master'.
289
+
290
* jh/maint-submodule-status-in-void (2010-03-09) 2 commits
193
- - git submodule summary: Handle HEAD as argument when on an unborn branch
291
+ (merged to 'next' on 2010-03-15 at 49af9de)
292
+ + git submodule summary: Handle HEAD as argument when on an unborn branch
293
(merged to 'next' on 2010-03-08 at 0697bf4)
294
+ submodule summary: do not fail before the first commit
295
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)
201
- + git-push: add tests for git push --porcelain
202
- + git-push: make git push --porcelain print "Done"
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
-
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)
210
- + remote-curl: init walker only when needed
211
- + remote-curl: use http_fetch_ref() instead of walker wrapper
212
- + http: init and cleanup separately from http-walker
213
- + http-walker: cleanup more thoroughly
214
- + http-push: remove "|| 1" to enable verbose check
215
- + t554[01]-http-push: refactor, add non-ff tests
216
- + t5541-http-push: check that ref is unchanged for non-ff test
217
-
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
226
- - notes: implement helpers needed for note copying during rewrite
227
- - notes: implement 'git notes copy --stdin'
228
- - rebase -i: invoke post-rewrite hook
229
- - rebase: invoke post-rewrite hook
230
- - commit --amend: invoke post-rewrite hook
231
- - Documentation: document post-rewrite hook
232
- - Support showing notes from more than one notes tree
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
-
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
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)
246
- + transport: update flags to be in running order
247
- + fetch and pull: learn --progress
248
- + push: learn --progress
249
- + transport->progress: use flag authoritatively
250
- + clone: support multiple levels of verbosity
251
- + push: support multiple levels of verbosity
252
- + fetch: refactor verbosity option handling into transport.[ch]
253
- + Documentation/git-push: put --quiet before --verbose
254
- + Documentation/git-pull: put verbosity options before merge/fetch ones
255
- + Documentation/git-clone: mention progress in -v
256
-
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)
261
- + Documentation: fix a few typos in git-notes.txt
262
- (merged to 'next' on 2010-02-24 at c88263d)
263
- + notes: fix malformed tree entry
264
- + builtin-notes: Minor (mostly parse_options-related) fixes
265
- (merged to 'next' on 2010-02-21 at 75fc451)
266
- + builtin-notes: Add "copy" subcommand for copying notes between objects
267
- + builtin-notes: Misc. refactoring of argc and exit value handling
268
- + builtin-notes: Add -c/-C options for reusing notes
269
- + builtin-notes: Refactor handling of -F option to allow combining -m and -F
270
- + builtin-notes: Deprecate the -m/-F options for "git notes edit"
271
- + builtin-notes: Add "append" subcommand for appending to note objects
272
- + builtin-notes: Add "add" subcommand for adding notes to objects
273
- + builtin-notes: Add --message/--file aliases for -m/-F options
274
- + builtin-notes: Add "list" subcommand for listing note objects
275
- + Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
276
- + builtin-notes: Add "prune" subcommand for removing notes for missing objects
277
- + Notes API: prune_notes(): Prune notes that belong to non-existing objects
278
- + t3305: Verify that removing notes triggers automatic fanout consolidation
279
- + builtin-notes: Add "remove" subcommand for removing existing notes
280
- + Teach builtin-notes to remove empty notes
281
- + Teach notes code to properly preserve non-notes in the notes tree
282
- + t3305: Verify that adding many notes with git-notes triggers increased fanout
283
- + t3301: Verify successful annotation of non-commits
284
- + Builtin-ify git-notes
285
- + Refactor notes concatenation into a flexible interface for combining notes
286
- + Notes API: Allow multiple concurrent notes trees with new struct notes_tree
287
- + Notes API: write_notes_tree(): Store the notes tree in the database
288
- + Notes API: for_each_note(): Traverse the entire notes tree with a callback
289
- + Notes API: get_note(): Return the note annotating the given object
290
- + Notes API: remove_note(): Remove note objects from the notes tree structure
291
- + Notes API: add_note(): Add note objects to the internal notes tree structure
292
- + Notes API: init_notes(): Initialize the notes tree from the given notes ref
293
- + Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
294
- + Notes API: get_commit_notes() -> format_note() + remove the commit restriction
295
- + Minor cosmetic fixes to notes.c
296
- (this branch shares commits with sb/notes-parse-opt and tr/notes-display.)
297
-
298
-Ready for 'master'.
296
+* tr/notes-display (2010-03-12) 13 commits
297
+ (merged to 'next' on 2010-03-15 at 3329361)
298
+ + git-notes(1): add a section about the meaning of history
299
+ + notes: track whether notes_trees were changed at all
300
+ + notes: add shorthand --ref to override GIT_NOTES_REF
301
+ + commit --amend: copy notes to the new commit
302
+ + rebase: support automatic notes copying
303
+ + notes: implement helpers needed for note copying during rewrite
304
+ + notes: implement 'git notes copy --stdin'
305
+ + rebase -i: invoke post-rewrite hook
306
+ + rebase: invoke post-rewrite hook
307
+ + commit --amend: invoke post-rewrite hook
308
+ + Documentation: document post-rewrite hook
309
+ + Support showing notes from more than one notes tree
310
+ + test-lib: unset GIT_NOTES_REF to stop it from influencing tests
311
+ (this branch is used by sb/notes-parse-opt.)
312
313
* cc/reset-keep (2010-03-09) 6 commits
314
(merged to 'next' on 2010-03-08 at 015ef4b)
@@ -308,3 +321,12 @@ Ready for 'master'.
321
+ reset: add option "--keep" to "git reset"
322
323
I think this is ready for 'master'. Comments?
324
+
325
+--------------------------------------------------
326
+[Ejected from 'next']
327
+
328
+* jc/maint-add-ignored-dir (2010-02-28) 3 commits
329
+ (merged to 'next' on 2010-03-08 at a51762e)
330
+ + builtin-add: fix exclude handling
331
+ + tests for "git add ignored-dir/file" without -f
332
+ + t0050: mark non-working test as such