What's cooking (2014/05 #05)
Junio C Hamano committed
May 23, 2014 at 15:17 UTC
aa5f59252760682ebd536e08b83b70792890ee5a
1 file changed
+133
-82
whats-cooking.txt
+133
-82
@@ -1,19 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2014, #04; Wed, 21)
3
+Subject: What's cooking in git.git (May 2014, #05; Fri, 23)
4
X-master-at: 4a28f169ad29ba452e0e7bea2583914c10c58322
5
X-next-at: daf83cafd8ed3cb640a2047d5069cdbf9d18e7c0
6
7
-What's cooking in git.git (May 2014, #04; Wed, 21)
7
+What's cooking in git.git (May 2014, #05; Fri, 23)
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
-The tip of the 'master' branch has past v2.0.0-rc4, as there were
15
-last minute regressions to be taken care of. Hopefully we can tag
16
-v2.0.0 final soonish.
14
+The tip of the 'master' branch has past v2.0.0-rc4 (which was
15
+unplanned, but there were last minute regressions to be taken care
16
+of). Hopefully we can tag v2.0.0 final early next week.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -23,101 +23,57 @@ of the repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
-* sk/wincred (2014-05-14) 2 commits
27
- (merged to 'next' on 2014-05-21 at a3b9ca3)
28
- + wincred: avoid overwriting configured variables
29
- + wincred: add install target
26
+* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
27
+ - scripts: more "export VAR=VALUE" fixes
28
+ - scripts: get rid of the non portable "export VAR=VALUE" costruct
29
31
- Will keep in 'next' for the remainder of the cycle.
30
+ Will merge to 'next' after fixing typos in the log message.
31
32
34
-* as/pretty-truncate (2014-05-21) 5 commits
35
- - pretty.c: format string with truncate respects logOutputEncoding
36
- - t4205, t6006: add tests that fail with i18n.logOutputEncoding set
37
- - t4205 (log-pretty-format): use `tformat` rather than `format`
38
- - t4041, t4205, t6006, t7102: don't hardcode tested encoding value
39
- - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
33
+* jn/test-lint-unmoor (2014-05-23) 1 commit
34
+ - test-lint: find unportable sed, echo, test, and export usage after &&
35
36
Will merge to 'next' and keep it there for the rest of this cycle.
37
38
44
-* cc/replace-graft (2014-05-19) 1 commit
45
- (merged to 'next' on 2014-05-21 at 7d90c4e)
46
- + replace: add --graft option
47
- (this branch uses cc/replace-edit.)
48
-
49
- Will keep in 'next' for the remainder of the cycle.
50
-
51
-
52
-
53
-* jk/argv-array-for-child-process (2014-05-15) 7 commits
54
- (merged to 'next' on 2014-05-21 at 5b2fa64)
55
- + argv-array: drop "detach" code
56
- + get_importer: use run-command's internal argv_array
57
- + get_exporter: use argv_array
58
- + get_helper: use run-command's internal argv_array
59
- + git_connect: use argv_array
60
- + run_column_filter: use argv_array
61
- + run-command: store an optional argv_array
62
-
63
- Will keep in 'next' for the remainder of the cycle.
64
-
65
-
66
-* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
67
- (merged to 'next' on 2014-05-21 at 142d2c8)
68
- + run_diff_files: do not look at uninitialized stat data
69
-
70
- Will keep in 'next' for the remainder of the cycle.
71
-
39
+* jj/command-line-adjective (2014-05-21) 1 commit
40
+ - Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
41
73
-* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
74
- (merged to 'next' on 2014-05-21 at 77c89fe)
75
- + open_sha1_file: report "most interesting" errno
76
-
77
- Will keep in 'next' for the remainder of the cycle.
78
-
79
-
80
-* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
81
- (merged to 'next' on 2014-05-21 at d87d266)
82
- + rebase --keep-empty -i: add test
83
-
84
- Will keep in 'next' for the remainder of the cycle.
85
-
86
-
87
-* nd/status-auto-comment-char (2014-05-19) 2 commits
88
- (merged to 'next' on 2014-05-21 at f762e62)
89
- + commit: allow core.commentChar=auto for character auto selection
90
- + config: be strict on core.commentChar
42
+ Will merge to 'next' and keep it there for the rest of this cycle.
43
92
- Will keep in 'next' for the remainder of the cycle.
44
45
+* jk/daemon-tolower (2014-05-23) 1 commit
46
+ - daemon/config: factor out duplicate xstrdup_tolower
47
95
-* rr/rebase-autostash-fix (2014-05-20) 2 commits
96
- (merged to 'next' on 2014-05-21 at ca4aa40)
97
- + rebase -i: test "Nothing to do" case with autostash
98
- + rebase -i: handle "Nothing to do" case with autostash
48
+ Will merge to 'next' and keep it there for the rest of this cycle.
49
100
- Will keep in 'next' for the remainder of the cycle.
50
51
+* jk/strbuf-tolower (2014-05-23) 1 commit
52
+ - strbuf: add strbuf_tolower function
53
103
-* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
104
- (merged to 'next' on 2014-05-21 at eb28305)
105
- + git grep -O -i: if the pager is 'less', pass the '-I' option
54
+ Will merge to 'next' and keep it there for the rest of this cycle.
55
107
- Will keep in 'next' for the remainder of the cycle.
56
57
+* jk/http-errors (2014-05-23) 8 commits
58
+ - http: default text charset to iso-8859-1
59
+ - remote-curl: reencode http error messages
60
+ - strbuf: add strbuf_reencode helper
61
+ - http: optionally extract charset parameter from content-type
62
+ - http: extract type/subtype portion of content-type
63
+ - t5550: test display of remote http error messages
64
+ - t/lib-httpd: use write_script to copy CGI scripts
65
+ - test-lib: preserve GIT_CURL_VERBOSE from the environment
66
110
-* sk/windows-unc-path (2014-05-20) 1 commit
111
- (merged to 'next' on 2014-05-21 at d1f1350)
112
- + Windows: Allow using UNC path for git repository
67
+ The fourth from the bottom needs additional comments $gmane/250024
68
+ squashed in before this is merged to 'next'.
69
114
- Will keep in 'next' for the remainder of the cycle.
70
71
+* jm/format-patch-mail-sig (2014-05-22) 2 commits
72
+ - format-patch: --signature-file=<file>
73
+ - format-patch: make newline after signature conditional
74
117
-* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
118
- - move "--follow needs one pathspec" rule to diff_setup_done
75
+ Looked more-or-less ready, except for some negative tests.
76
120
- Will merge to 'next' and keep it there for the rest of this cycle.
77
78
--------------------------------------------------
79
[Stalled]
@@ -287,6 +243,102 @@ of the repositories listed at
243
--------------------------------------------------
244
[Cooking]
245
246
+* sk/wincred (2014-05-14) 2 commits
247
+ (merged to 'next' on 2014-05-21 at a3b9ca3)
248
+ + wincred: avoid overwriting configured variables
249
+ + wincred: add install target
250
+
251
+ Will keep in 'next' for the remainder of the cycle.
252
+
253
+
254
+* as/pretty-truncate (2014-05-21) 5 commits
255
+ - pretty.c: format string with truncate respects logOutputEncoding
256
+ - t4205, t6006: add tests that fail with i18n.logOutputEncoding set
257
+ - t4205 (log-pretty-format): use `tformat` rather than `format`
258
+ - t4041, t4205, t6006, t7102: don't hardcode tested encoding value
259
+ - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
260
+
261
+ Will merge to 'next' and keep it there for the rest of this cycle.
262
+
263
+
264
+* cc/replace-graft (2014-05-19) 1 commit
265
+ (merged to 'next' on 2014-05-21 at 7d90c4e)
266
+ + replace: add --graft option
267
+ (this branch uses cc/replace-edit.)
268
+
269
+ Will keep in 'next' for the remainder of the cycle.
270
+
271
+
272
+* jk/argv-array-for-child-process (2014-05-15) 7 commits
273
+ (merged to 'next' on 2014-05-21 at 5b2fa64)
274
+ + argv-array: drop "detach" code
275
+ + get_importer: use run-command's internal argv_array
276
+ + get_exporter: use argv_array
277
+ + get_helper: use run-command's internal argv_array
278
+ + git_connect: use argv_array
279
+ + run_column_filter: use argv_array
280
+ + run-command: store an optional argv_array
281
+
282
+ Will keep in 'next' for the remainder of the cycle.
283
+
284
+
285
+* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
286
+ (merged to 'next' on 2014-05-21 at 142d2c8)
287
+ + run_diff_files: do not look at uninitialized stat data
288
+
289
+ Will keep in 'next' for the remainder of the cycle.
290
+
291
+
292
+* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
293
+ (merged to 'next' on 2014-05-21 at 77c89fe)
294
+ + open_sha1_file: report "most interesting" errno
295
+
296
+ Will keep in 'next' for the remainder of the cycle.
297
+
298
+
299
+* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
300
+ (merged to 'next' on 2014-05-21 at d87d266)
301
+ + rebase --keep-empty -i: add test
302
+
303
+ Will keep in 'next' for the remainder of the cycle.
304
+
305
+
306
+* nd/status-auto-comment-char (2014-05-19) 2 commits
307
+ (merged to 'next' on 2014-05-21 at f762e62)
308
+ + commit: allow core.commentChar=auto for character auto selection
309
+ + config: be strict on core.commentChar
310
+
311
+ Will keep in 'next' for the remainder of the cycle.
312
+
313
+
314
+* rr/rebase-autostash-fix (2014-05-20) 2 commits
315
+ (merged to 'next' on 2014-05-21 at ca4aa40)
316
+ + rebase -i: test "Nothing to do" case with autostash
317
+ + rebase -i: handle "Nothing to do" case with autostash
318
+
319
+ Will keep in 'next' for the remainder of the cycle.
320
+
321
+
322
+* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
323
+ (merged to 'next' on 2014-05-21 at eb28305)
324
+ + git grep -O -i: if the pager is 'less', pass the '-I' option
325
+
326
+ Will keep in 'next' for the remainder of the cycle.
327
+
328
+
329
+* sk/windows-unc-path (2014-05-20) 1 commit
330
+ (merged to 'next' on 2014-05-21 at d1f1350)
331
+ + Windows: Allow using UNC path for git repository
332
+
333
+ Will keep in 'next' for the remainder of the cycle.
334
+
335
+
336
+* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
337
+ - move "--follow needs one pathspec" rule to diff_setup_done
338
+
339
+ Will merge to 'next' and keep it there for the rest of this cycle.
340
+
341
+
342
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
343
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
344
- git-add--interactive: Preserve diff heading when splitting hunks
@@ -714,7 +766,8 @@ of the repositories listed at
766
Will keep in 'next' for the remainder of the cycle.
767
768
717
-* ib/test-selectively-run (2014-05-06) 3 commits
769
+* ib/test-selectively-run (2014-05-21) 4 commits
770
+ - t0000-*.sh: Fix the GIT_SKIP_TESTS sub-tests
771
- test-lib: '--run' to run only specific tests
772
- test-lib: tests skipped by GIT_SKIP_TESTS say so
773
- test-lib: Document short options in t/README
@@ -722,8 +775,6 @@ of the repositories listed at
775
Allow specifying only certain individual test pieces to be run
776
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
777
725
- Needs a reroll/squash to fix bash-isms.
726
-
778
779
* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
780
(merged to 'next' on 2014-05-02 at 7744361)