Skip to content

Commit 5a69c40

Browse files
committed
What's cooking (2016/11 #02)
1 parent 714e1af commit 5a69c40

File tree

1 file changed

+101
-64
lines changed

1 file changed

+101
-64
lines changed

whats-cooking.txt

Lines changed: 101 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
To: git@vger.kernel.org
22
Bcc: lwn@lwn.net
3-
Subject: What's cooking in git.git (Nov 2016, #01; Wed, 9)
4-
X-master-at: be5a750939c212bc0781ffa04fabcfd2b2bd744e
5-
X-next-at: f7463a1abc93dbed4ef482f037d1daa4a172805e
3+
Subject: What's cooking in git.git (Nov 2016, #02; Fri, 11)
4+
X-master-at: 3ab228137f980ff72dbdf5064a877d07bec76df9
5+
X-next-at: 34139e250de0af9c58221e12bf5da2af593901ac
66

7-
What's cooking in git.git (Nov 2016, #01; Wed, 9)
7+
What's cooking in git.git (Nov 2016, #02; Fri, 11)
88
--------------------------------------------------
99

1010
Here are the topics that have been cooking. Commits prefixed with
1111
'-' are only in 'pu' (proposed updates) while commits prefixed with
1212
'+' are in 'next'. The ones marked with '.' do not appear in any of
1313
the integration branches, but I am still holding onto them.
1414

15-
Hopefully 2.11-rc1 can be tagged by the end of the week. Sorry for
16-
the delay (and thanks for great help from y'all, especially Peff).
15+
v2.11-rc1 has been tagged. There might be a few updates necessary
16+
that remains due to timezone differences, but hopefully this should
17+
be good enough base. Thanks y'all for finding and fixing these
18+
platform specific bits.
1719

1820
You can find the changes described here in the integration branches
1921
of the repositories listed at
@@ -23,35 +25,20 @@ of the repositories listed at
2325
--------------------------------------------------
2426
[Graduated to "master"]
2527

26-
* cc/split-index-typofix (2016-11-01) 1 commit
27-
- split-index: s/eith/with/ typo fix
28-
29-
Typofix in a comment in code
30-
31-
32-
* jk/no-looking-at-dotgit-outside-repo (2016-11-01) 1 commit
33-
- sha1_name: make wraparound of the index into ring-buffer explicit
34-
35-
A small code cleanup.
36-
37-
38-
* rs/cocci (2016-11-01) 1 commit
39-
- cocci: avoid self-references in object_id transformations
40-
41-
Improve the rule to convert "unsigned char [20]" into "struct
42-
object_id *" in contrib/coccinelle/
43-
44-
--------------------------------------------------
45-
[New Topics]
46-
47-
* as/merge-attr-sleep (2016-11-08) 1 commit
28+
* as/merge-attr-sleep (2016-11-11) 6 commits
29+
(merged to 'next' on 2016-11-11 at abb2ee960d)
30+
+ t6026: clarify the point of "kill $(cat sleep.pid)"
31+
(merged to 'next' on 2016-11-10 at 93666a6dc2)
32+
+ t6026: ensure that long-running script really is
33+
+ Revert "t6026-merge-attr: don't fail if sleep exits early"
34+
+ Revert "t6026-merge-attr: ensure that the merge driver was called"
35+
(merged to 'next' on 2016-11-10 at ed4623bafd)
36+
+ t6026-merge-attr: ensure that the merge driver was called
4837
(merged to 'next' on 2016-11-09 at 17fbe796e6)
4938
+ t6026-merge-attr: don't fail if sleep exits early
5039

5140
Fix for a racy false-positive test failure.
5241

53-
Will merge to 'master'.
54-
5542

5643
* jk/alt-odb-cleanup (2016-11-08) 1 commit
5744
(merged to 'next' on 2016-11-09 at f7463a1abc)
@@ -60,8 +47,6 @@ of the repositories listed at
6047
Fix a corner-case regression in a topic that graduated during the
6148
v2.11 cycle.
6249

63-
Will merge to 'master'.
64-
6550

6651
* jk/filter-process-fix (2016-11-02) 4 commits
6752
(merged to 'next' on 2016-11-09 at 535b4f4de9)
@@ -72,50 +57,80 @@ of the repositories listed at
7257

7358
Test portability improvements and cleanups for t0021.
7459

75-
Will merge to 'master'.
76-
7760

7861
* js/prepare-sequencer (2016-11-08) 1 commit
79-
- sequencer: silence -Wtautological-constant-out-of-range-compare
62+
(merged to 'next' on 2016-11-10 at 91f76470d1)
63+
+ sequencer: silence -Wtautological-constant-out-of-range-compare
8064

8165
Silence a clang warning introduced by a recently graduated topic.
8266

83-
Will merge to 'master'.
8467

68+
* js/pwd-var-vs-pwd-cmd-fix (2016-11-11) 1 commit
69+
(merged to 'next' on 2016-11-11 at 1bf8501637)
70+
+ t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables
8571

86-
* ls/filter-process (2016-11-08) 2 commits
87-
(merged to 'next' on 2016-11-09 at 7d217ebb5e)
88-
+ t0021: compute file size with a single process instead of a pipeline
89-
+ t0021: expect more variations in the output of uniq -c
72+
Last minute fixes to two fixups merged to 'master' recently.
73+
74+
75+
* ls/filter-process (2016-11-11) 1 commit
76+
(merged to 'next' on 2016-11-11 at 2140b6d4ce)
77+
+ t0021: remove debugging cruft
9078

9179
Test portability improvements and optimization for an
9280
already-graduated topic.
9381

94-
Will merge to 'master'.
9582

83+
* ls/macos-update (2016-11-10) 2 commits
84+
(merged to 'next' on 2016-11-10 at b7fdaf4b98)
85+
+ travis-ci: disable GIT_TEST_HTTPD for macOS
86+
+ Makefile: set NO_OPENSSL on macOS by default
9687

97-
* jc/retire-compaction-heuristics (2016-11-02) 3 commits
98-
- SQUASH???
99-
- SQUASH???
100-
- diff: retire the original experimental "compaction" heuristics
88+
Portability update and workaround for builds on recent Mac OS X.
10189

10290

103-
* jc/abbrev-autoscale-config (2016-11-01) 1 commit
104-
- config.abbrev: document the new default that auto-scales
91+
* ps/common-info-doc (2016-11-11) 1 commit
92+
(merged to 'next' on 2016-11-11 at 9300ea9190)
93+
+ doc: fix location of 'info/' with $GIT_COMMON_DIR
10594

95+
Doc fix.
10696

107-
* jk/nofollow-attr-ignore (2016-11-02) 5 commits
108-
- exclude: do not respect symlinks for in-tree .gitignore
109-
- attr: do not respect symlinks for in-tree .gitattributes
110-
- exclude: convert "check_index" into a flags field
111-
- attr: convert "macro_ok" into a flags field
112-
- add open_nofollow() helper
11397

98+
* rt/fetch-pack-error-message-fix (2016-11-11) 1 commit
99+
(merged to 'next' on 2016-11-11 at 6fd41c83fe)
100+
+ fetch-pack.c: correct command at the beginning of an error message
114101

115-
* sb/submodule-config-cleanup (2016-11-02) 3 commits
116-
- submodule-config: clarify parsing of null_sha1 element
117-
- submodule-config: rename commit_sha1 to commit_or_tree
118-
- submodule config: inline config_from_{name, path}
102+
An error message in fetch-pack executable that was newly marked for
103+
translation was misspelt, which has been fixed.
104+
105+
--------------------------------------------------
106+
[New Topics]
107+
108+
* bw/transport-protocol-policy (2016-11-09) 2 commits
109+
- transport: add protocol policy config option
110+
- lib-proto-disable: variable name fix
111+
112+
Finer-grained control of what protocols are allowed for transports
113+
during clone/fetch/push have been enabled via a new configuration
114+
mechanism.
115+
116+
Will merge to 'next'.
117+
118+
119+
* jk/create-branch-remove-unused-param (2016-11-09) 1 commit
120+
- create_branch: drop unused "head" parameter
121+
122+
Code clean-up.
123+
124+
Will merge to 'next'.
125+
126+
127+
* jt/fetch-no-redundant-tag-fetch-map (2016-11-11) 1 commit
128+
- fetch: do not redundantly calculate tag refmap
129+
130+
Code cleanup to avoid using redundant refspecs while fetching with
131+
the --tags option.
132+
133+
Will merge to 'next'.
119134

120135
--------------------------------------------------
121136
[Stalled]
@@ -258,6 +273,30 @@ of the repositories listed at
258273
--------------------------------------------------
259274
[Cooking]
260275

276+
* jc/retire-compaction-heuristics (2016-11-02) 3 commits
277+
- SQUASH???
278+
- SQUASH???
279+
- diff: retire the original experimental "compaction" heuristics
280+
281+
282+
* jc/abbrev-autoscale-config (2016-11-01) 1 commit
283+
- config.abbrev: document the new default that auto-scales
284+
285+
286+
* jk/nofollow-attr-ignore (2016-11-02) 5 commits
287+
- exclude: do not respect symlinks for in-tree .gitignore
288+
- attr: do not respect symlinks for in-tree .gitattributes
289+
- exclude: convert "check_index" into a flags field
290+
- attr: convert "macro_ok" into a flags field
291+
- add open_nofollow() helper
292+
293+
294+
* sb/submodule-config-cleanup (2016-11-02) 3 commits
295+
- submodule-config: clarify parsing of null_sha1 element
296+
- submodule-config: rename commit_sha1 to commit_or_tree
297+
- submodule config: inline config_from_{name, path}
298+
299+
261300
* jc/push-default-explicit (2016-10-31) 2 commits
262301
(merged to 'next' on 2016-11-01 at 8dc3a6cf25)
263302
+ push: test pushing ambiguously named branches
@@ -267,7 +306,7 @@ of the repositories listed at
267306
specified refspec to perform 'current', 'simple', or 'upstream'
268307
push, causing unnecessary "ambiguous ref" errors.
269308

270-
Will hold.
309+
Will cook in 'next'.
271310

272311

273312
* jt/use-trailer-api-in-commands (2016-11-02) 6 commits
@@ -407,18 +446,16 @@ of the repositories listed at
407446
cf. <20161007210721.20437-1-santiago@nyu.edu>
408447

409448

410-
* sb/attr (2016-11-09) 38 commits
449+
* sb/attr (2016-11-11) 35 commits
411450
- completion: clone can initialize specific submodules
412451
- clone: add --init-submodule=<pathspec> switch
413-
- SQUASH to: submodule update: add `--init-default-path` switch
414452
- submodule update: add `--init-default-path` switch
415453
- pathspec: allow escaped query values
416454
- pathspec: allow querying for attributes
417455
- pathspec: move prefix check out of the inner loop
418456
- pathspec: move long magic parsing out of prefix_pathspec
419457
- Documentation: fix a typo
420458
- attr: keep attr stack for each check
421-
- SQUASH???
422459
- attr: convert to new threadsafe API
423460
- attr: make git_check_attr_counted static
424461
- attr.c: outline the future plans by heavily commenting
@@ -430,7 +467,6 @@ of the repositories listed at
430467
- attr.c: add push_stack() helper
431468
- attr: support quoting pathname patterns in C style
432469
- attr: expose validity check for attribute names
433-
- attr: add counted string version of git_attr()
434470
- attr: add counted string version of git_check_attr()
435471
- attr: retire git_check_attrs() API
436472
- attr: convert git_check_attrs() callers to use the new API
@@ -455,8 +491,9 @@ of the repositories listed at
455491
Waiting for review.
456492

457493

458-
* va/i18n-perl-scripts (2016-10-20) 14 commits
494+
* va/i18n-perl-scripts (2016-11-11) 16 commits
459495
- i18n: difftool: mark warnings for translation
496+
- i18n: send-email: mark composing message for translation
460497
- i18n: send-email: mark string with interpolation for translation
461498
- i18n: send-email: mark warnings and errors for translation
462499
- i18n: send-email: mark strings for translation
@@ -470,11 +507,11 @@ of the repositories listed at
470507
- i18n: add--interactive: mark strings with interpolation for translation
471508
- i18n: add--interactive: mark simple here-documents for translation
472509
- i18n: add--interactive: mark strings for translation
510+
- Git.pm: add subroutines for commenting lines
473511

474512
Porcelain scripts written in Perl are getting internationalized.
475513

476514
Waiting for review.
477-
cf. <20161010125449.7929-1-vascomalmeida@sapo.pt>
478515

479516

480517
* jc/latin-1 (2016-09-26) 2 commits

0 commit comments

Comments
 (0)