What's cooking (2010/03 #5)
Junio C Hamano committed
Mar 20, 2010 at 12:56 UTC
930a889c6c7b9bd50262dbf29f765ce3f6a8ce7e
1 file changed
+158
-196
whats-cooking.txt
+158
-196
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2010, #04; Tue, 16)
3
-X-master-at: 60dafdd37d7df358b6ff67b317dbe738b50ea6d6
4
-X-next-at: 960ece0e784e9392d8be0c804acc7385ddb9f398
2
+Subject: What's cooking in git.git (Mar 2010, #05; Sat, 20)
3
+X-master-at: 0d0925c5e25fad8079739be36d88faa21fc1f588
4
+X-next-at: fdfcd14527c8a7f606aebfcd9dcd99e6cbf7cea5
5
6
-What's cooking in git.git (Mar 2010, #04; Tue, 16)
6
+What's cooking in git.git (Mar 2010, #05; Sat, 20)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,129 +14,98 @@ still holding onto them.
14
--------------------------------------------------
15
[Graduated to "master"]
16
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
-
17
* jk/maint-add-ignored-dir (2010-02-28) 3 commits
18
(merged to 'next' on 2010-03-13 at df91e32)
19
+ tests for "git add ignored-dir/file" without -f
20
+ dir: fix COLLECT_IGNORED on excluded prefixes
21
+ t0050: mark non-working test as such
22
105
-This replaces jc/maint-add-ignored-dir.
23
+This replaced jc/maint-add-ignored-dir. Will need to merge to maint
24
+later.
25
107
-* do/rebase-i-arbitrary (2010-03-14) 1 commit
108
- - rebase--interactive: don't require what's rebased to be a branch
26
+* bg/apply-fix-blank-at-eof (2010-03-06) 5 commits
27
+ (merged to 'next' on 2010-03-07 at daec679)
28
+ + t3417: Add test cases for "rebase --whitespace=fix"
29
+ + t4124: Add additional tests of --whitespace=fix
30
+ + apply: Allow blank context lines to match beyond EOF
31
+ + apply: Remove the quick rejection test
32
+ + apply: Don't unnecessarily update line lengths in the preimage
33
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()
34
+* fl/askpass (2010-03-04) 2 commits
35
+ (merged to 'next' on 2010-03-07 at 5ab370a)
36
+ + git-core: Support retrieving passwords with GIT_ASKPASS
37
+ + git-svn: Support retrieving passwords with GIT_ASKPASS
38
115
-* ak/everyday-git (2009-10-21) 1 commit
116
- - everyday: fsck and gc are not everyday operations
39
+* jc/color-attrs (2010-02-27) 1 commit
40
+ (merged to 'next' on 2010-03-08 at ba02883)
41
+ + color: allow multiple attributes
42
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
43
+* ml/color-grep (2010-03-07) 3 commits
44
+ (merged to 'next' on 2010-03-08 at 24d1eb4)
45
+ + grep: Colorize selected, context, and function lines
46
+ + grep: Colorize filename, line number, and separator
47
+ + Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
48
125
-* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
126
- - daemon.c: avoid accessing ss_family member of struct sockaddr_storage
49
+* bw/union-merge-refactor (2010-03-01) 4 commits
50
+ (merged to 'next' on 2010-03-10 at b917078)
51
+ + merge-file: add option to select union merge favor
52
+ + merge-file: add option to specify the marker size
53
+ (merged to 'next' on 2010-03-07 at 9d1eff6)
54
+ + refactor merge flags into xmparam_t
55
+ + make union merge an xdl merge favor
56
128
-* ef/cherry-abbrev (2010-03-15) 1 commit
129
- - cherry: support --abbrev option
57
+* cc/reset-keep (2010-03-09) 6 commits
58
+ (merged to 'next' on 2010-03-08 at 015ef4b)
59
+ + Documentation: improve description of "git reset --keep"
60
+ (merged to 'next' on 2010-03-07 at 5237d8e)
61
+ + reset: disallow using --keep when there are unmerged entries
62
+ + reset: disallow "reset --keep" outside a work tree
63
+ + Documentation: reset: describe new "--keep" option
64
+ + reset: add test cases for "--keep" option
65
+ + reset: add option "--keep" to "git reset"
66
131
-* gh/maint-stash-show-error-message (2010-03-16) 1 commit
132
- - Improve error messages from 'git stash show'
67
+--------------------------------------------------
68
+[New Topics]
69
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
70
+* ar/config-from-command-line (2010-03-19) 1 commit
71
+ - Allow passing of configuration parameters in the command line
72
138
-* rs/threaded-grep-context (2010-03-15) 1 commit
139
- - grep: enable threading for context line printing
73
+* bc/t5505-fix (2010-03-19) 3 commits
74
+ - t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
75
+ - t5505: add missing &&
76
+ - t5505: remove unnecessary subshell invocations
77
+
78
+Looked reasonable. Soon in 'next'.
79
+
80
+* bw/template-tool-buildconfig (2010-03-20) 2 commits
81
+ - Modernize git calling conventions in hook templates
82
+ - Make templates honour SHELL_PATH and PERL_PATH
83
+
84
+Looked reasonable. Soon in 'next'.
85
+
86
+* mb/rebase-i-no-ff (2010-03-16) 1 commit
87
+ - Teach --no-ff option to 'rebase -i'.
88
+
89
+Looked reasonable. Soon in 'next'.
90
+
91
+* jn/merge-diff3-label (2010-03-17) 13 commits
92
+ . cherry-pick, revert: add a label for ancestor
93
+ . revert: clarify label on conflict hunks
94
+ . compat: add mempcpy()
95
+ . tests: document cherry-pick behavior in face of conflicts
96
+ . checkout -m --conflict=diff3: add a label for ancestor
97
+ . tests: document format of conflicts from checkout -m
98
+ . merge_trees(): add ancestor label parameter for diff3-style output
99
+ . merge_file(): add comment explaining behavior wrt conflict style
100
+ . checkout --conflict=diff3: add a label for ancestor
101
+ . ll_merge(): add ancestor label parameter for diff3-style output
102
+ . merge-file --diff3: add a label for ancestor
103
+ . xdl_merge(): move file1 and file2 labels to xmparam structure
104
+ . xdl_merge(): add optional ancestor label to diff3-style output
105
+
106
+This somewhat conflicts with bw/union-merge-refactor that in 'master'; I
107
+could resolve the conflicts myself, but I'd rather not. Jonathan, could
108
+you rebase the series?
109
110
--------------------------------------------------
111
[Stalled]
@@ -153,6 +122,15 @@ it from there without my keeping an eye on it.
122
I retract my objection against the idea of -x; needs polishing before
123
moving forward.
124
125
+* sg/bash-completion (2010-02-23) 4 commits
126
+ (merged to 'next' on 2010-03-08 at bc59860)
127
+ + bash: completion for gitk aliases
128
+ + bash: support user-supplied completion scripts for aliases
129
+ + bash: support user-supplied completion scripts for user's git commands
130
+ + bash: improve aliased command recognition
131
+
132
+Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
133
+
134
* sd/log-decorate (2010-02-17) 3 commits
135
(merged to 'next' on 2010-03-08 at 58a6fba)
136
+ log.decorate: usability fixes
@@ -165,6 +143,58 @@ at least, or possibly when any "--pretty" is explicitly given.
143
--------------------------------------------------
144
[Cooking]
145
146
+* do/rebase-i-arbitrary (2010-03-14) 1 commit
147
+ - rebase--interactive: don't require what's rebased to be a branch
148
+
149
+Looked reasonable. Soon in 'next'.
150
+
151
+* ja/send-email-ehlo (2010-03-14) 3 commits
152
+ - git-send-email.perl - try to give real name of the calling host to HELO/EHLO
153
+ - git-send-email.perl: add option --smtp-debug
154
+ - git-send-email.perl: improve error message in send_message()
155
+
156
+Looked reasonable. Soon in 'next'.
157
+
158
+* ak/everyday-git (2009-10-21) 1 commit
159
+ - everyday: fsck and gc are not everyday operations
160
+
161
+Looked reasonable. Soon in 'next'.
162
+
163
+* bc/acl-test (2010-03-15) 5 commits
164
+ - t/t1304: make a second colon optional in the mask ACL check
165
+ - t/t1304: set the ACL effective rights mask
166
+ - t/t1304: use 'test -r' to test readability rather than looking at mode bits
167
+ - t/t1304: set the Default ACL base entries
168
+ - t/t1304: avoid -d option to setfacl
169
+
170
+Looked reasonable. Soon in 'next'.
171
+
172
+* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
173
+ - daemon.c: avoid accessing ss_family member of struct sockaddr_storage
174
+
175
+Looked reasonable. Soon in 'next'.
176
+
177
+* ef/cherry-abbrev (2010-03-15) 1 commit
178
+ - cherry: support --abbrev option
179
+
180
+Looked reasonable. Soon in 'next'.
181
+
182
+* gh/maint-stash-show-error-message (2010-03-16) 1 commit
183
+ - Improve error messages from 'git stash show'
184
+
185
+Looked reasonable. Soon in 'next'.
186
+
187
+* jc/maint-refs-dangling (2010-03-15) 1 commit
188
+ (merged to 'next' on 2010-03-16 at 376027b)
189
+ + refs: ref entry with NULL sha1 is can be a dangling symref
190
+
191
+Looked reasonable. Soon in 'next'.
192
+
193
+* rs/threaded-grep-context (2010-03-15) 1 commit
194
+ - grep: enable threading for context line printing
195
+
196
+Looked reasonable. Soon in 'next'.
197
+
198
* pb/log-first-parent-p-m (2010-03-09) 5 commits
199
(merged to 'next' on 2010-03-15 at 0ae494e)
200
+ show --first-parent/-m: do not default to --cc
@@ -174,6 +204,8 @@ at least, or possibly when any "--pretty" is explicitly given.
204
(merged to 'next' on 2010-02-17 at 2f8e5ae)
205
+ git log -p -m: document -m and honor --first-parent
206
207
+Ready for 'master'.
208
+
209
* jl/submodule-diff-dirtiness (2010-03-13) 5 commits
210
(merged to 'next' on 2010-03-15 at 9601fd9)
211
+ git status: ignoring untracked files must apply to submodules too
@@ -185,30 +217,31 @@ at least, or possibly when any "--pretty" is explicitly given.
217
(merged to 'next' on 2010-03-04 at 58b2645)
218
+ git diff --submodule: Show detailed dirty status of submodules
219
188
-* cc/cherry-pick-ff (2010-03-06) 7 commits
189
- (merged to 'next' on 2010-03-07 at 5589b26)
220
+Ready for 'master'.
221
+
222
+* cc/cherry-pick-ff (2010-03-06) 6 commits
223
+ (merged to 'next' on 2010-03-20 at fdfcd14)
224
+ rebase -i: use new --ff cherry-pick option
191
- + cherry-pick: add a no-op --no-ff option to future proof scripts
225
+ (merged to 'next' on 2010-03-07 at 5589b26)
226
+ Documentation: describe new cherry-pick --ff option
227
+ cherry-pick: add tests for new --ff option
228
+ revert: add --ff option to allow fast forward when cherry-picking
229
+ builtin/merge: make checkout_fast_forward() non static
230
+ parse-options: add parse_options_concat() to concat options
231
198
-I think this is ready for 'master'; comments?
232
+Ready for 'master'.
233
234
* js/async-thread (2010-03-09) 7 commits
235
- Enable threaded async procedures whenever pthreads is available
202
- - Dying in an async procedure should only exit the thread, not the process.
203
- - Reimplement async procedures using pthreads
204
- - Windows: more pthreads functions
205
- - Fix signature of fcntl() compatibility dummy
206
- - Make report() from usage.c public as vreportf() and use it.
207
- - Modernize t5530-upload-pack-error.
236
+ (merged to 'next' on 2010-03-20 at 9939243)
237
+ + Dying in an async procedure should only exit the thread, not the process.
238
+ + Reimplement async procedures using pthreads
239
+ + Windows: more pthreads functions
240
+ + Fix signature of fcntl() compatibility dummy
241
+ + Make report() from usage.c public as vreportf() and use it.
242
+ + Modernize t5530-upload-pack-error.
243
209
-The last one is probably unsafe for 'next' until somebody goes and vets
210
-the callees that are invoked via this interface (any possible breakages
211
-are already inflicted on Windows people, though).
244
+The tip one will be soon in 'next', but one step at a time.
245
246
* nd/setup (2010-03-08) 21 commits
247
- index-pack: use RUN_SETUP_GENTLY
@@ -233,60 +266,10 @@ are already inflicted on Windows people, though).
266
- builtin: Support RUN_SETUP_GENTLY to set up repository early if found
267
- builtin: introduce startup_info struct
268
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"
239
- + t4124: Add additional tests of --whitespace=fix
240
- + apply: Allow blank context lines to match beyond EOF
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
249
- + bash: support user-supplied completion scripts for aliases
250
- + bash: support user-supplied completion scripts for user's git commands
251
- + bash: improve aliased command recognition
252
-
253
-Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
254
-
255
-* fl/askpass (2010-03-04) 2 commits
256
- (merged to 'next' on 2010-03-07 at 5ab370a)
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
-
266
-Ready for 'master'.
267
-
268
-* ml/color-grep (2010-03-07) 3 commits
269
- (merged to 'next' on 2010-03-08 at 24d1eb4)
270
- + grep: Colorize selected, context, and function lines
271
- + grep: Colorize filename, line number, and separator
272
- + Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
273
-
274
-Ready for 'master'.
275
-
269
* sb/notes-parse-opt (2010-02-27) 1 commit
270
- notes: rework subcommands and parse options
271
(this branch uses tr/notes-display.)
272
280
-* bw/union-merge-refactor (2010-03-01) 4 commits
281
- (merged to 'next' on 2010-03-10 at b917078)
282
- + merge-file: add option to select union merge favor
283
- + merge-file: add option to specify the marker size
284
- (merged to 'next' on 2010-03-07 at 9d1eff6)
285
- + refactor merge flags into xmparam_t
286
- + make union merge an xdl merge favor
287
-
288
-Ready for 'master'.
289
-
273
* jh/maint-submodule-status-in-void (2010-03-09) 2 commits
274
(merged to 'next' on 2010-03-15 at 49af9de)
275
+ git submodule summary: Handle HEAD as argument when on an unborn branch
@@ -309,24 +292,3 @@ Ready for 'master'.
292
+ Support showing notes from more than one notes tree
293
+ test-lib: unset GIT_NOTES_REF to stop it from influencing tests
294
(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)
315
- + Documentation: improve description of "git reset --keep"
316
- (merged to 'next' on 2010-03-07 at 5237d8e)
317
- + reset: disallow using --keep when there are unmerged entries
318
- + reset: disallow "reset --keep" outside a work tree
319
- + Documentation: reset: describe new "--keep" option
320
- + reset: add test cases for "--keep" option
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