What's cooking (2012/02 #04)
Junio C Hamano committed
Feb 10, 2012 at 15:15 UTC
35f3770e49f42d4ee0cc07e35bc589c1fc480b63
1 file changed
+139
-232
whats-cooking.txt
+139
-232
@@ -1,184 +1,75 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2012, #03; Thu, 9)
3
-X-master-at: 12766861cdf10fbbfda1023fd65aaf864eb8136a
4
-X-next-at: 35cc89d1e2c66d6b01c986f1d2eb3248ee5667f1
2
+Subject: What's cooking in git.git (Feb 2012, #04; Fri, 10)
3
+X-master-at: b6b3b6a01f357922ccd14f2615accc9bd39fc194
4
+X-next-at: b41c6bb8e2f080306ede9023919c9e703e625c79
5
6
-What's cooking in git.git (Feb 2012, #03; Thu, 9)
6
+What's cooking in git.git (Feb 2012, #04; Fri, 10)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-Compared to the recent activity level on discussions of new features on
13
-the list, some people may be wondering if the rate of advancement of the
14
-'master' and 'next' branches is getting throttled.
15
-
16
-That is because it is.
17
-
18
-Now the obviously good bits that have been cooking during the feature
19
-freeze are pushed out to 'master', I'd want to make sure we can have a
20
-timely release of v1.7.9.1 so that people can start benefiting from the
21
-features and fixes introduced in v1.7.9 more smoothly and sooner, and that
22
-is where my focus lies at this moment. I've been picking up new topics and
23
-adding them to 'pu' only "as time and attention permit" basis, and this
24
-mode of operation probably will continue throughout the second week of the
25
-post v1.7.9 cycle (cf. http://tinyurl.com/gitcal).
12
+This round mosty consists of topics to fix new features introduced in
13
+1.7.9, in preparation for 1.7.9.1 maintenance release. There are a few
14
+more of them to come.
15
16
You can find the changes described here in the integration branches of the
17
repositories listed at
18
19
http://git-blame.blogspot.com/p/git-public-repositories.html
20
32
---------------------------------------------------
33
-[Graduated to "master"]
34
-
35
-* bl/gitweb-project-filter (2012-02-01) 8 commits
36
- (merged to 'next' on 2012-02-01 at 2c96ce7)
37
- + gitweb: Make project search respect project_filter
38
- + gitweb: improve usability of projects search form
39
- + gitweb: place links to parent directories in page header
40
- + gitweb: show active project_filter in project_list page header
41
- + gitweb: limit links to alternate forms of project_list to active project_filter
42
- + gitweb: add project_filter to limit project list to a subdirectory
43
- + gitweb: prepare git_get_projects_list for use outside 'forks'.
44
- + gitweb: move hard coded .git suffix out of git_get_projects_list
45
-
46
-"gitweb" allows intermediate entries in the directory hierarchy that leads
47
-to a projects to be clicked, which in turn shows the list of projects
48
-inside that directory.
49
-
50
-* jc/maint-request-pull-for-tag (2012-01-31) 1 commit
51
- (merged to 'next' on 2012-02-01 at 7649f18)
52
- + request-pull: explicitly ask tags/$name to be pulled
53
-
54
-When asking for a tag to be pulled, "request-pull" shows the name of the
55
-tag prefixed with "tags/"
56
-
57
-* jn/svn-fe (2012-02-02) 47 commits
58
- (merged to 'next' on 2012-02-05 at e9d3917)
59
- + vcs-svn: suppress a -Wtype-limits warning
60
- + vcs-svn: allow import of > 4GiB files
61
- + vcs-svn: rename check_overflow arguments for clarity
62
- (merged to 'next' on 2012-02-01 at 9288c95)
63
- + vcs-svn/svndiff.c: squelch false "unused" warning from gcc
64
- + Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
65
- + vcs-svn: reset first_commit_done in fast_export_init
66
- + Merge branch 'db/text-delta' into svn-fe
67
- + vcs-svn: do not initialize report_buffer twice
68
- + Merge branch 'db/text-delta' into svn-fe
69
- + vcs-svn: avoid hangs from corrupt deltas
70
- + vcs-svn: guard against overflow when computing preimage length
71
- + Merge branch 'db/delta-applier' into db/text-delta
72
- + vcs-svn: implement text-delta handling
73
- + Merge branch 'db/delta-applier' into db/text-delta
74
- + Merge branch 'db/delta-applier' into svn-fe
75
- + vcs-svn: cap number of bytes read from sliding view
76
- + test-svn-fe: split off "test-svn-fe -d" into a separate function
77
- + vcs-svn: let deltas use data from preimage
78
- + vcs-svn: let deltas use data from postimage
79
- + vcs-svn: verify that deltas consume all inline data
80
- + vcs-svn: implement copyfrom_data delta instruction
81
- + vcs-svn: read instructions from deltas
82
- + vcs-svn: read inline data from deltas
83
- + vcs-svn: read the preimage when applying deltas
84
- + vcs-svn: parse svndiff0 window header
85
- + vcs-svn: skeleton of an svn delta parser
86
- + vcs-svn: make buffer_read_binary API more convenient
87
- + vcs-svn: learn to maintain a sliding view of a file
88
- + Makefile: list one vcs-svn/xdiff object or header per line
89
- + Merge branch 'db/svn-fe-code-purge' into svn-fe
90
- + vcs-svn: drop obj_pool
91
- + vcs-svn: drop treap
92
- + vcs-svn: drop string_pool
93
- + vcs-svn: pass paths through to fast-import
94
- + Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
95
- + Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge
96
- + Merge branch 'db/vcs-svn-incremental' into svn-fe
97
- + vcs-svn: avoid using ls command twice
98
- + vcs-svn: use mark from previous import for parent commit
99
- + vcs-svn: handle filenames with dq correctly
100
- + vcs-svn: quote paths correctly for ls command
101
- + vcs-svn: eliminate repo_tree structure
102
- + vcs-svn: add a comment before each commit
103
- + vcs-svn: save marks for imported commits
104
- + vcs-svn: use higher mark numbers for blobs
105
- + vcs-svn: set up channel to read fast-import cat-blob response
106
- + Merge commit 'v1.7.5' into svn-fe
107
-
108
-Originally merged to 'next' on 2012-01-29.
109
-
110
-"vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support
111
-incremental imports.
112
-
113
-* jx/i18n-more-marking (2012-02-01) 2 commits
114
- (merged to 'next' on 2012-02-05 at 44e8cf6)
115
- + i18n: format_tracking_info "Your branch is behind" message
116
- + i18n: git-commit whence_s "merge/cherry-pick" message
117
-
118
-Marks a few more messages we forgot to mark for i18n.
119
-
120
-* rt/completion-branch-edit-desc (2012-01-29) 1 commit
121
- (merged to 'next' on 2012-02-01 at 0627ebf)
122
- + completion: --edit-description option for git-branch
123
-
124
-Originally merged to 'next' on 2012-01-31.
125
-
21
--------------------------------------------------
22
[New Topics]
23
129
-* jk/config-include (2012-02-06) 2 commits
130
- - config: add include directive
131
- - docs: add a basic description of the config API
132
-
133
-An assignment to the include.path pseudo-variable causes the named file
134
-to be included in-place when Git looks up configuration variables.
24
+* nk/ctype-for-perf (2012-02-10) 2 commits
25
+ (merged to 'next' on 2012-02-10 at b41c6bb)
26
+ + ctype: implement islower/isupper macro
27
+ + ctype.c only wants git-compat-util.h
28
136
-* jk/maint-tag-show-fixes (2012-02-08) 3 commits
137
- (merged to 'next' on 2012-02-08 at 18459c4)
138
- + tag: do not show non-tag contents with "-n"
139
- + tag: die when listing missing or corrupt objects
140
- + tag: fix output of "tag -n" when errors occur
29
+* jn/ancient-meld-support (2012-02-10) 1 commit
30
+ - mergetools/meld: Use --help output to detect --output support
31
142
-Bugfixes to "git tag -n" that lacked much error checking.
32
+--------------------------------------------------
33
+[Graduated to "master"]
34
144
-* mm/empty-loose-error-message (2012-02-06) 1 commit
145
- (merged to 'next' on 2012-02-07 at f119cac)
146
- + fsck: give accurate error message on empty loose object files
35
+* jc/branch-desc-typoavoidance (2012-02-05) 2 commits
36
+ (merged to 'next' on 2012-02-06 at 9fb0568)
37
+ + branch --edit-description: protect against mistyped branch name
38
+ + tests: add write_script helper function
39
+ (this branch is tangled with jk/tests-write-script.)
40
148
-Updates the error message emitted when we see an empty loose object.
41
+Typo in "git branch --edit-description my-tpoic" was not diagnosed.
42
150
-* nd/columns (2012-02-08) 15 commits
151
- - column: Fix some compiler and sparse warnings
152
- - column: add a corner-case test to t3200
153
- - columns: minimum coding style fixes
154
- - tag: add --column
155
- - column: support piping stdout to external git-column process
156
- - status: add --column
157
- - branch: add --column
158
- - help: reuse print_columns() for help -a
159
- - column: add column.ui for default column output settings
160
- - column: support columns with different widths
161
- - column: add columnar layout
162
- - Stop starting pager recursively
163
- - Add git-column and column mode parsing
164
- - column: add API to print items in columns
165
- - Save terminal width before setting up pager
43
+* jc/merge-ff-only-stronger-than-signed-merge (2012-02-05) 1 commit
44
+ (merged to 'next' on 2012-02-06 at 0fabf12)
45
+ + merge: do not create a signed tag merge under --ff-only option
46
+ (this branch is used by jn/merge-no-edit-fix.)
47
167
-The "show list of ..." mode of a handful of commands learn to produce
168
-column-oriented output.
48
+"git merge --ff-only $tag" failed because it cannot record the required
49
+mergetag without creating a merge, but this is so common operation for
50
+branch that is used _only_ to follow the upstream, so it is allowed to
51
+fast-forward without recording the mergetag.
52
170
-Expecting a reroll.
53
+* jc/parse-date-raw (2012-02-03) 2 commits
54
+ (merged to 'next' on 2012-02-07 at 486ae6e)
55
+ + parse_date(): '@' prefix forces git-timestamp
56
+ + parse_date(): allow ancient git-timestamp
57
172
-* jc/maint-commit-ignore-i-t-a (2012-02-07) 1 commit
173
- - commit: ignore intent-to-add entries instead of refusing
58
+"rebase" and "commit --amend" failed to work on commits with ancient
59
+timestamps near year 1970.
60
175
-Replaces the nd/commit-ignore-i-t-a series that was made unnecessary
176
-complicated by bad suggestions I made earlier.
61
+* jk/tests-write-script (2012-02-03) 2 commits
62
+ (merged to 'next' on 2012-02-05 at 4264ffa)
63
+ + t0300: use write_script helper
64
+ + tests: add write_script helper function
65
+ (this branch is tangled with jc/branch-desc-typoavoidance.)
66
178
-* jk/userdiff-config-simplify (2012-02-07) 1 commit
179
- - drop odd return value semantics from userdiff_config
67
+* jn/rpm-spec (2012-02-03) 1 commit
68
+ (merged to 'next' on 2012-02-05 at dba940b)
69
+ + git.spec: Workaround localized messages not put in any RPM
70
181
-Code cleanup.
71
+Fix breakage in v1.7.9 Makefile; rpmbuild notices an unpackaged but
72
+installed *.mo file and fails.
73
74
* js/add-e-submodule-fix (2012-02-07) 1 commit
75
(merged to 'next' on 2012-02-08 at c8e2d28)
@@ -188,33 +79,6 @@ Code cleanup.
79
that only has uncommitted local changes in the patch prepared by for the
80
user to edit.
81
191
-* nd/cache-tree-api-refactor (2012-02-07) 1 commit
192
- (merged to 'next' on 2012-02-08 at a9abbca)
193
- + cache-tree: update API to take abitrary flags
194
-
195
-Code cleanup.
196
-
197
-* tg/tag-points-at (2012-02-08) 1 commit
198
- - tag: add --points-at list option
199
-
200
-Will merge to 'next'.
201
-
202
-* jl/maint-submodule-relative (2012-02-09) 2 commits
203
- - submodules: always use a relative path from gitdir to work tree
204
- - submodules: always use a relative path to gitdir
205
-
206
-* jn/merge-no-edit-fix (2012-02-09) 1 commit
207
- - merge: do not launch an editor on "--no-edit $tag"
208
- (this branch uses jc/merge-ff-only-stronger-than-signed-merge.)
209
-
210
-* ld/git-p4-expanded-keywords (2012-02-09) 2 commits
211
- - git-p4: initial demonstration of possible RCS keyword fixup
212
- - git-p4: add test case for RCS keywords
213
-
214
-* mp/make-cleanse-x-for-exe (2012-02-09) 1 commit
215
- (merged to 'next' on 2012-02-09 at 35cc89d)
216
- + Explicitly set X to avoid potential build breakage
217
-
82
--------------------------------------------------
83
[Stalled]
84
@@ -262,22 +126,108 @@ the "bup" fanboys, to come up with a better logic, thinking that giving
126
people an easy target to shoot for, they may be encouraged to help
127
out. The plan is not working :-(.
128
129
+* nd/columns (2012-02-08) 15 commits
130
+ - column: Fix some compiler and sparse warnings
131
+ - column: add a corner-case test to t3200
132
+ - columns: minimum coding style fixes
133
+ - tag: add --column
134
+ - column: support piping stdout to external git-column process
135
+ - status: add --column
136
+ - branch: add --column
137
+ - help: reuse print_columns() for help -a
138
+ - column: add column.ui for default column output settings
139
+ - column: support columns with different widths
140
+ - column: add columnar layout
141
+ - Stop starting pager recursively
142
+ - Add git-column and column mode parsing
143
+ - column: add API to print items in columns
144
+ - Save terminal width before setting up pager
145
+
146
+The "show list of ..." mode of a handful of commands learn to produce
147
+column-oriented output.
148
+
149
+Expecting a reroll.
150
+
151
--------------------------------------------------
152
[Cooking]
153
154
+* jk/config-include (2012-02-06) 2 commits
155
+ - config: add include directive
156
+ - docs: add a basic description of the config API
157
+
158
+An assignment to the include.path pseudo-variable causes the named file
159
+to be included in-place when Git looks up configuration variables.
160
+
161
+* jk/maint-tag-show-fixes (2012-02-08) 3 commits
162
+ (merged to 'next' on 2012-02-08 at 18459c4)
163
+ + tag: do not show non-tag contents with "-n"
164
+ + tag: die when listing missing or corrupt objects
165
+ + tag: fix output of "tag -n" when errors occur
166
+
167
+Bugfixes to "git tag -n" that lacked much error checking.
168
+Will merge to 'masster'.
169
+
170
+* mm/empty-loose-error-message (2012-02-06) 1 commit
171
+ (merged to 'next' on 2012-02-07 at f119cac)
172
+ + fsck: give accurate error message on empty loose object files
173
+
174
+Updates the error message emitted when we see an empty loose object.
175
+Will merge to 'masster'.
176
+
177
+* jc/maint-commit-ignore-i-t-a (2012-02-07) 1 commit
178
+ (merged to 'next' on 2012-02-10 at e0040cf)
179
+ + commit: ignore intent-to-add entries instead of refusing
180
+
181
+Replaces the nd/commit-ignore-i-t-a series that was made unnecessary
182
+complicated by bad suggestions I made earlier.
183
+Will merge to 'masster'.
184
+
185
+* jk/userdiff-config-simplify (2012-02-07) 1 commit
186
+ (merged to 'next' on 2012-02-10 at e9854c1)
187
+ + drop odd return value semantics from userdiff_config
188
+
189
+Code cleanup.
190
+
191
+* nd/cache-tree-api-refactor (2012-02-07) 1 commit
192
+ (merged to 'next' on 2012-02-08 at a9abbca)
193
+ + cache-tree: update API to take abitrary flags
194
+
195
+Code cleanup.
196
+
197
+* tg/tag-points-at (2012-02-08) 1 commit
198
+ (merged to 'next' on 2012-02-10 at 4bff88f)
199
+ + tag: add --points-at list option
200
+
201
+* jl/maint-submodule-relative (2012-02-09) 2 commits
202
+ - submodules: always use a relative path from gitdir to work tree
203
+ - submodules: always use a relative path to gitdir
204
+
205
+The second one looked iffy.
206
+
207
+* jn/merge-no-edit-fix (2012-02-09) 1 commit
208
+ (merged to 'next' on 2012-02-10 at 014eec9)
209
+ + merge: do not launch an editor on "--no-edit $tag"
210
+
211
+In 1.7.9, "merge --no-edit $tag" incorrectly ignored --no-edit.
212
+
213
+* ld/git-p4-expanded-keywords (2012-02-09) 2 commits
214
+ - git-p4: initial demonstration of possible RCS keyword fixup
215
+ - git-p4: add test case for RCS keywords
216
+
217
+Waiting for reviews and user reports.
218
+
219
+* mp/make-cleanse-x-for-exe (2012-02-09) 1 commit
220
+ (merged to 'next' on 2012-02-09 at 35cc89d)
221
+ + Explicitly set X to avoid potential build breakage
222
+
223
+Will merge to 'master'.
224
+
225
* bw/inet-pton-ntop-compat (2012-02-05) 1 commit
226
(merged to 'next' on 2012-02-06 at 61303e6)
227
+ Drop system includes from inet_pton/inet_ntop compatibility wrappers
228
229
The inclusion order of header files bites Solaris again and this fixes it.
273
-
274
-* jc/branch-desc-typoavoidance (2012-02-05) 2 commits
275
- (merged to 'next' on 2012-02-06 at 9fb0568)
276
- + branch --edit-description: protect against mistyped branch name
277
- + tests: add write_script helper function
278
- (this branch is tangled with jk/tests-write-script.)
279
-
280
-Typo in "git branch --edit-description my-tpoic" was not diagnosed.
230
+Will merge to 'master'.
231
232
* jc/checkout-out-of-unborn (2012-02-06) 1 commit
233
(merged to 'next' on 2012-02-07 at 60eb328)
@@ -295,16 +245,6 @@ map_user() was not rewriting its output correctly, which resulted in the
245
user visible symptom that "git blame -e" sometimes showed excess '>' at
246
the end of email addresses.
247
298
-* jc/merge-ff-only-stronger-than-signed-merge (2012-02-05) 1 commit
299
- (merged to 'next' on 2012-02-06 at 0fabf12)
300
- + merge: do not create a signed tag merge under --ff-only option
301
- (this branch is used by jn/merge-no-edit-fix.)
302
-
303
-"git merge --ff-only $tag" failed because it cannot record the required
304
-mergetag without creating a merge, but this is so common operation for
305
-branch that is used _only_ to follow the upstream, so it is allowed to
306
-fast-forward without recording the mergetag.
307
-
248
* tt/profile-build-fix (2012-02-09) 2 commits
249
(merged to 'next' on 2012-02-09 at 1c183af)
250
+ Makefile: fix syntax for older make
@@ -337,14 +277,6 @@ path may look like text but it is not, which "git diff" can do using the
277
attributes system. Now "git grep" honors the same "binary" (or "-diff")
278
attribute.
279
340
-* jc/parse-date-raw (2012-02-03) 2 commits
341
- (merged to 'next' on 2012-02-07 at 486ae6e)
342
- + parse_date(): '@' prefix forces git-timestamp
343
- + parse_date(): allow ancient git-timestamp
344
-
345
-"rebase" and "commit --amend" failed to work on commits with ancient
346
-timestamps near year 1970.
347
-
280
* jk/git-dir-lookup (2012-02-02) 1 commit
281
(merged to 'next' on 2012-02-05 at 1856d74)
282
+ standardize and improve lookup rules for external local repos
@@ -361,25 +293,12 @@ The code to ask for password did not fall back to the terminal input when
293
GIT_ASKPASS is set but does not work (e.g. lack of X with GUI askpass
294
helper).
295
364
-* jk/tests-write-script (2012-02-03) 2 commits
365
- (merged to 'next' on 2012-02-05 at 4264ffa)
366
- + t0300: use write_script helper
367
- + tests: add write_script helper function
368
- (this branch is tangled with jc/branch-desc-typoavoidance.)
369
-
296
* jn/gitweb-search-utf-8 (2012-02-03) 1 commit
297
(merged to 'next' on 2012-02-05 at 055e446)
298
+ gitweb: Allow UTF-8 encoded CGI query parameters and path_info
299
300
Search box in "gitweb" did not accept non-ASCII characters correctly.
301
376
-* jn/rpm-spec (2012-02-03) 1 commit
377
- (merged to 'next' on 2012-02-05 at dba940b)
378
- + git.spec: Workaround localized messages not put in any RPM
379
-
380
-Fix breakage in v1.7.9 Makefile; rpmbuild notices an unpackaged but
381
-installed *.mo file and fails.
382
-
302
* fc/zsh-completion (2012-02-06) 3 commits
303
(merged to 'next' on 2012-02-06 at c94dd12)
304
+ completion: simplify __gitcomp and __gitcomp_nl implementations
@@ -401,15 +320,3 @@ Fix git subcommand completion for zsh (in contrib/completion).
320
321
"pack-objects" learned use parse-options, losing custom command line
322
parsing code.
404
-
405
---------------------------------------------------
406
-[Discarded]
407
-
408
-* nd/commit-ignore-i-t-a (2012-02-06) 4 commits
409
- . commit: remove commit.ignoreIntentToAdd, assume it's always true
410
- . commit: turn commit.ignoreIntentToAdd to true by default
411
- . commit: introduce a config key to allow as-is commit with i-t-a entries
412
- . cache-tree: update API to take abitrary flags
413
-
414
-Instead of using configuration to selectively delay bugfixes like this
415
-series does, let's sell it as a pure bugfix.