What's cooking (2016/11 #05)
Junio C Hamano committed
Nov 23, 2016 at 15:14 UTC
7701825fd3bcd2266b8dede7179f7ee06559ec75
1 file changed
+70
-67
whats-cooking.txt
+70
-67
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2016, #04; Mon, 21)
4
-X-master-at: 1310affe024fba407bff55dbe65cd6d670c8a32d
5
-X-next-at: d50252334705fce146cd91a5045ecc87fd6ea92e
3
+Subject: What's cooking in git.git (Nov 2016, #05; Wed, 23)
4
+X-master-at: e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44
5
+X-next-at: c8190e7bd5cf2478d6c76f2ae9bea11b360a6330
6
7
-What's cooking in git.git (Nov 2016, #04; Mon, 21)
7
+What's cooking in git.git (Nov 2016, #05; Wed, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -18,7 +18,7 @@ of the repositories listed at
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
21
-[New Topics]
21
+[Graduated to "master"]
22
23
* jc/for-each-ref-head-segfault-fix (2016-11-18) 1 commit
24
(merged to 'next' on 2016-11-21 at 3c1f352316)
@@ -27,7 +27,14 @@ of the repositories listed at
27
Using a %(HEAD) placeholder in "for-each-ref --format=" option
28
caused the command to segfault when on an unborn branch.
29
30
- Will cook in 'next'.
30
+
31
+* jc/setup-cleanup-fix (2016-11-22) 2 commits
32
+ (merged to 'next' on 2016-11-23 at e46785ec9c)
33
+ + archive: read local configuration
34
+ + mailinfo: read local configuration
35
+
36
+ "git archive" and "git mailinfo" stopped reading from local
37
+ configuration file with a recent update.
38
39
40
* js/prepare-sequencer (2016-11-21) 1 commit
@@ -35,22 +42,27 @@ of the repositories listed at
42
+ i18n: fix unmatched single quote in error message
43
44
Fix for an error message string.
38
- Will merge to 'master'.
45
46
47
* js/rebase-i-commentchar-fix (2016-11-21) 3 commits
42
- - rebase -i: handle core.commentChar=auto
43
- - stripspace: respect repository config
44
- - rebase -i: highlight problems with core.commentchar
48
+ (merged to 'next' on 2016-11-22 at 88581dfe2e)
49
+ + rebase -i: handle core.commentChar=auto
50
+ + stripspace: respect repository config
51
+ + rebase -i: highlight problems with core.commentchar
52
53
"git rebase -i" did not work well with core.commentchar
54
configuration variable for two reasons, both of which have been
55
fixed.
56
50
- Waiting for an ack for updates.
51
- Hopefully we can merge this before 2.11 final, as one of the
52
- breakages is a recent regression.
57
58
+* jt/trailer-with-cruft (2016-11-21) 1 commit
59
+ (merged to 'next' on 2016-11-22 at c68014088a)
60
+ + doc: mention user-configured trailers
61
+
62
+ Doc update.
63
+
64
+--------------------------------------------------
65
+[New Topics]
66
67
* jc/cache-tree-wip (2016-11-18) 4 commits
68
- cache-tree: freshen the tree object at the top level
@@ -59,42 +71,21 @@ of the repositories listed at
71
- freshen_object(): factor out a helper function
72
73
62
-* jk/trailers-placeholder-in-pretty (2016-11-21) 2 commits
63
- - ref-filter: add support to display trailers as part of contents
64
- - pretty: add %(trailers) format for displaying trailers of a commit message
65
-
66
-
67
-* jt/trailer-with-cruft (2016-11-21) 1 commit
68
- - doc: mention user-configured trailers
69
-
70
-
71
-* sb/submodule-intern-gitdir (2016-11-21) 3 commits
72
- - submodule--helper: add intern-git-dir function
73
- - test-lib-functions.sh: teach test_commit -C <dir>
74
- - submodule: use absolute path for computing relative path connecting
75
-
76
---------------------------------------------------
77
-[Graduated to "master"]
78
-
79
-* jk/create-branch-remove-unused-param (2016-11-09) 1 commit
80
- (merged to 'next' on 2016-11-16 at 621254c832)
81
- + create_branch: drop unused "head" parameter
82
-
83
- Code clean-up.
84
-
74
+* bw/push-dry-run (2016-11-23) 2 commits
75
+ - push: fix --dry-run to not push submodules
76
+ - push: --dry-run updates submodules when --recurse-submodules=on-demand
77
+ (this branch uses hv/submodule-not-yet-pushed-fix.)
78
86
-* nd/worktree-lock (2016-11-13) 1 commit
87
- (merged to 'next' on 2016-11-16 at 67b731de07)
88
- + git-worktree.txt: fix typo "to"/"two", and add comma
79
90
- Typofix.
80
+* jk/rev-parse-symbolic-parents-fix (2016-11-16) 1 commit
81
+ - rev-parse: fix parent shorthands with --symbolic
82
83
93
-* tk/diffcore-delta-remove-unused (2016-11-14) 1 commit
94
- (merged to 'next' on 2016-11-16 at 51e66c2fa7)
95
- + diffcore-delta: remove unused parameter to diffcore_count_changes()
96
-
97
- Code cleanup.
84
+* nd/worktree-list-fixup (2016-11-23) 3 commits
85
+ - worktree list: keep the list sorted
86
+ - get_worktrees() must return main worktree as first item even on error
87
+ - worktree.c: zero new 'struct worktree' on allocation
88
+ (this branch is used by nd/worktree-move.)
89
90
--------------------------------------------------
91
[Stalled]
@@ -196,6 +187,19 @@ of the repositories listed at
187
--------------------------------------------------
188
[Cooking]
189
190
+* jk/trailers-placeholder-in-pretty (2016-11-21) 2 commits
191
+ - ref-filter: add support to display trailers as part of contents
192
+ - pretty: add %(trailers) format for displaying trailers of a commit message
193
+
194
+
195
+* sb/submodule-intern-gitdir (2016-11-22) 5 commits
196
+ - SQUASH
197
+ - submodule: add embed-git-dir function
198
+ - test-lib-functions.sh: teach test_commit -C <dir>
199
+ - submodule helper: support super prefix
200
+ - submodule: use absolute path for computing relative path connecting
201
+
202
+
203
* dt/empty-submodule-in-merge (2016-11-17) 1 commit
204
- submodules: allow empty working-tree dirs in merge/cherry-pick
205
@@ -206,7 +210,7 @@ of the repositories listed at
210
Waiting for review.
211
212
209
-* bw/grep-recurse-submodules (2016-11-18) 6 commits
213
+* bw/grep-recurse-submodules (2016-11-22) 6 commits
214
- grep: search history of moved submodules
215
- grep: enable recurse-submodules to work on <tree> objects
216
- grep: optionally recurse into submodules
@@ -216,8 +220,6 @@ of the repositories listed at
220
221
"git grep" learns to optionally recurse into submodules
222
219
- Waiting for review.
220
-
223
224
* dt/smart-http-detect-server-going-away (2016-11-18) 2 commits
225
(merged to 'next' on 2016-11-21 at d502523347)
@@ -244,7 +246,7 @@ of the repositories listed at
246
Will cook in 'next'.
247
248
247
-* nd/worktree-move (2016-11-12) 11 commits
249
+* nd/worktree-move (2016-11-23) 11 commits
250
. worktree remove: new command
251
. worktree move: refuse to move worktrees with submodules
252
. worktree move: accept destination as directory
@@ -256,22 +258,24 @@ of the repositories listed at
258
. copy.c: convert bb_(p)error_msg to error(_errno)
259
. copy.c: delete unused code in copy_file()
260
. copy.c: import copy_file() from busybox
261
+ (this branch uses nd/worktree-list-fixup.)
262
263
"git worktree" learned move and remove subcommands.
264
262
- Waiting for a reroll.
263
- Seems to break a test or two.
265
+ Reported to break builds on Windows. Perhaps it should just spawn
266
+ "cp -R" or something.
267
268
269
* jc/compression-config (2016-11-15) 1 commit
267
- - compression: unify pack.compression configuration parsing
270
+ (merged to 'next' on 2016-11-23 at b3c9254897)
271
+ + compression: unify pack.compression configuration parsing
272
273
Compression setting for producing packfiles were spread across
274
three codepaths, one of which did not honor any configuration.
275
Unify these so that all of them honor core.compression and
276
pack.compression variables the same way.
277
274
- Needs tests for pack-objects and fast-import.
278
+ Will cook in 'next'.
279
280
281
* mm/gc-safety-doc (2016-11-16) 1 commit
@@ -289,6 +293,7 @@ of the repositories listed at
293
+ batch check whether submodule needs pushing into one call
294
+ serialize collection of refs that contain submodule changes
295
+ serialize collection of changed submodules
296
+ (this branch is used by bw/push-dry-run.)
297
298
The code in "git push" to compute if any commit being pushed in the
299
superproject binds a commit in a submodule that hasn't been pushed
@@ -382,12 +387,15 @@ of the repositories listed at
387
Perhaps we want to cover .gitmodules too with the same mechanism?
388
389
385
-* sb/submodule-config-cleanup (2016-11-02) 3 commits
386
- - submodule-config: clarify parsing of null_sha1 element
387
- - submodule-config: rename commit_sha1 to commit_or_tree
388
- - submodule config: inline config_from_{name, path}
390
+* sb/submodule-config-cleanup (2016-11-22) 3 commits
391
+ (merged to 'next' on 2016-11-23 at c02e578b49)
392
+ + submodule-config: clarify parsing of null_sha1 element
393
+ + submodule-config: rename commit_sha1 to treeish_name
394
+ + submodule config: inline config_from_{name, path}
395
390
- What's the doneness of this topic?
396
+ Minor code clean-up.
397
+
398
+ Will cook in 'next'.
399
400
401
* jc/push-default-explicit (2016-10-31) 2 commits
@@ -492,10 +500,9 @@ of the repositories listed at
500
single NUL, the blob will be handled as binary). The codepaths
501
have been optimized by using streaming interface.
502
495
- Waiting for review.
496
- The tip seems to do too much in a single commit and may be better split.
497
- cf. <20161012134724.28287-1-tboegi@web.de>
498
- cf. <xmqqd1il5w4e.fsf@gitster.mtv.corp.google.com>
503
+ Will discard.
504
+ Retracted.
505
+ cf. <20161102071646.GA5094@tb-raspi>
506
507
508
* pb/bisect (2016-10-18) 27 commits
@@ -625,7 +632,7 @@ of the repositories listed at
632
the wild in e-mail headers; replace them with "iso-8859-1" that is
633
more widely known when conversion fails from/to it.
634
628
- Will hold to see if people scream.
635
+ Will cook in 'next'.
636
637
638
* sg/fix-versioncmp-with-common-suffix (2016-09-08) 5 commits
@@ -662,8 +669,4 @@ of the repositories listed at
669
been deprecated since October 2007, and issues a deprecation
670
warning message since v2.5.0.
671
665
- It has been reported that git-gui still uses the deprecated syntax,
666
- which needs to be fixed before this final step can proceed.
667
- cf. <5671DB28.8020901@kdbg.org>
668
-
672
Will cook in 'next'.