What's cooking (2012/02 #09)
Junio C Hamano committed
Feb 26, 2012 at 23:28 UTC
8c6a332c15cbd60e8668b85a6c2e43c91be77eb2
1 file changed
+203
-142
whats-cooking.txt
+203
-142
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2012, #08; Wed, 22)
3
-X-master-at: f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb
4
-X-next-at: b4472eeb9efa715ecf088c254868d80ebfa252fd
2
+Subject: What's cooking in git.git (Feb 2012, #09; Sun, 26)
3
+X-master-at: 3724cc7c58df709cffbf6cc0701d1ca6fa5a5ba2
4
+X-next-at: 62a6ddf54b0fda0c3cc0e609af05c6ce3503f51c
5
6
-What's cooking in git.git (Feb 2012, #08; Wed, 22)
6
+What's cooking in git.git (Feb 2012, #09; Sun, 26)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -17,54 +17,174 @@ repositories listed at
17
--------------------------------------------------
18
[New Topics]
19
20
+* jc/am-3-nonstandard-popt (2012-02-26) 2 commits
21
+ (merged to 'next' on 2012-02-26 at 62a6ddf)
22
+ + test: "am -3" can accept non-standard -p<num>
23
+ (merged to 'next' on 2012-02-26 at 1363bd6)
24
+ + am -3: allow nonstandard -p<num> option
25
+
26
+The code to synthesize the fake ancestor tree used by 3-way merge
27
+fallback in "git am" was not prepared to read a patch created with
28
+a non-standard -p<num> value.
29
+
30
+* cb/fsck-squelch-dangling (2012-02-26) 1 commit
31
+ - fsck: do not print dangling objects by default
32
+
33
+Introduces "fsck --dangling" and removes the output for dangling objects
34
+from the default output.
35
+
36
+I personally do not think it is worth risking backward compatibility in
37
+the way this patch implements the squelching of the output. An approach
38
+to add --no-dangling option without changing the default would be OK,
39
+though.
40
+
41
+* rf/no-no-no-parseopt (2012-02-26) 3 commits
42
+ - parse-options: remove PARSE_OPT_NEGHELP
43
+ - parse-options: allow positivation of options starting, with no-
44
+ - test-parse-options: convert to OPT_BOOL()
45
+
46
+Options that use PARSE_OPT_NEGHELP needed to word their help text in
47
+a strange way.
48
+
49
+--------------------------------------------------
50
+[Graduated to "master"]
51
+
52
+* fc/push-prune (2012-02-22) 4 commits
53
+ (merged to 'next' on 2012-02-23 at 8044055)
54
+ + push: add '--prune' option
55
+ + remote: refactor code into alloc_delete_ref()
56
+ + remote: reorganize check_pattern_match()
57
+ + remote: use a local variable in match_push_refs()
58
+
59
+"git push" learned the "--prune" option, similar to "git fetch".
60
+
61
* jb/filter-ignore-sigpipe (2012-02-21) 1 commit
21
- - Ignore SIGPIPE when running a filter driver
62
+ (merged to 'next' on 2012-02-23 at 605dd39)
63
+ + Ignore SIGPIPE when running a filter driver
64
23
-Looked sane.
24
-Will merge to "next".
65
+When the filter driver exits before reading the content before the main
66
+git process writes the contents to be filtered to the pipe to it, the
67
+latter could be killed with SIGPIPE instead of ignoring such an event as
68
+an error.
69
26
-* jc/pickaxe-ignore-case (2012-02-21) 1 commit
27
- - pickaxe: allow -i to search in patch case-insensitively
70
+* jc/add-refresh-unmerged (2012-02-17) 1 commit
71
+ (merged to 'next' on 2012-02-21 at 09f8721)
72
+ + refresh_index: do not show unmerged path that is outside pathspec
73
+
74
+"git add --refresh <pathspec>" warned about unmerged paths outside the
75
+given pathspec.
76
77
* jc/doc-merge-options (2012-02-22) 1 commit
30
- - Documentation/merge-options.txt: group "ff" related options together
78
+ (merged to 'next' on 2012-02-23 at dcf1d13)
79
+ + Documentation/merge-options.txt: group "ff" related options together
80
81
Documentation for "git merge" had "--ff-only" far away from other options
82
related to the handling of fast-forward merges.
83
35
-* ph/cherry-pick-advice-refinement (2012-02-22) 1 commit
36
- - cherry-pick: No advice to commit if --no-commit
84
+* jk/config-include (2012-02-17) 10 commits
85
+ (merged to 'next' on 2012-02-20 at 7b150b7)
86
+ + config: add include directive
87
+ + config: eliminate config_exclusive_filename
88
+ + config: stop using config_exclusive_filename
89
+ + config: provide a version of git_config with more options
90
+ + config: teach git_config_rename_section a file argument
91
+ + config: teach git_config_set_multivar_in_file a default path
92
+ + config: copy the return value of prefix_filename
93
+ + t1300: add missing &&-chaining
94
+ + docs/api-config: minor clarifications
95
+ + docs: add a basic description of the config API
96
38
-* pj/completion-remote-set-url-branches (2012-02-22) 2 commits
39
- - completion: normalize increment/decrement style
40
- - completion: remote set-* <name> and <branch>
97
+An assignment to the include.path pseudo-variable causes the named file
98
+to be included in-place when Git looks up configuration variables.
99
42
-* th/git-diffall (2012-02-22) 1 commit
43
- - contrib: added git-diffall
100
+* jk/maint-avoid-streaming-filtered-contents (2012-02-24) 3 commits
101
+ (merged to 'next' on 2012-02-26 at 25e014c)
102
+ + do not stream large files to pack when filters are in use
103
+ + teach dry-run convert_to_git not to require a src buffer
104
+ + teach convert_to_git a "dry run" mode
105
+
106
+The bulk check-in codepath streamed contents that needs smudge/clean
107
+filters without running them, instead of punting and delegating to the
108
+codepath to run filters after slurping everything to core.
109
+
110
+* jn/gitweb-search-optim (2012-02-23) 3 commits
111
+ (merged to 'next' on 2012-02-23 at 9f9125f)
112
+ + gitweb: Faster project search
113
+ + gitweb: Option for filling only specified info in fill_project_list_info
114
+ + gitweb: Refactor checking if part of project info need filling
115
+ (this branch is used by jn/gitweb-hilite-regions.)
116
45
---------------------------------------------------
46
-[Graduated to "master"]
117
+"gitweb" learns to read various pieces of information for the repositories
118
+lazily, instead of reading everything that could be needed (including the
119
+ones that are not necessary for a specific task).
120
+
121
+* js/configure-libintl (2012-02-20) 1 commit
122
+ (merged to 'next' on 2012-02-21 at 79d7ccc)
123
+ + configure: don't use -lintl when there is no gettext support
124
+
125
+Build fix for autoconf, meant for 'maint' track.
126
+
127
+* ld/git-p4-expanded-keywords (2012-02-14) 1 commit
128
+ (merged to 'next' on 2012-02-16 at a9004c5)
129
+ + git-p4: add initial support for RCS keywords
130
+
131
+Teach git-p4 to unexpand $RCS$-like keywords that are embedded in
132
+tracked contents in order to reduce unnecessary merge conflicts.
133
+
134
+Replaced with the rerolled patch.
135
+
136
+* pj/remote-set-branches-usage-fix (2012-02-19) 1 commit
137
+ (merged to 'next' on 2012-02-21 at cb71d0e)
138
+ + remote: fix set-branches usage and documentation
139
+
140
+Documentation fix.
141
+
142
+* sp/smart-http-failure-to-push (2012-02-23) 1 commit
143
+ (merged to 'next' on 2012-02-23 at fe0b2aa)
144
+ + disconnect from remote helpers more gently
145
+
146
+When a remote helper exits before reading the blank line from the main git
147
+process to signal the end of commands, the latter could be killed with
148
+SIGPIPE. Instead we should ignore such event as a non-error.
149
48
-* jk/diff-highlight (2012-02-13) 5 commits
49
- (merged to 'next' on 2012-02-20 at ba040ae)
50
- + diff-highlight: document some non-optimal cases
51
- + diff-highlight: match multi-line hunks
52
- + diff-highlight: refactor to prepare for multi-line hunks
53
- + diff-highlight: don't highlight whole lines
54
- + diff-highlight: make perl strict and warnings fatal
150
+* tr/maint-bundle-long-subject (2012-02-23) 4 commits
151
+ (merged to 'next' on 2012-02-23 at b2c1605)
152
+ + t5704: match tests to modern style
153
+ + strbuf: improve strbuf_get*line documentation
154
+ + bundle: use a strbuf to scan the log for boundary commits
155
+ + bundle: put strbuf_readline_fd in strbuf.c with adjustments
156
56
-Updates diff-highlight (in contrib/).
157
+"git bundle create" produced a corrupt bundle file upon seeing commits
158
+with excessively long subject line.
159
58
-* jn/gitweb-unborn-head (2012-02-17) 1 commit
59
- (merged to 'next' on 2012-02-20 at 80e3ff2)
60
- + gitweb: Fix "heads" view when there is no current branch
160
+* tr/perftest (2012-02-17) 3 commits
161
+ (merged to 'next' on 2012-02-20 at 4c75ba9)
162
+ + Add a performance test for git-grep
163
+ + Introduce a performance testing framework
164
+ + Move the user-facing test library to test-lib-functions.sh
165
62
-"gitweb" compared non-existent value of HEAD with the names of commit
63
-objects at tips of branches, triggering runtime warnings.
166
+The beginning of a new performance benchmark framework.
167
168
--------------------------------------------------
169
[Stalled]
170
171
+* jc/diff-ignore-case (2012-02-19) 6 commits
172
+ - diff -i
173
+ - diff: --ignore-case
174
+ - xdiff: introduce XDF_IGNORE_CASE
175
+ - xdiff: introduce XDF_INEXACT_MATCH
176
+ - xdiff: PATIENCE/HISTOGRAM are not independent option bits
177
+ - xdiff: remove XDL_PATCH_* macros
178
+
179
+"git diff" learns "--ignore-case" option.
180
+
181
+Commits near the tip need to be better titled.
182
+
183
+* jc/pickaxe-ignore-case (2012-02-21) 1 commit
184
+ - pickaxe: allow -i to search in patch case-insensitively
185
+
186
+The original "-S" pickaxe probably needs to be taught about the option.
187
+
188
* jl/maint-submodule-relative (2012-02-09) 2 commits
189
- submodules: always use a relative path from gitdir to work tree
190
- submodules: always use a relative path to gitdir
@@ -78,17 +198,6 @@ The second one looked iffy.
198
199
The bottom one was not clearly explained and needs a reroll.
200
81
-* zj/diff-stat-dyncol (2012-02-15) 6 commits
82
- . diff --stat: use less columns for change counts
83
- - (squash to the previous -- replace the last line of the log with the following)
84
- - diff --stat: use the full terminal width
85
- - (squash to the previous -- replace the log message with this)
86
- - diff --stat: tests for long filenames and big change counts
87
- - Merge branches zj/decimal-width and zj/term-columns
88
-
89
-I am beginning to think that the last one should wait until the dust from
90
-the earlier part settles.
91
-
201
* jc/advise-push-default (2011-12-18) 1 commit
202
- push: hint to use push.default=upstream when appropriate
203
@@ -105,7 +214,8 @@ The bottom one has been replaced with a rewrite based on comments from
214
Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
215
give precedence to tty over SSH_ASKPASS when terminal is available.
216
108
-* jc/split-blob (2012-01-24) 6 commits
217
+* jc/split-blob (2012-02-23) 7 commits
218
+ - fixup?
219
- chunked-object: streaming checkout
220
- chunked-object: fallback checkout codepaths
221
- bulk-checkin: support chunked-object encoding
@@ -133,121 +243,72 @@ the "bup" fanboys, to come up with a better logic, thinking that giving
243
people an easy target to shoot for, they may be encouraged to help
244
out. The plan is not working :-(.
245
136
-* nd/columns (2012-02-08) 15 commits
137
- . column: Fix some compiler and sparse warnings
138
- . column: add a corner-case test to t3200
139
- . columns: minimum coding style fixes
140
- . tag: add --column
141
- . column: support piping stdout to external git-column process
142
- . status: add --column
143
- . branch: add --column
144
- . help: reuse print_columns() for help -a
145
- . column: add column.ui for default column output settings
146
- . column: support columns with different widths
147
- . column: add columnar layout
148
- . Stop starting pager recursively
149
- . Add git-column and column mode parsing
150
- . column: add API to print items in columns
151
- . Save terminal width before setting up pager
152
-
153
-Expecting a reroll on top of zj/term-columns topic.
154
-
246
--------------------------------------------------
247
[Cooking]
248
158
-* fc/push-prune (2012-02-22) 4 commits
159
- - push: add '--prune' option
160
- - remote: refactor code into alloc_delete_ref()
161
- - remote: reorganize check_pattern_match()
162
- - remote: use a local variable in match_push_refs()
249
+* zj/diff-stat-dyncol (2012-02-24) 10 commits
250
+ - diff --stat: add config option to limit graph width
251
+ - diff --stat: enable limiting of the graph part
252
+ - diff --stat: add a test for output with COLUMNS=40
253
+ - diff --stat: use a maximum of 5/8 for the filename part
254
+ - merge --stat: use the full terminal width
255
+ - log --stat: use the full terminal width
256
+ - show --stat: use the full terminal width
257
+ - diff --stat: use the full terminal width
258
+ - diff --stat: tests for long filenames and big change counts
259
+ - Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler
260
164
-Rerolled and looked sane.
165
-Will merge to "next".
261
+Rerolled.
262
167
-* jc/add-refresh-unmerged (2012-02-17) 1 commit
168
- (merged to 'next' on 2012-02-21 at 09f8721)
169
- + refresh_index: do not show unmerged path that is outside pathspec
263
+* nd/columns (2012-02-26) 11 commits
264
+ - tag: add --column
265
+ - column: support piping stdout to external git-column process
266
+ - status: add --column
267
+ - branch: add --column
268
+ - help: reuse print_columns() for help -a
269
+ - column: add column.ui for default column output settings
270
+ - column: support columns with different widths
271
+ - column: add columnar layout
272
+ - Stop starting pager recursively
273
+ - Add git-column and column mode parsing
274
+ - column: add API to print items in columns
275
171
-"git add --refresh <pathspec>" warned about unmerged paths outside the
172
-given pathspec.
276
+Rerolled.
277
174
-* jc/diff-ignore-case (2012-02-19) 6 commits
175
- - diff -i
176
- - diff: --ignore-case
177
- - xdiff: introduce XDF_IGNORE_CASE
178
- - xdiff: introduce XDF_INEXACT_MATCH
179
- - xdiff: PATIENCE/HISTOGRAM are not independent option bits
180
- - xdiff: remove XDL_PATCH_* macros
181
-
182
-"git diff" learns "--ignore-case" option.
183
-
184
-* jn/gitweb-hilite-regions (2012-02-19) 5 commits
185
- - gitweb: Use esc_html_match_hl() in 'grep' search
186
- - gitweb: Highlight matched part of shortened project description
187
- - gitweb: Highlight matched part of project description when searching projects
188
- - gitweb: Highlight matched part of project name when searching projects
189
- - gitweb: Introduce esc_html_hl_regions
190
- (this branch uses jn/gitweb-search-optim.)
278
+* ph/cherry-pick-advice-refinement (2012-02-22) 1 commit
279
+ (merged to 'next' on 2012-02-26 at 1c930c3)
280
+ + cherry-pick: No advice to commit if --no-commit
281
192
-Not reviewed and do not know what this is about yet ;-).
282
+The advice given by a conflicted "cherry-pick --no-commit" told the user
283
+to make a commit after resolving conflicts.
284
194
-* jn/gitweb-search-optim (2012-02-19) 3 commits
195
- - gitweb: Faster project search
196
- - gitweb: Option for filling only specified info in fill_project_list_info
197
- - gitweb: Refactor checking if part of project info need filling
198
- (this branch is used by jn/gitweb-hilite-regions.)
285
+Will merge to "master".
286
200
-The API introduced in the second step still has yucky design, but at least
201
-it is more clear than the previous rounds what this is trying to do.
287
+* pj/completion-remote-set-url-branches (2012-02-22) 2 commits
288
+ (merged to 'next' on 2012-02-26 at 0062008)
289
+ + completion: normalize increment/decrement style
290
+ + completion: remote set-* <name> and <branch>
291
203
-* js/configure-libintl (2012-02-20) 1 commit
204
- (merged to 'next' on 2012-02-21 at 79d7ccc)
205
- + configure: don't use -lintl when there is no gettext support
292
+Will merge to "master".
293
207
-Build fix for autoconf, meant for 'maint' track.
294
+* th/git-diffall (2012-02-24) 1 commit
295
+ - contrib: added git-diffall
296
209
-* pj/remote-set-branches-usage-fix (2012-02-19) 1 commit
210
- (merged to 'next' on 2012-02-21 at cb71d0e)
211
- + remote: fix set-branches usage and documentation
297
+* jn/gitweb-hilite-regions (2012-02-26) 4 commits
298
+ - gitweb: Highlight matched part of shortened project description
299
+ - gitweb: Highlight matched part of project description when searching projects
300
+ - gitweb: Highlight matched part of project name when searching projects
301
+ - gitweb: Introduce esc_html_match_hl and esc_html_hl_regions
302
213
-Documentation fix.
214
-
215
-* tr/perftest (2012-02-17) 3 commits
216
- (merged to 'next' on 2012-02-20 at 4c75ba9)
217
- + Add a performance test for git-grep
218
- + Introduce a performance testing framework
219
- + Move the user-facing test library to test-lib-functions.sh
303
+Project search in "gitweb" shows the substring that matched in the project
304
+name and description highlighted. The highlighting logic is meant to be
305
+reused later for other kinds of searches e.g. grep and commit log search.
306
307
* jb/required-filter (2012-02-17) 1 commit
222
- - Add a setting to require a filter to be successful
308
+ (merged to 'next' on 2012-02-26 at e9ba88a)
309
+ + Add a setting to require a filter to be successful
310
311
A content filter used to be a way to make the recorded contents "more
312
useful", but this defines a way to optionally mark a filter "required".
226
-Will merge to "next" after waiting for a few more days for comments.
227
-
228
-* jk/config-include (2012-02-17) 10 commits
229
- (merged to 'next' on 2012-02-20 at 7b150b7)
230
- + config: add include directive
231
- + config: eliminate config_exclusive_filename
232
- + config: stop using config_exclusive_filename
233
- + config: provide a version of git_config with more options
234
- + config: teach git_config_rename_section a file argument
235
- + config: teach git_config_set_multivar_in_file a default path
236
- + config: copy the return value of prefix_filename
237
- + t1300: add missing &&-chaining
238
- + docs/api-config: minor clarifications
239
- + docs: add a basic description of the config API
240
-
241
-An assignment to the include.path pseudo-variable causes the named file
242
-to be included in-place when Git looks up configuration variables.
243
-
244
-Reverted the earlier round from 'next' and then fixed up further.
245
-
246
-* ld/git-p4-expanded-keywords (2012-02-14) 1 commit
247
- (merged to 'next' on 2012-02-16 at a9004c5)
248
- + git-p4: add initial support for RCS keywords
249
-
250
-Teach git-p4 to unexpand $RCS$-like keywords that are embedded in
251
-tracked contents in order to reduce unnecessary merge conflicts.
313
253
-Waiting for follow-up fix-up patches.
314
+Will merge to "master".