What's cooking (2015/02 #02)
Junio C Hamano committed
Feb 5, 2015 at 14:18 UTC
f557ce992dfd61ee7e660eeabb638b99e19bd603
1 file changed
+139
-148
whats-cooking.txt
+139
-148
@@ -1,17 +1,18 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2015, #01; Tue, 3)
4
-X-master-at: 0d1c285af265459006c012aa4415175c2db961ad
5
-X-next-at: 303d43c5ff509a8324ff30a824663dd552b0d231
3
+Subject: What's cooking in git.git (Feb 2015, #02; Thu, 5)
4
+X-master-at: 9874fca7122563e28d699a911404fc49d2a24f1c
5
+X-next-at: 4a23b1ac164e66f150700c4fdd659c98940bd4a5
6
7
-What's cooking in git.git (Feb 2015, #01; Tue, 3)
7
+What's cooking in git.git (Feb 2015, #02; Thu, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-We will see 2.3 final later this week, hopefully.
14
+Git 2.3 is out. I'll wait for some time for the dust to settle and
15
+then rewind and rebuild 'next'.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -21,125 +22,30 @@ of the repositories listed at
22
--------------------------------------------------
23
[New Topics]
24
24
-* jc/diff-format-doc (2015-01-28) 1 commit
25
- - diff-format doc: a score can follow M for rewrite
26
-
27
- The documentation incorrectly said that C(opy) and R(ename) are the
28
- only ones that can be followed by the score number in the output in
29
- the --raw format.
30
-
31
- Will merge to 'next'.
32
-
33
-
34
-* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit
35
- - do not check truth value of flex arrays
36
-
37
- Will merge to 'next'.
38
-
39
-
40
-* jk/status-read-branch-name-fix (2015-01-28) 1 commit
41
- - read_and_strip_branch: fix typo'd address-of operator
42
-
43
- Code to read branch name from various files in .git/ directory
44
- would have misbehaved if the code to write them left an empty file.
45
-
46
- Will merge to 'next'.
47
-
48
-
49
-* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits
50
- - t/lib-gpg: sanity-check that we can actually sign
51
- - t/lib-gpg: include separate public keys in keyring.gpg
52
-
53
- Older GnuPG implementation may not correctly import the keyring
54
- material we prepare for the tests to use.
55
-
56
- Will merge to 'next'.
57
-
58
-
59
-* jc/apply-beyond-symlink (2015-02-03) 4 commits
60
- - apply: do not touch a file beyond a symbolic link
61
- - apply: do not read from beyond a symbolic link
62
- - apply: do not read from the filesystem under --index
63
- - apply: reject input that touches outside the working area
64
-
65
- "git apply" was not very careful about reading from, removing,
66
- updating and creating paths outside the working tree (under
67
- --index/--cached) or the current directory (when used as a
68
- replacement for GNU patch).
69
-
70
- May need to re-review the tests.
71
-
72
-
73
-* jc/diff-b-m (2015-02-01) 1 commit
74
- - diff: do not use creation-half of -B as a rename target candidate
75
-
76
- "git diff -B -M" produced incorrect patch when the postimage of a
77
- completely rewritten file is similar to the preimage of a removed
78
- file; such a resulting file must not be expressed as a rename from
79
- other place.
80
-
81
- The fix in this patch is broken, unfortunately.
82
-
83
-
84
-* jc/remote-set-url-doc (2015-01-29) 1 commit
85
- - Documentation/git-remote.txt: stress that set-url is not for triangular
86
-
87
- Clarify in the documentation that "remote.<nick>.pushURL" and
88
- "remote.<nick>.URL" are there to name the same repository accessed
89
- via different transports, not two separate repositories.
25
+* jc/diff-files-ita (2015-02-04) 1 commit
26
+ - run_diff_files(): clarify computation of sha1 validity
27
28
Will merge to 'next'.
29
30
94
-* jc/t4122-use-test-write-lines (2015-01-28) 1 commit
95
- - t4122: use test_write_lines from test-lib-functions
96
-
97
- Will merge to 'next'.
98
-
99
-
100
-* jk/pack-bitmap (2015-02-03) 1 commit
101
- - [NEEDS SOB] ewah: fix building with gcc < 3.4.0
102
-
103
- Need to get the S-o-by and Acked-by straightend out.
104
-
105
-
106
-* jk/prune-mtime (2015-02-02) 1 commit
107
- - sha1_file: fix iterating loose alternate objects
108
-
109
- In v2.2.0, we broke "git prune" that runs in a repository that
110
- borrows from an alternate object store.
31
+* jk/config-no-ungetc-eof (2015-02-05) 2 commits
32
+ - config_buf_ungetc: warn when pushing back a random character
33
+ - config: do not ungetc EOF
34
35
Will merge to 'next'.
36
37
115
-* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit
116
- - git-submodule.sh: fix '/././' path normalization
38
+* jk/decimal-width-for-uintmax (2015-02-05) 1 commit
39
+ - decimal_width: avoid integer overflow
40
41
Will merge to 'next'.
42
43
121
-* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit
122
- - Makefile: handle broken curl version number in version check
123
-
124
- Cope with irregular output of "curl-config --vernum" given by
125
- certain older vintages of cURL.
44
+* ss/check-builtins-on-windows (2015-02-05) 1 commit
45
+ - check-builtins: strip executable suffix $X when enumerating builtins
46
47
Will merge to 'next'.
48
129
-
130
-* tc/missing-http-proxyauth (2015-02-03) 1 commit
131
- - http: support curl < 7.10.7
132
-
133
- Will merge to 'next'.
134
-
135
-
136
-* tc/t9001-noxmailer (2015-01-30) 1 commit
137
- - t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
138
-
139
- Kyle's update to explicitly support --no-option with older
140
- Getopt::Long ($gmane/263203) might be a better alternative
141
- if we have to support them in the longer term.
142
-
49
--------------------------------------------------
50
[Stalled]
51
@@ -276,6 +182,126 @@ of the repositories listed at
182
--------------------------------------------------
183
[Cooking]
184
185
+* jc/diff-format-doc (2015-01-28) 1 commit
186
+ - diff-format doc: a score can follow M for rewrite
187
+
188
+ The documentation incorrectly said that C(opy) and R(ename) are the
189
+ only ones that can be followed by the score number in the output in
190
+ the --raw format.
191
+
192
+ Will merge to 'next'.
193
+
194
+
195
+* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit
196
+ - do not check truth value of flex arrays
197
+
198
+ Will merge to 'next'.
199
+
200
+
201
+* jk/status-read-branch-name-fix (2015-01-28) 1 commit
202
+ - read_and_strip_branch: fix typo'd address-of operator
203
+
204
+ Code to read branch name from various files in .git/ directory
205
+ would have misbehaved if the code to write them left an empty file.
206
+
207
+ Will merge to 'next'.
208
+
209
+
210
+* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits
211
+ - t/lib-gpg: sanity-check that we can actually sign
212
+ - t/lib-gpg: include separate public keys in keyring.gpg
213
+
214
+ Older GnuPG implementation may not correctly import the keyring
215
+ material we prepare for the tests to use.
216
+
217
+ Will merge to 'next'.
218
+
219
+
220
+* jc/apply-beyond-symlink (2015-02-03) 4 commits
221
+ - apply: do not touch a file beyond a symbolic link
222
+ - apply: do not read from beyond a symbolic link
223
+ - apply: do not read from the filesystem under --index
224
+ - apply: reject input that touches outside the working area
225
+
226
+ "git apply" was not very careful about reading from, removing,
227
+ updating and creating paths outside the working tree (under
228
+ --index/--cached) or the current directory (when used as a
229
+ replacement for GNU patch).
230
+
231
+ May need to re-review the tests.
232
+
233
+
234
+* jc/diff-b-m (2015-02-01) 1 commit
235
+ - diff: do not use creation-half of -B as a rename target candidate
236
+
237
+ "git diff -B -M" produced incorrect patch when the postimage of a
238
+ completely rewritten file is similar to the preimage of a removed
239
+ file; such a resulting file must not be expressed as a rename from
240
+ other place.
241
+
242
+ The fix in this patch is broken, unfortunately.
243
+
244
+
245
+* jc/remote-set-url-doc (2015-01-29) 1 commit
246
+ - Documentation/git-remote.txt: stress that set-url is not for triangular
247
+
248
+ Clarify in the documentation that "remote.<nick>.pushURL" and
249
+ "remote.<nick>.URL" are there to name the same repository accessed
250
+ via different transports, not two separate repositories.
251
+
252
+ Will merge to 'next'.
253
+
254
+
255
+* jc/t4122-use-test-write-lines (2015-01-28) 1 commit
256
+ - t4122: use test_write_lines from test-lib-functions
257
+
258
+ Will merge to 'next'.
259
+
260
+
261
+* jk/pack-bitmap (2015-02-04) 1 commit
262
+ - ewah: fix building with gcc < 3.4.0
263
+
264
+ Will merge to 'next'.
265
+
266
+
267
+* jk/prune-mtime (2015-02-02) 1 commit
268
+ - sha1_file: fix iterating loose alternate objects
269
+
270
+ In v2.2.0, we broke "git prune" that runs in a repository that
271
+ borrows from an alternate object store.
272
+
273
+ Will merge to 'next'.
274
+
275
+
276
+* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit
277
+ - git-submodule.sh: fix '/././' path normalization
278
+
279
+ Will merge to 'next'.
280
+
281
+
282
+* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit
283
+ - Makefile: handle broken curl version number in version check
284
+
285
+ Cope with irregular output of "curl-config --vernum" given by
286
+ certain older vintages of cURL.
287
+
288
+ Will merge to 'next'.
289
+
290
+
291
+* tc/missing-http-proxyauth (2015-02-03) 1 commit
292
+ - http: support curl < 7.10.7
293
+
294
+ Will merge to 'next'.
295
+
296
+
297
+* tc/t9001-noxmailer (2015-01-30) 1 commit
298
+ - t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
299
+
300
+ Kyle's update to explicitly support --no-option with older
301
+ Getopt::Long ($gmane/263203) might be a better alternative
302
+ if we have to support them in the longer term.
303
+
304
+
305
* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
306
- apply: detect and mark whitespace errors in context lines when fixing
307
(this branch uses jc/apply-ws-fix-expands.)
@@ -343,7 +369,7 @@ of the repositories listed at
369
(merged to 'next' on 2015-01-23 at ed972d3)
370
+ git-p4: correct --prepare-p4-only instructions
371
346
- Will merge to 'master' after 2.3 final.
372
+ Will merge to 'master'.
373
374
375
* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit
@@ -452,11 +478,12 @@ of the repositories listed at
478
479
480
* ld/p4-exclude-in-sync (2015-01-28) 2 commits
455
- - git-p4: correct "exclude" change
481
+ (merged to 'next' on 2015-02-05 at ab410a1)
482
+ + git-p4: correct "exclude" change
483
(merged to 'next' on 2015-01-22 at f6f1fc7)
484
+ git-p4: support excluding paths on sync
485
459
- Will squash into one after 2.3 final.
486
+ Will squash them into one and then merge to 'master'.
487
488
489
* tb/connect-ipv6-parse-fix (2015-01-22) 3 commits
@@ -748,39 +775,3 @@ of the repositories listed at
775
- dir.c: optionally compute sha-1 of a .gitignore file
776
777
Need extra set of eyes to review this.
751
-
752
---------------------------------------------------
753
-[Discarded]
754
-
755
-* jc/push-cert-hmac-optim (2014-09-25) 2 commits
756
- . receive-pack: truncate hmac early and convert only necessary bytes
757
- . sha1_to_hex: split out "hex-format n bytes" helper and use it
758
-
759
- This is "we could do this if we wanted to", not "we measured and it
760
- improves performance critical codepath".
761
-
762
-
763
-* mt/patch-id-stable (2014-06-10) 1 commit
764
- . patch-id: change default to stable
765
-
766
- Nobody seems to be jumping up & down requesting this last step,
767
- which makes the result somewhat backward incompatible.
768
-
769
-
770
-* sb/copy-fd-errno (2014-11-17) 1 commit
771
- . copy.c: make copy_fd preserve meaningful errno
772
-
773
-
774
-* cj/grep-none-match (2015-01-06) 1 commit
775
- . git-log: added --none-match option
776
-
777
- "git log --none-match --grep=WIP" will show only commits that are
778
- not marked as WIP.
779
-
780
- cj/log-invert-grep replaces this.
781
-
782
-
783
-* lf/blame-commit-label (2015-01-12) 1 commit
784
- . blame.c: fix garbled error message
785
-
786
- jk/blame-commit-label replaces this.