What's cooking (2017/10 #05)
Junio C Hamano committed
Oct 24, 2017 at 12:39 UTC
d2ae47346a3a142588f713db582d9c982ca541cf
1 file changed
+169
-99
whats-cooking.txt
+169
-99
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2017, #04; Thu, 19)
4
-X-master-at: 660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3
5
-X-next-at: 76aedb4517c834be2dc89efb5f9d15908e324422
3
+Subject: What's cooking in git.git (Oct 2017, #05; Tue, 24)
4
+X-master-at: ba78f398be65e941b93276680f68a81075716472
5
+X-next-at: 2730555016ec4ac1303af3176e408a59149b4d11
6
7
-What's cooking in git.git (Oct 2017, #04; Thu, 19)
7
+What's cooking in git.git (Oct 2017, #05; Tue, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-2.15-rc2 has slipped and will be tagged tomorrow. Expect the final
16
-near the end of the month.
17
-
15
The topics that are cooking in 'next' that are not urgent fixes are
16
classified as "Will cook in 'next'", and will not graduate to
17
'master' until the final.
@@ -27,117 +24,153 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
30
-* jc/doc-checkout (2017-10-11) 1 commit
31
- (merged to 'next' on 2017-10-13 at c000f4bd84)
32
- + checkout doc: clarify command line args for "checkout paths" mode
27
+* dg/filter-branch-filter-order-doc (2017-10-18) 1 commit
28
+ (merged to 'next' on 2017-10-18 at 46c92e5949)
29
+ + doc: list filter-branch subdirectory-filter first
30
34
- Doc update.
31
+ Update the documentation for "git filter-branch" so that the filter
32
+ options are listed in the same order as they are applied, as
33
+ described in an earlier part of the doc.
34
35
37
-* jk/ref-filter-colors-fix (2017-10-17) 5 commits
38
- (merged to 'next' on 2017-10-17 at d87a6bf270)
39
- + tag: respect color.ui config
40
- + Revert "color: check color.ui in git_default_config()"
41
- + Revert "t6006: drop "always" color config tests"
42
- + Revert "color: make "always" the same as "auto" in config"
43
- + Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filter-colors-fix-maint
36
+* jc/branch-force-doc-readability-fix (2017-10-18) 1 commit
37
+ (merged to 'next' on 2017-10-18 at 4ef4b064eb)
38
+ + branch doc: sprinkle a few commas for readability
39
45
- This is the "theoretically more correct" approach of simply
46
- stepping back to the state before plumbing commands started paying
47
- attention to "color.ui" configuration variable.
40
+ Doc update.
41
42
50
-* js/rebase-i-final (2017-10-18) 2 commits
51
- (merged to 'next' on 2017-10-18 at 0bcaefbd55)
52
- + sequencer.c: unify an error message
53
- (merged to 'next' on 2017-10-16 at 72362f5f9c)
54
- + sequencer.c: fix and unify error messages in rearrange_squash()
43
+* jc/fetch-refspec-doc-update (2017-10-18) 1 commit
44
+ (merged to 'next' on 2017-10-18 at ac77e57f59)
45
+ + fetch doc: src side of refspec could be full SHA-1
46
56
- Error message fix.
47
+ "git fetch <there> <src>:<dst>" allows an object name on the <src>
48
+ side when the other side accepts such a request since Git v2.5, but
49
+ the documentation was left stale.
50
51
59
-* sb/diff-color-move (2017-10-16) 1 commit
60
- (merged to 'next' on 2017-10-16 at 69de1bad9d)
61
- + diff: fix infinite loop with --color-moved --ignore-space-change
52
+* wk/merge-options-gpg-sign-doc (2017-10-12) 1 commit
53
+ (merged to 'next' on 2017-10-16 at ae61d824da)
54
+ + Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
55
63
- A recently added "--color-moved" feature of "diff" fell into
64
- infinite loop when ignoring whitespace changes, which has been
65
- fixed.
56
+ Doc updates.
57
58
--------------------------------------------------
59
[New Topics]
60
70
-* jc/check-ref-format-oor (2017-10-18) 3 commits
71
- (merged to 'next' on 2017-10-18 at 8b17566c80)
72
- + check-ref-format doc: --branch validates and expands <branch>
73
- + check-ref-format --branch: strip refs/heads/ using skip_prefix
74
- + check-ref-format --branch: do not expand @{...} outside repository
61
+* cc/git-packet-pm (2017-10-22) 6 commits
62
+ - Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
63
+ - t0021/rot13-filter: add capability functions
64
+ - t0021/rot13-filter: add packet_initialize()
65
+ - t0021/rot13-filter: improve error message
66
+ - t0021/rot13-filter: improve 'if .. elsif .. else' style
67
+ - t0021/rot13-filter: refactor packet reading functions
68
76
- "git check-ref-format --branch @{-1}" bit a "BUG()" when run
77
- outside a repository for obvious reasons; clarify the documentation
78
- and make sure we do not even try to expand the at-mark magic in
79
- such a case, but still call the validation logic for branch names.
69
+ Parts of a test to drive the long-running content filter interface
70
+ has been split into its own module, hopefully to eventually become
71
+ reusable.
72
81
- Will cook in 'next'.
73
+ Expecting a reroll.
74
+ The original unfortunately is quite broken in error detection
75
+ cases to make the result sub-par as a standalone module before it
76
+ gets fixed.
77
78
84
-* jc/fetch-refspec-doc-update (2017-10-18) 1 commit
85
- (merged to 'next' on 2017-10-18 at ac77e57f59)
86
- + fetch doc: src side of refspec could be full SHA-1
79
+* jk/diff-color-moved-fix (2017-10-21) 5 commits
80
+ - diff: handle NULs in get_string_hash()
81
+ - diff: fix whitespace-skipping with --color-moved
82
+ - t4015: test the output of "diff --color-moved -b"
83
+ - t4015: check "negative" case for "-w --color-moved"
84
+ - t4015: refactor --color-moved whitespace test
85
88
- "git fetch <there> <src>:<dst>" allows an object name on the <src>
89
- side when the other side accepts such a request since Git v2.5, but
90
- the documentation was left stale.
86
+ The experimental "color moved lines differently in diff output"
87
+ feature was buggy around "ignore whitespace changes" edges, whihch
88
+ has been corrected.
89
92
- Will merge to 'master'.
90
+ What's the done-ness of this series? Are there still loose ends to
91
+ be tied?
92
93
95
-* kd/auto-col-with-pager-fix (2017-10-17) 1 commit
96
- (merged to 'next' on 2017-10-18 at fe89ff7e83)
97
- + column: show auto columns when pager is active
94
+* jk/misc-resolve-ref-unsafe-fixes (2017-10-21) 4 commits
95
+ - worktree: handle broken symrefs in find_shared_symref()
96
+ - log: handle broken HEAD in decoration check
97
+ - remote: handle broken symrefs
98
+ - test-ref-store: avoid passing NULL to printf
99
99
- "auto" as a value for the columnar output configuration ought to
100
- judge "is the output consumed by humans?" with the same criteria as
101
- "auto" for coloured output configuration, i.e. either the standard
102
- output stream is going to tty, or a pager is in use. We forgot the
103
- latter, which has been fixed.
100
+ Some codepaths did not check for errors when asking what branch the
101
+ HEAD points at, which have been fixed.
102
105
- Will cook in 'next'.
103
+ Will merge to 'next'.
104
105
108
-* jc/t5601-copy-workaround (2017-10-17) 1 commit
109
- (merged to 'next' on 2017-10-18 at ea1e133968)
110
- + t5601: rm the target file of cp that could still be executing
106
+* ao/check-resolve-ref-unsafe-result (2017-10-21) 1 commit
107
+ - commit: check result of resolve_ref_unsafe
108
112
- A (possibly flakey) test fix.
109
+ "git commit", after making a commit, did not check for errors when
110
+ asking on what branch it made the commit, which has been correted.
111
114
- Will cook in 'next'.
112
+ Will merge to 'next'.
113
114
117
-* dg/filter-branch-filter-order-doc (2017-10-18) 1 commit
118
- (merged to 'next' on 2017-10-18 at 46c92e5949)
119
- + doc: list filter-branch subdirectory-filter first
115
+* jm/status-ignored-files-list (2017-10-24) 4 commits
116
+ - status: test ignored modes
117
+ - status: document options to show matching ignored files
118
+ - status: report matching ignored and normal untracked
119
+ - status: add option to show ignored files differently
120
121
- Update the documentation for "git filter-branch" so that the filter
122
- options are listed in the same order as they are applied, as
123
- described in an earlier part of the doc.
121
+ The set of paths output from "git status --ignored" was tied
122
+ closely with its "--untracked=<mode>" option, but now it can be
123
+ controlled more flexibly. Most notably, a directory that is
124
+ ignored because it is listed to be ignored in the ignore/exclude
125
+ mechanism can be handled differently from a directory that ends up
126
+ to be ignored only because all files in it are ignored.
127
125
- Will merge to 'master'.
128
+ Will merge to 'next'.
129
130
128
-* jc/branch-force-doc-readability-fix (2017-10-18) 1 commit
129
- (merged to 'next' on 2017-10-18 at 4ef4b064eb)
130
- + branch doc: sprinkle a few commas for readability
131
+* mp/push-pushoption-config (2017-10-24) 1 commit
132
+ - builtin/push.c: add push.pushOption config
133
132
- Doc update.
134
+ The "--push-option=<string>" option to "git push" now defaults to a
135
+ list of strings configured via push.pushOption variable.
136
134
- Will merge to 'master'.
137
+ Will merge to 'next'.
138
139
137
-* np/config-path-doc (2017-10-19) 1 commit
138
- - config doc: clarify "git config --path" example
140
+* gc/gitweb-filetest-acl (2017-10-24) 1 commit
141
+ - gitweb: use filetest to allow ACLs
142
140
- Doc update.
143
+ "gitweb" checks if a directory is searchable with Perl's "-x"
144
+ operator, which can be enhanced by using "filetest 'access'"
145
+ pragma, which now we do.
146
+
147
+ Will merge to 'next'.
148
+
149
+
150
+* jr/ssh-wrappers (2017-10-24) 5 commits
151
+ - ssh: 'simple' variant does not support --port
152
+ - ssh: 'simple' variant does not support -4/-6
153
+ - ssh: 'auto' variant to select between 'ssh' and 'simple'
154
+ - connect: split ssh command line options into separate function
155
+ - connect: split git:// setup into a separate function
156
+ (this branch uses bw/protocol-v1.)
157
+
158
+ The ssh-variant 'simple' introduced earlier broke existing
159
+ installations by not passing --port/-4/-6 and not diagnosing an
160
+ attempt to pass these as an error. Instead, default to
161
+ automatically detect how compatible the GIT_SSH/GIT_SSH_COMMAND is
162
+ to OpenSSH convention and then error out an invocation to make it
163
+ easier to diagnose connection errors.
164
+
165
+
166
+* tg/deprecate-stash-save (2017-10-23) 3 commits
167
+ - stash: remove now superfluos help for "stash push"
168
+ - mark git stash push deprecated in the man page
169
+ - replace git stash save with git stash push in the documentation
170
+
171
+ "git stash save" has been deprecated in favour of "git stash push".
172
+
173
+ Will merge to 'next'.
174
175
--------------------------------------------------
176
[Stalled]
@@ -181,17 +214,48 @@ of the repositories listed at
214
--------------------------------------------------
215
[Cooking]
216
184
-* jk/ui-color-always-to-auto-maint (2017-10-13) 2 commits
185
- (merged to 'next' on 2017-10-13 at bb16e1edc8)
186
- + color: document that "git -c color.*=always" is a bit special
187
- + color: downgrade "always" to "auto" only for on-disk configuration
217
+* jc/check-ref-format-oor (2017-10-18) 3 commits
218
+ (merged to 'next' on 2017-10-18 at 8b17566c80)
219
+ + check-ref-format doc: --branch validates and expands <branch>
220
+ + check-ref-format --branch: strip refs/heads/ using skip_prefix
221
+ + check-ref-format --branch: do not expand @{...} outside repository
222
189
- It turns out that "git -c color.ui=always cmd" is relied on by many
190
- third-party tools as a way to force coloured output no matter what
191
- the end-user configuration is, and a recent attempt to downgrade
192
- 'always' to 'auto' to fix the regression to "git add -p" broke it.
223
+ "git check-ref-format --branch @{-1}" bit a "BUG()" when run
224
+ outside a repository for obvious reasons; clarify the documentation
225
+ and make sure we do not even try to expand the at-mark magic in
226
+ such a case, but still call the validation logic for branch names.
227
194
- This has been reverted from 'next'.
228
+ Will cook in 'next'.
229
+
230
+
231
+* kd/auto-col-with-pager-fix (2017-10-24) 2 commits
232
+ (merged to 'next' on 2017-10-24 at ef3ff0f14b)
233
+ + column: do not include pager.c
234
+ (merged to 'next' on 2017-10-18 at fe89ff7e83)
235
+ + column: show auto columns when pager is active
236
+
237
+ "auto" as a value for the columnar output configuration ought to
238
+ judge "is the output consumed by humans?" with the same criteria as
239
+ "auto" for coloured output configuration, i.e. either the standard
240
+ output stream is going to tty, or a pager is in use. We forgot the
241
+ latter, which has been fixed.
242
+
243
+ Will cook in 'next'.
244
+
245
+
246
+* jc/t5601-copy-workaround (2017-10-17) 1 commit
247
+ (merged to 'next' on 2017-10-18 at ea1e133968)
248
+ + t5601: rm the target file of cp that could still be executing
249
+
250
+ A (possibly flakey) test fix.
251
+
252
+ Will cook in 'next'.
253
+
254
+
255
+* np/config-path-doc (2017-10-19) 1 commit
256
+ - config doc: clarify "git config --path" example
257
+
258
+ Doc update.
259
260
261
* jc/branch-name-sanity (2017-10-14) 3 commits
@@ -217,15 +281,6 @@ of the repositories listed at
281
Will cook in 'next'.
282
283
220
-* wk/merge-options-gpg-sign-doc (2017-10-12) 1 commit
221
- (merged to 'next' on 2017-10-16 at ae61d824da)
222
- + Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
223
-
224
- Doc updates.
225
-
226
- Will merge to 'master'.
227
-
228
-
284
* wk/pull-signoff (2017-10-13) 1 commit
285
(merged to 'next' on 2017-10-16 at 5e48f349d9)
286
+ pull: pass --signoff/--no-signoff to "git merge"
@@ -265,7 +320,7 @@ of the repositories listed at
320
that is affected for 'upstream' and 'push' via "%(push:remotename)"
321
and friends.
322
268
- Needs a bit more work on the documentation part?
323
+ Needs a bit more work on the documentation part.
324
325
326
* pb/bisect-helper (2017-10-06) 6 commits
@@ -498,6 +553,7 @@ of the repositories listed at
553
+ protocol: introduce protocol extension mechanisms
554
+ pkt-line: add packet_write function
555
+ connect: in ref advertisement, shallows are last
556
+ (this branch is used by jr/ssh-wrappers.)
557
558
A new mechanism to upgrade the wire protocol in place is proposed
559
and demonstrated that it works with the older versions of Git
@@ -524,8 +580,9 @@ of the repositories listed at
580
- setup: expose enumerated repo info
581
- Merge branch 'bc/vcs-svn-cleanup' into bc/hash-algo
582
527
- RFC
583
+ Expecting a reroll.
584
cf. <20170821000022.26729-1-sandals@crustytoothpaste.net>
585
+ cf. <20171017013405.swzjqc3rwvqjfkov@genre.crustytoothpaste.net>
586
587
588
* jk/drop-ancient-curl (2017-08-09) 5 commits
@@ -647,3 +704,16 @@ of the repositories listed at
704
Discussion slowly continued but then stalled.
705
cf. <20170717172709.GL93855@aiede.mtv.corp.google.com>
706
cf. <20170817102217.3yw7uxnkupdy3lh5@sigill.intra.peff.net>
707
+
708
+
709
+* jk/ui-color-always-to-auto-maint (2017-10-13) 2 commits
710
+ (merged to 'next' on 2017-10-13 at bb16e1edc8)
711
+ + color: document that "git -c color.*=always" is a bit special
712
+ + color: downgrade "always" to "auto" only for on-disk configuration
713
+
714
+ It turns out that "git -c color.ui=always cmd" is relied on by many
715
+ third-party tools as a way to force coloured output no matter what
716
+ the end-user configuration is, and a recent attempt to downgrade
717
+ 'always' to 'auto' to fix the regression to "git add -p" broke it.
718
+
719
+ This has been reverted from 'next'.