What's cooking (2014/04 #06)
Junio C Hamano committed
Apr 18, 2014 at 12:32 UTC
7275002ba2a85dca2657addc0816a9b60fbf368f
1 file changed
+100
-132
whats-cooking.txt
+100
-132
@@ -1,20 +1,21 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2014, #05; Thu, 17)
4
-X-master-at: 3f0c02a1c018ddaced5c97b58f550b2ad17dd0a9
5
-X-next-at: fab3363ed5bd07db28d6fcb0637f15275ad77226
3
+Subject: What's cooking in git.git (Apr 2014, #06; Fri, 18)
4
+X-master-at: cc291953df19aa4a97bee3590e708dc1fc557500
5
+X-next-at: 0bd75c508e7c03265459d39a0fa838a04b338cc4
6
7
-What's cooking in git.git (Apr 2014, #05; Thu, 17)
7
+What's cooking in git.git (Apr 2014, #06; Fri, 18)
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
-Hopefully we can merge a few more topics slated for 'master' before
15
-cutting an early preview release -rc0 tomorrow. Many of the topics
16
-that are in 'next' have sizable impact on the codebase and I'd feel
17
-safer to keep them cooking for the remainder of the cycle.
14
+The tip of the 'master' branch is at v2.0.0-rc0, an early preview
15
+release. There are a handful of topics still in 'next' (and a few
16
+that are not in 'next') that I'd like to have in v2.0.0-rc1, but
17
+other than that, this hopefully is fairly a close approximation of
18
+the upcoming release.
19
20
Also I am still waiting for acks for a few topics before merging
21
them to 'next'. I would feel it would be good if we can merge them
@@ -30,62 +31,23 @@ of the repositories listed at
31
--------------------------------------------------
32
[Graduated to "master"]
33
33
-* km/avoid-bs-in-shell-glob (2014-04-11) 1 commit
34
- (merged to 'next' on 2014-04-14 at a3d9a58)
35
- + test: fix t5560 on FreeBSD
36
-
37
- Portability fix.
38
- May want to merge to 'maint' later.
39
-
40
-
41
-* km/avoid-cp-a (2014-04-11) 1 commit
42
- (merged to 'next' on 2014-04-14 at be661c4)
43
- + test: fix t7001 cp to use POSIX options
44
-
45
- Portability fix.
46
- May want to merge to 'maint' later.
47
-
48
-
49
-* mh/multimail (2014-04-07) 1 commit
50
- (merged to 'next' on 2014-04-15 at eaba915)
51
- + git-multimail: update to version 1.0.0
52
-
53
-
54
-* tb/unicode-6.3-zero-width (2014-04-09) 1 commit
55
- (merged to 'next' on 2014-04-14 at 72ce72a)
56
- + utf8.c: partially update to version 6.3
57
-
58
- Teach our display-column-counting logic about decomposed umlauts
59
- and friends.
60
-
61
---------------------------------------------------
62
-[New Topics]
63
-
64
-* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
65
- - git-gui: show staged submodules regardless of ignore config
66
-
67
- Tentatively queued what I expect to receive via Pat Thoyts.
68
-
69
-
70
-* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
71
- - gitk: show staged submodules regardless of ignore config
72
- - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
73
- - l10n: Init Vietnamese translation
74
-
75
- Tentatively queued what I expect to receive via Paul Mackerras.
76
-
77
-
78
-* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
79
- - git-rebase: print name of rev when using shorthand
34
+* fc/complete-aliased-push (2014-04-09) 1 commit
35
+ (merged to 'next' on 2014-04-16 at ab798d1)
36
+ + completion: fix completing args of aliased "push", "fetch", etc.
37
81
- Teach "git rebase -" to report the concrete name of the branch
82
- (i.e. the previous one).
38
84
- But it stops short and does not do the same for "git rebase @{-1}".
39
+* fc/prompt-zsh-read-from-file (2014-04-14) 1 commit
40
+ (merged to 'next' on 2014-04-16 at 0e5fec0)
41
+ + prompt: fix missing file errors in zsh
42
43
87
-* ef/send-email-absolute-path-to-the-command (2014-04-16) 1 commit
88
- - send-email: recognize absolute path on Windows
44
+* fc/remote-helper-fixes (2014-04-14) 5 commits
45
+ (merged to 'next' on 2014-04-16 at 180482e)
46
+ + remote-bzr: trivial test fix
47
+ + remote-bzr: include authors field in pushed commits
48
+ + remote-bzr: add support for older versions
49
+ + remote-hg: always normalize paths
50
+ + remote-helpers: allow all tests running from any dir
51
52
53
* jk/config-die-bad-number-noreturn (2014-04-16) 1 commit
@@ -94,50 +56,6 @@ of the repositories listed at
56
57
Squelch a false compiler warning from older gcc.
58
97
- Will merge to 'master'.
98
-
99
-
100
-* ep/shell-command-substitution (2014-04-17) 14 commits
101
- - t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
102
- - t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
103
- - git-tag.sh: use the $( ... ) construct for command substitution
104
- - git-revert.sh: use the $( ... ) construct for command substitution
105
- - git-resolve.sh: use the $( ... ) construct for command substitution
106
- - git-repack.sh: use the $( ... ) construct for command substitution
107
- - git-merge.sh: use the $( ... ) construct for command substitution
108
- - git-ls-remote.sh: use the $( ... ) construct for command substitution
109
- - git-fetch.sh: use the $( ... ) construct for command substitution
110
- - git-commit.sh: use the $( ... ) construct for command substitution
111
- - git-clone.sh: use the $( ... ) construct for command substitution
112
- - git-checkout.sh: use the $( ... ) construct for command substitution
113
- - install-webdoc.sh: use the $( ... ) construct for command substitution
114
- - howto-index.sh: use the $( ... ) construct for command substitution
115
-
116
- Will merge to 'next' and perhaps to 'master'.
117
-
118
-
119
-* jh/submodule-tests (2014-04-17) 1 commit
120
- - t7410: 210 tests for various 'git submodule update' scenarios
121
-
122
-
123
-* jx/i18n (2014-04-17) 3 commits
124
- - i18n: only extract comments marked with "TRANSLATORS:"
125
- - i18n: remove obsolete comments for translators in diffstat generation
126
- - i18n: fix uncatchable comments for translators in date.c
127
-
128
- The tip one is somewhat unfortunate to force us deviate from our
129
- multi-line comment formatting convention when writing comments for
130
- translators.
131
-
132
-
133
-* rs/ref-update-check-errors-early (2014-04-17) 2 commits
134
- - commit.c: check for lock error and return early
135
- - sequencer.c: check for lock failure and bail early in fast_forward_to
136
-
137
-
138
-* sk/svn-parse-datestamp (2014-04-17) 1 commit
139
- - SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
140
-
59
--------------------------------------------------
60
[Stalled]
61
@@ -325,11 +243,81 @@ of the repositories listed at
243
--------------------------------------------------
244
[Cooking]
245
328
-* fc/prompt-zsh-read-from-file (2014-04-14) 1 commit
329
- (merged to 'next' on 2014-04-16 at 0e5fec0)
330
- + prompt: fix missing file errors in zsh
246
+* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
247
+ - git-gui: show staged submodules regardless of ignore config
248
+
249
+ Tentatively queued what I expect to receive via Pat Thoyts.
250
+
251
+
252
+* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
253
+ - gitk: show staged submodules regardless of ignore config
254
+ - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
255
+ - l10n: Init Vietnamese translation
256
+
257
+ Tentatively queued what I expect to receive via Paul Mackerras.
258
+
259
+
260
+* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
261
+ - git-rebase: print name of rev when using shorthand
262
+
263
+ Teach "git rebase -" to report the concrete name of the branch
264
+ (i.e. the previous one).
265
+
266
+ But it stops short and does not do the same for "git rebase @{-1}".
267
+ Expecting a reroll.
268
+
269
+
270
+* ef/send-email-absolute-path-to-the-command (2014-04-16) 1 commit
271
+ - send-email: recognize absolute path on Windows
272
+
273
+ Will merge to 'next'.
274
+
275
+
276
+* ep/shell-command-substitution (2014-04-17) 14 commits
277
+ (merged to 'next' on 2014-04-18 at ebd996d)
278
+ + t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
279
+ + t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
280
+ + git-tag.sh: use the $( ... ) construct for command substitution
281
+ + git-revert.sh: use the $( ... ) construct for command substitution
282
+ + git-resolve.sh: use the $( ... ) construct for command substitution
283
+ + git-repack.sh: use the $( ... ) construct for command substitution
284
+ + git-merge.sh: use the $( ... ) construct for command substitution
285
+ + git-ls-remote.sh: use the $( ... ) construct for command substitution
286
+ + git-fetch.sh: use the $( ... ) construct for command substitution
287
+ + git-commit.sh: use the $( ... ) construct for command substitution
288
+ + git-clone.sh: use the $( ... ) construct for command substitution
289
+ + git-checkout.sh: use the $( ... ) construct for command substitution
290
+ + install-webdoc.sh: use the $( ... ) construct for command substitution
291
+ + howto-index.sh: use the $( ... ) construct for command substitution
292
+
293
+ Will merge to 'master' by -rc1 if no regressions are reported.
294
+
295
+
296
+* jh/submodule-tests (2014-04-17) 1 commit
297
+ - t7410: 210 tests for various 'git submodule update' scenarios
298
+
299
332
- Will merge to 'master'.
300
+* jx/i18n (2014-04-18) 4 commits
301
+ (merged to 'next' on 2014-04-18 at 2ace126)
302
+ + i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines
303
+ + i18n: only extract comments marked with "TRANSLATORS:"
304
+ + i18n: remove obsolete comments for translators in diffstat generation
305
+ + i18n: fix uncatchable comments for translators in date.c
306
+
307
+ Will merge to 'master' by -rc1 if no regressions are reported.
308
+
309
+
310
+* rs/ref-update-check-errors-early (2014-04-17) 2 commits
311
+ - commit.c: check for lock error and return early
312
+ - sequencer.c: check for lock failure and bail early in fast_forward_to
313
+
314
+ Will merge to 'next' and keep it there for the remainder of the cycle.
315
+
316
+
317
+* sk/svn-parse-datestamp (2014-04-17) 1 commit
318
+ - SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
319
+
320
+ Will merge to 'next' and keep it there for the remainder of the cycle.
321
322
323
* fc/transport-helper-sync-error-fix (2014-04-14) 5 commits
@@ -349,16 +337,14 @@ of the repositories listed at
337
338
339
* km/avoid-non-function-return-in-rebase (2014-04-17) 2 commits
352
- - Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
353
- - rebase: avoid non-function use of "return" on FreeBSD
340
+ (merged to 'next' on 2014-04-18 at 6982c3e)
341
+ + Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
342
+ + rebase: avoid non-function use of "return" on FreeBSD
343
344
Work around /bin/sh that does not like "return" at the top-level
345
of a file that is dot-sourced from inside a function definition.
346
358
- Will merge to 'next' after the discussion on in-code comment settles.
359
-
360
- We may want to merge it to 'master' by -rc1 if no regressions are
361
- reported.
347
+ Will merge to 'master' by -rc1 if no regressions are reported.
348
349
350
* db/make-with-curl (2014-04-15) 2 commits
@@ -382,24 +368,6 @@ of the repositories listed at
368
Will keep in 'next' for the remainder of the cycle.
369
370
385
-* fc/complete-aliased-push (2014-04-09) 1 commit
386
- (merged to 'next' on 2014-04-16 at ab798d1)
387
- + completion: fix completing args of aliased "push", "fetch", etc.
388
-
389
- Will merge to 'master'.
390
-
391
-
392
-* fc/remote-helper-fixes (2014-04-14) 5 commits
393
- (merged to 'next' on 2014-04-16 at 180482e)
394
- + remote-bzr: trivial test fix
395
- + remote-bzr: include authors field in pushed commits
396
- + remote-bzr: add support for older versions
397
- + remote-hg: always normalize paths
398
- + remote-helpers: allow all tests running from any dir
399
-
400
- Will merge to 'master'.
401
-
402
-
371
* ym/fix-opportunistic-index-update-race (2014-04-10) 2 commits
372
(merged to 'next' on 2014-04-16 at cb92f4f)
373
+ read-cache.c: verify index file before we opportunistically update it