What's cooking (2012/02 #02)
Junio C Hamano committed
Feb 5, 2012 at 18:41 UTC
96fe5e7ce78c925b14343638cb43ac24065b1cd2
1 file changed
+154
-117
whats-cooking.txt
+154
-117
@@ -1,15 +1,30 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2012, #01; Fri, 3)
2
+Subject: What's cooking in git.git (Feb 2012, #02; Sun, 5)
3
X-master-at: f3fb07509c2e0b21b12a598fcd0a19a92fc38a9d
4
-X-next-at: e26aed0c97a6c884b5f569830384355d6afb16f1
4
+X-next-at: 055e4466df114c65a2c210423938673373746f3e
5
6
-What's cooking in git.git (Feb 2012, #01; Fri, 3)
6
+What's cooking in git.git (Feb 2012, #02; Sun, 5)
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
11
'next'.
12
13
+Compared to the recent activity level on discussions of new features on
14
+the list, some people may be wondering if the rate of advancement of the
15
+'master' and 'next' branches is getting throttled.
16
+
17
+That is because it is.
18
+
19
+Now the obviously good bits that have been cooking during the feature
20
+freeze are pushed out to 'master', I'd want to make sure we can have a
21
+timely release of v1.7.9.1 so that people can start benefiting from the
22
+features and fixes introduced in v1.7.9 more smoothly and sooner, and that
23
+is where my focus lies at this moment. I've been picking up new topics and
24
+adding them to 'pu' only "as time and attention permit" basis, and this
25
+mode of operation probably will continue throughout the second week of the
26
+post v1.7.9 cycle (cf. http://tinyurl.com/gitcal).
27
+
28
Here are the repositories that have my integration branches:
29
30
With maint, master, next, pu, todo:
@@ -38,40 +53,136 @@ The preformatted documentation in HTML and man format are found in:
53
--------------------------------------------------
54
[New Topics]
55
56
+* bw/inet-pton-ntop-compat (2012-02-05) 1 commit
57
+ - Drop system includes from inet_pton/inet_ntop compatibility wrappers
58
+
59
+The inclusion order of header files bites Solaris again and this fixes it.
60
+
61
+Will merge to 'next'.
62
+
63
+* jc/branch-desc-typoavoidance (2012-02-05) 2 commits
64
+ - branch --edit-description: protect against mistyped branch name
65
+ + tests: add write_script helper function
66
+ (this branch is tangled with jk/tests-write-script.)
67
+
68
+Typo in "git branch --edit-description my-tpoic" was not diagnosed.
69
+
70
+Will merge to 'next'.
71
+
72
+* jc/checkout-out-of-unborn (2012-02-05) 1 commit
73
+ - git checkout -b: allow switching out of an unborn branch
74
+
75
+I am fairly negative on this one, as I think it is just shifting the
76
+problem around.
77
+
78
+* jc/maint-mailmap-output (2012-02-05) 1 commit
79
+ - mailmap: do not leave '>' in the output when answering "we did something"
80
+
81
+map_user() was not rewriting its output correctly, which resulted in the
82
+user visible symptom that "git blame -e" sometimes showed excess '>' at
83
+the end of email addresses.
84
+
85
+* jc/merge-ff-only-stronger-than-signed-merge (2012-02-05) 1 commit
86
+ - merge: do not create a signed tag merge under --ff-only option
87
+
88
+"git merge --ff-only $tag" failed because it cannot record the required
89
+mergetag without creating a merge, but this is so common operation for
90
+branch that is used _only_ to follow the upstream, so it is allowed to
91
+fast-forward without recording the mergetag.
92
+
93
+* tt/profile-build-fix (2012-02-05) 1 commit
94
+ - Fix build problems related to profile-directed optimization
95
+
96
+--------------------------------------------------
97
+[Stalled]
98
+
99
+* jc/advise-push-default (2011-12-18) 1 commit
100
+ - push: hint to use push.default=upstream when appropriate
101
+
102
+Peff had a good suggestion outlining an updated code structure so that
103
+somebody new can try to dip his or her toes in the development. Any
104
+takers?
105
+
106
+* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
107
+ - fixup! 15eaaf4
108
+ - git-svn, perl/Git.pm: extend Git::prompt helper for querying users
109
+ - perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
110
+
111
+The bottom one has been replaced with a rewrite based on comments from
112
+Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
113
+give precedence to tty over SSH_ASKPASS when terminal is available.
114
+
115
+* nd/commit-ignore-i-t-a (2012-01-16) 2 commits
116
+ - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees
117
+ - cache-tree: update API to take abitrary flags
118
+
119
+May want to consider this as fixing an earlier UI mistake, and not as a
120
+feature that devides the userbase.
121
+
122
+* jc/split-blob (2012-01-24) 6 commits
123
+ - chunked-object: streaming checkout
124
+ - chunked-object: fallback checkout codepaths
125
+ - bulk-checkin: support chunked-object encoding
126
+ - bulk-checkin: allow the same data to be multiply hashed
127
+ - new representation types in the packstream
128
+ - varint-in-pack: refactor varint encoding/decoding
129
+
130
+Not ready.
131
+
132
+I finished the streaming checkout codepath, but as explained in 127b177
133
+(bulk-checkin: support chunked-object encoding, 2011-11-30), these are
134
+still early steps of a long and painful journey. At least pack-objects and
135
+fsck need to learn the new encoding for the series to be usable locally,
136
+and then index-pack/unpack-objects needs to learn it to be used remotely.
137
+
138
+Given that I heard a lot of noise that people want large files, and that I
139
+was asked by somebody at GitTogether'11 privately for an advice on how to
140
+pay developers (not me) to help adding necessary support, I am somewhat
141
+dissapointed that the original patch series that was sent almost two
142
+months ago still remains here without much comments and updates from the
143
+developer community. I even made the interface to the logic that decides
144
+where to split chunks easily replaceable, and I deliberately made the
145
+logic in the original patch extremely stupid to entice others, especially
146
+the "bup" fanboys, to come up with a better logic, thinking that giving
147
+people an easy target to shoot for, they may be encouraged to help
148
+out. The plan is not working :-(.
149
+
150
+--------------------------------------------------
151
+[Cooking]
152
+
153
* nd/diffstat-gramnum (2012-02-03) 1 commit
42
- - Use correct grammar in diffstat summary line
154
+ (merged to 'next' on 2012-02-05 at 7335ecc)
155
+ + Use correct grammar in diffstat summary line
156
157
The commands in the "git diff" family and "git apply --stat" that count
158
the number of files changed and the number of lines inserted/deleted have
159
been updated to match the output from "diffstat". This also opens the
160
door to i18n this line.
161
49
-Will merge to 'next'.
50
-
162
* jx/i18n-more-marking (2012-02-01) 2 commits
52
- - i18n: format_tracking_info "Your branch is behind" message
53
- - i18n: git-commit whence_s "merge/cherry-pick" message
163
+ (merged to 'next' on 2012-02-05 at 44e8cf6)
164
+ + i18n: format_tracking_info "Your branch is behind" message
165
+ + i18n: git-commit whence_s "merge/cherry-pick" message
166
55
-Will merge to 'next'.
167
+Marks a few more messages we forgot to mark for i18n.
168
169
* jk/grep-binary-attribute (2012-02-02) 9 commits
58
- - grep: pre-load userdiff drivers when threaded
59
- - grep: load file data after checking binary-ness
60
- - grep: respect diff attributes for binary-ness
61
- - grep: cache userdiff_driver in grep_source
62
- - grep: drop grep_buffer's "name" parameter
63
- - convert git-grep to use grep_source interface
64
- - grep: refactor the concept of "grep source" into an object
65
- - grep: move sha1-reading mutex into low-level code
66
- - grep: make locking flag global
170
+ (merged to 'next' on 2012-02-05 at 9dffa7e)
171
+ + grep: pre-load userdiff drivers when threaded
172
+ + grep: load file data after checking binary-ness
173
+ + grep: respect diff attributes for binary-ness
174
+ + grep: cache userdiff_driver in grep_source
175
+ + grep: drop grep_buffer's "name" parameter
176
+ + convert git-grep to use grep_source interface
177
+ + grep: refactor the concept of "grep source" into an object
178
+ + grep: move sha1-reading mutex into low-level code
179
+ + grep: make locking flag global
180
181
Fixes a longstanding bug that there was no way to tell "git grep" that a
182
path may look like text but it is not, which "git diff" can do using the
183
attributes system. Now "git grep" honors the same "binary" (or "-diff")
184
attribute.
185
73
-Will merge to 'next'.
74
-
186
* jc/parse-date-raw (2012-02-03) 2 commits
187
- parse_date(): '@' prefix forces git-timestamp
188
- parse_date(): allow ancient git-timestamp
@@ -82,9 +193,11 @@ timestamps near year 1970.
193
Waiting for comments.
194
195
* jk/git-dir-lookup (2012-02-02) 1 commit
85
- - standardize and improve lookup rules for external local repos
196
+ (merged to 'next' on 2012-02-05 at 1856d74)
197
+ + standardize and improve lookup rules for external local repos
198
87
-Will merge to 'next'.
199
+When you have both .../foo and .../foo.git, "git clone .../foo" did not
200
+favor the former but the latter.
201
202
* jk/prompt-fallback-to-tty (2012-02-03) 2 commits
203
- prompt: fall back to terminal if askpass fails
@@ -94,76 +207,27 @@ The code to ask for password did not fall back to the terminal input when
207
GIT_ASKPASS is set but does not work (e.g. lack of X with GUI askpass
208
helper).
209
97
-* jk/tests-write-script (2012-02-03) 2 commits
98
- - t0300: use write_script helper
99
- - tests: add write_script helper function
100
-
210
Will merge to 'next'.
211
212
+* jk/tests-write-script (2012-02-03) 2 commits
213
+ (merged to 'next' on 2012-02-05 at 4264ffa)
214
+ + t0300: use write_script helper
215
+ + tests: add write_script helper function
216
+ (this branch is tangled with jc/branch-desc-typoavoidance.)
217
+
218
* jn/gitweb-search-utf-8 (2012-02-03) 1 commit
104
- - gitweb: Allow UTF-8 encoded CGI query parameters and path_info
219
+ (merged to 'next' on 2012-02-05 at 055e446)
220
+ + gitweb: Allow UTF-8 encoded CGI query parameters and path_info
221
222
Search box in "gitweb" did not accept non-ASCII characters correctly.
107
-Will merge to 'next'.
223
224
* jn/rpm-spec (2012-02-03) 1 commit
110
- - git.spec: Workaround localized messages not put in any RPM
225
+ (merged to 'next' on 2012-02-05 at dba940b)
226
+ + git.spec: Workaround localized messages not put in any RPM
227
228
Fix breakage in v1.7.9 Makefile; rpmbuild notices an unpackaged but
229
installed *.mo file and fails.
230
115
-Will merge to 'next'.
116
-
117
---------------------------------------------------
118
-[Graduated to "master"]
119
-
120
-* jc/pull-signed-tag (2012-01-23) 1 commit
121
- (merged to 'next' on 2012-01-23 at 4257553)
122
- + merge: use editor by default in interactive sessions
123
-
124
-"git merge" in an interactive session learned to spawn the editor by
125
-default to let the user edit the auto-generated merge message, to
126
-encourage people to explain their merges better. Legacy scripts can
127
-export MERGE_AUTOEDIT=no to retain the historical behaviour.
128
-
129
-* tr/merge-edit-guidance (2012-01-31) 1 commit
130
- (merged to 'next' on 2012-01-31 at bb678f7)
131
- + merge: add instructions to the commit message when editing
132
-
133
-"git merge" adds advice text to the commit log template when running
134
-interactively.
135
-
136
---------------------------------------------------
137
-[Stalled]
138
-
139
-* jc/advise-push-default (2011-12-18) 1 commit
140
- - push: hint to use push.default=upstream when appropriate
141
-
142
-Peff had a good suggestion outlining an updated code structure so that
143
-somebody new can try to dip his or her toes in the development. Any
144
-takers?
145
-
146
-Waiting for a reroll.
147
-
148
-* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
149
- - fixup! 15eaaf4
150
- - git-svn, perl/Git.pm: extend Git::prompt helper for querying users
151
- - perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
152
-
153
-The bottom one has been replaced with a rewrite based on comments from
154
-Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to
155
-give precedence to tty over SSH_ASKPASS when terminal is available.
156
-
157
-* nd/commit-ignore-i-t-a (2012-01-16) 2 commits
158
- - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees
159
- - cache-tree: update API to take abitrary flags
160
-
161
-May want to consider this as fixing an earlier UI mistake, and not as a
162
-feature that devides the userbase.
163
-
164
---------------------------------------------------
165
-[Cooking]
166
-
231
* fc/zsh-completion (2012-02-03) 3 commits
232
- completion: simplify __gitcomp and __gitcomp_nl implementations
233
- completion: use ls -1 instead of rolling a loop to do that ourselves
@@ -186,11 +250,10 @@ tag prefixed with "tags/"
250
+ sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()
251
252
* nd/pack-objects-parseopt (2012-02-01) 3 commits
189
- - pack-objects: convert to use parse_options()
190
- - pack-objects: remove bogus comment
191
- - pack-objects: do not accept "--index-version=version,"
192
-
193
-Will merge to 'next'.
253
+ (merged to 'next' on 2012-02-05 at d0dc25d)
254
+ + pack-objects: convert to use parse_options()
255
+ + pack-objects: remove bogus comment
256
+ + pack-objects: do not accept "--index-version=version,"
257
258
"pack-objects" learned use parse-options, losing custom command line
259
parsing code.
@@ -218,9 +281,10 @@ Originally merged to 'next' on 2012-01-31.
281
Will merge to 'master'.
282
283
* jn/svn-fe (2012-02-02) 47 commits
221
- - vcs-svn: suppress a -Wtype-limits warning
222
- - vcs-svn: allow import of > 4GiB files
223
- - vcs-svn: rename check_overflow arguments for clarity
284
+ (merged to 'next' on 2012-02-05 at e9d3917)
285
+ + vcs-svn: suppress a -Wtype-limits warning
286
+ + vcs-svn: allow import of > 4GiB files
287
+ + vcs-svn: rename check_overflow arguments for clarity
288
(merged to 'next' on 2012-02-01 at 9288c95)
289
+ vcs-svn/svndiff.c: squelch false "unused" warning from gcc
290
+ Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
@@ -272,32 +336,5 @@ Originally merged to 'next' on 2012-01-29.
336
"vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support
337
incremental imports.
338
275
-Will merge to 'next' through the tip and then to 'master' soon after.
276
-
277
-* jc/split-blob (2012-01-24) 6 commits
278
- - chunked-object: streaming checkout
279
- - chunked-object: fallback checkout codepaths
280
- - bulk-checkin: support chunked-object encoding
281
- - bulk-checkin: allow the same data to be multiply hashed
282
- - new representation types in the packstream
283
- - varint-in-pack: refactor varint encoding/decoding
284
-
285
-Not ready.
286
-
287
-I finished the streaming checkout codepath, but as explained in 127b177
288
-(bulk-checkin: support chunked-object encoding, 2011-11-30), these are
289
-still early steps of a long and painful journey. At least pack-objects and
290
-fsck need to learn the new encoding for the series to be usable locally,
291
-and then index-pack/unpack-objects needs to learn it to be used remotely.
339
+Will merge to 'master'.
340
293
-Given that I heard a lot of noise that people want large files, and that I
294
-was asked by somebody at GitTogether'11 privately for an advice on how to
295
-pay developers (not me) to help adding necessary support, I am somewhat
296
-dissapointed that the original patch series that was sent almost two
297
-months ago still remains here without much comments and updates from the
298
-developer community. I even made the interface to the logic that decides
299
-where to split chunks easily replaceable, and I deliberately made the
300
-logic in the original patch extremely stupid to entice others, especially
301
-the "bup" fanboys, to come up with a better logic, thinking that giving
302
-people an easy target to shoot for, they may be encouraged to help
303
-out. The plan is not working :-(.