What's cooking (2017/10 #06)
Junio C Hamano committed
Oct 27, 2017 at 14:36 UTC
ca00d43db8713112e018e727cfa24738f11fd61b
1 file changed
+188
-176
whats-cooking.txt
+188
-176
@@ -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, #05; Tue, 24)
4
-X-master-at: ba78f398be65e941b93276680f68a81075716472
5
-X-next-at: 2730555016ec4ac1303af3176e408a59149b4d11
3
+Subject: What's cooking in git.git (Oct 2017, #06; Fri, 27)
4
+X-master-at: 4e40fb302eacf4949f6b7d010fd5c11f1f652b7f
5
+X-next-at: caf49859d7a24ba95393b3d7850ab15d9a76e017
6
7
-What's cooking in git.git (Oct 2017, #05; Tue, 24)
7
+What's cooking in git.git (Oct 2017, #06; Fri, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -24,39 +24,149 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
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
27
+* mh/ref-locking-fix (2017-10-25) 2 commits
28
+ (merged to 'next' on 2017-10-26 at 1f1091ad64)
29
+ + files_transaction_prepare(): fix handling of ref lock failure
30
+ + t1404: add a bunch of tests of D/F conflicts
31
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.
32
+ Transactions to update multiple references that involves a deletion
33
+ was quite broken in an error codepath and did not abort everything
34
+ correctly.
35
36
+--------------------------------------------------
37
+[New Topics]
38
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
+* js/submodule-in-excluded (2017-10-26) 1 commit
40
+ (merged to 'next' on 2017-10-26 at 2a262e6a0b)
41
+ + status: do not get confused by submodules in excluded directories
42
40
- Doc update.
43
+ "git status --ignored -u" did not stop at a working tree of a
44
+ separate project that is embedded in an ignored directory and
45
+ listed files in that other project, instead of just showing the
46
+ directory itself as ignored.
47
+
48
+ Will cook in 'next'.
49
50
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
51
+* ao/path-use-xmalloc (2017-10-25) 1 commit
52
+ (merged to 'next' on 2017-10-26 at 4cc04083fb)
53
+ + path.c: use xmalloc() in add_to_trie()
54
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.
55
+ A possible oom error is now caught as a fatal error, instead of
56
+ continuing and dereferencing NULL.
57
58
+ Will merge to 'master'.
59
+
60
+
61
+* tb/complete-checkout (2017-10-25) 1 commit
62
+ (merged to 'next' on 2017-10-26 at beeaf5b00c)
63
+ + completion: add remaining flags to checkout
64
+
65
+ Command line completion (in contrib/) update.
66
+
67
+ Will cook in 'next'.
68
+
69
+
70
+* jc/ignore-cr-at-eol (2017-10-26) 2 commits
71
+ - diff: --ignore-cr-at-eol
72
+ - xdiff: reassign xpparm_t.flags bits
73
+
74
+ The "diff" family of commands learned to ignore differences in
75
+ carriage return at the end of line.
76
+
77
+ Just a lunch-time hack.
78
+ Lacks tests, docs and proper log message.
79
+
80
+
81
+* sb/diff-color-moved-use-xdl-recmatch (2017-10-26) 2 commits
82
+ (merged to 'next' on 2017-10-26 at 6711f24498)
83
+ + diff.c: get rid of duplicate implementation
84
+ + xdiff-interface: export comparing and hashing strings
85
+ (this branch uses jk/diff-color-moved-fix.)
86
+
87
+ Instead of using custom line comparison and hashing functions to
88
+ implement "moved lines" coloring in the diff output, use the pair
89
+ of these functions from lower-layer xdiff/ code.
90
+
91
+ Will cook in 'next'.
92
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'
93
56
- Doc updates.
94
+* jh/dir-add-exclude-from-blob (2017-10-27) 1 commit
95
+ - dir: allow exclusions from blob in addition to file
96
+
97
+ The code to read exclusion list from a blob, which is used when the
98
+ .gitignore file is outside a sparse checkout area, has been
99
+ refactored so that other codepath can later use it to do the same
100
+ outside the context of "sparse checkout".
101
+
102
+
103
+* mh/avoid-rewriting-packed-refs (2017-10-27) 2 commits
104
+ - files-backend: don't rewrite the `packed-refs` file unnecessarily
105
+ - t1409: check that `packed-refs` is not rewritten unnecessarily
106
+
107
+ Recent update to the refs infrastructure implementation started
108
+ rewriting packed-refs file more often than before; this has been
109
+ optimized again for most trivial cases.
110
+
111
+
112
+* sb/rev-parse-show-superproject-root (2017-10-27) 1 commit
113
+ (merged to 'next' on 2017-10-27 at f9a0520cec)
114
+ + docs: fix formatting of rev-parse's --show-superproject-working-tree
115
+
116
+ Doc markup fix.
117
+
118
+ Will merge to 'master'.
119
+
120
+
121
+* sg/rev-list-doc-reorder-fix (2017-10-27) 1 commit
122
+ (merged to 'next' on 2017-10-27 at caf49859d7)
123
+ + rev-list-options.txt: use correct directional reference
124
+
125
+ Doc flow fix.
126
+
127
+ Will merge to 'master'.
128
129
--------------------------------------------------
59
-[New Topics]
130
+[Stalled]
131
+
132
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
133
+ . zlib.c: use size_t for size
134
+
135
+ The wrapper to call into zlib followed our long tradition to use
136
+ "unsigned long" for sizes of regions in memory, which have been
137
+ updated to use "size_t".
138
+
139
+ Needs resurrecting by making sure the fix is good and still applies
140
+ (or adjusted to today's codebase).
141
+
142
+
143
+* mg/status-in-progress-info (2017-05-10) 2 commits
144
+ - status --short --inprogress: spell it as --in-progress
145
+ - status: show in-progress info for short status
146
+
147
+ "git status" learns an option to report various operations
148
+ (e.g. "merging") that the user is in the middle of.
149
+
150
+ cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
151
+
152
+
153
+* nd/worktree-move (2017-04-20) 6 commits
154
+ - worktree remove: new command
155
+ - worktree move: refuse to move worktrees with submodules
156
+ - worktree move: accept destination as directory
157
+ - worktree move: new command
158
+ - worktree.c: add update_worktree_location()
159
+ - worktree.c: add validate_worktree()
160
+
161
+ "git worktree" learned move and remove subcommands.
162
+
163
+ Expecting a reroll.
164
+ cf. <20170420101024.7593-1-pclouds@gmail.com>
165
+ cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
166
+ cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
167
+
168
+--------------------------------------------------
169
+[Cooking]
170
171
* cc/git-packet-pm (2017-10-22) 6 commits
172
- Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
@@ -77,46 +187,52 @@ of the repositories listed at
187
188
189
* 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
190
+ (merged to 'next' on 2017-10-26 at eb580e4c8c)
191
+ + diff: handle NULs in get_string_hash()
192
+ + diff: fix whitespace-skipping with --color-moved
193
+ + t4015: test the output of "diff --color-moved -b"
194
+ + t4015: check "negative" case for "-w --color-moved"
195
+ + t4015: refactor --color-moved whitespace test
196
+ (this branch is used by sb/diff-color-moved-use-xdl-recmatch.)
197
198
The experimental "color moved lines differently in diff output"
199
feature was buggy around "ignore whitespace changes" edges, whihch
200
has been corrected.
201
90
- What's the done-ness of this series? Are there still loose ends to
91
- be tied?
202
+ Will cook in 'next'.
203
+ Most of the fixes to the incorrectly implemented custom helpers
204
+ will go away with sb/diff-color-moved-use-xdl-recmatch topic.
205
206
207
* 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
208
+ (merged to 'next' on 2017-10-26 at c327b2ec2f)
209
+ + worktree: handle broken symrefs in find_shared_symref()
210
+ + log: handle broken HEAD in decoration check
211
+ + remote: handle broken symrefs
212
+ + test-ref-store: avoid passing NULL to printf
213
214
Some codepaths did not check for errors when asking what branch the
215
HEAD points at, which have been fixed.
216
103
- Will merge to 'next'.
217
+ Will cook in 'next'.
218
219
220
* ao/check-resolve-ref-unsafe-result (2017-10-21) 1 commit
107
- - commit: check result of resolve_ref_unsafe
221
+ (merged to 'next' on 2017-10-26 at 84302ab59a)
222
+ + commit: check result of resolve_ref_unsafe
223
224
"git commit", after making a commit, did not check for errors when
225
asking on what branch it made the commit, which has been correted.
226
112
- Will merge to 'next'.
227
+ Will cook in 'next'.
228
229
230
* 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
231
+ (merged to 'next' on 2017-10-26 at 5df1e2354f)
232
+ + status: test ignored modes
233
+ + status: document options to show matching ignored files
234
+ + status: report matching ignored and normal untracked
235
+ + status: add option to show ignored files differently
236
237
The set of paths output from "git status --ignored" was tied
238
closely with its "--untracked=<mode>" option, but now it can be
@@ -125,26 +241,28 @@ of the repositories listed at
241
mechanism can be handled differently from a directory that ends up
242
to be ignored only because all files in it are ignored.
243
128
- Will merge to 'next'.
244
+ Will cook in 'next'.
245
246
247
* mp/push-pushoption-config (2017-10-24) 1 commit
132
- - builtin/push.c: add push.pushOption config
248
+ (merged to 'next' on 2017-10-26 at 2c72164d12)
249
+ + builtin/push.c: add push.pushOption config
250
251
The "--push-option=<string>" option to "git push" now defaults to a
252
list of strings configured via push.pushOption variable.
253
137
- Will merge to 'next'.
254
+ Will cook in 'next'.
255
256
257
* gc/gitweb-filetest-acl (2017-10-24) 1 commit
141
- - gitweb: use filetest to allow ACLs
258
+ (merged to 'next' on 2017-10-26 at 5b490f53bf)
259
+ + gitweb: use filetest to allow ACLs
260
261
"gitweb" checks if a directory is searchable with Perl's "-x"
262
operator, which can be enhanced by using "filetest 'access'"
263
pragma, which now we do.
264
147
- Will merge to 'next'.
265
+ Will cook in 'next'.
266
267
268
* jr/ssh-wrappers (2017-10-24) 5 commits
@@ -163,56 +281,16 @@ of the repositories listed at
281
easier to diagnose connection errors.
282
283
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
284
+* tg/deprecate-stash-save (2017-10-27) 3 commits
285
+ (merged to 'next' on 2017-10-27 at 73b1edb73b)
286
+ + stash: remove now superfluos help for "stash push"
287
+ + stash: mark "git stash save" deprecated in the man page
288
+ + stash: replace "git stash save" with "git stash push" in the documentation
289
290
"git stash save" has been deprecated in favour of "git stash push".
291
173
- Will merge to 'next'.
174
-
175
---------------------------------------------------
176
-[Stalled]
177
-
178
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
179
- . zlib.c: use size_t for size
180
-
181
- The wrapper to call into zlib followed our long tradition to use
182
- "unsigned long" for sizes of regions in memory, which have been
183
- updated to use "size_t".
184
-
185
- Needs resurrecting by making sure the fix is good and still applies
186
- (or adjusted to today's codebase).
187
-
188
-
189
-* mg/status-in-progress-info (2017-05-10) 2 commits
190
- - status --short --inprogress: spell it as --in-progress
191
- - status: show in-progress info for short status
192
-
193
- "git status" learns an option to report various operations
194
- (e.g. "merging") that the user is in the middle of.
195
-
196
- cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
197
-
198
-
199
-* nd/worktree-move (2017-04-20) 6 commits
200
- - worktree remove: new command
201
- - worktree move: refuse to move worktrees with submodules
202
- - worktree move: accept destination as directory
203
- - worktree move: new command
204
- - worktree.c: add update_worktree_location()
205
- - worktree.c: add validate_worktree()
206
-
207
- "git worktree" learned move and remove subcommands.
208
-
209
- Expecting a reroll.
210
- cf. <20170420101024.7593-1-pclouds@gmail.com>
211
- cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
212
- cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
292
+ Will cook in 'next'.
293
214
---------------------------------------------------
215
-[Cooking]
294
295
* jc/check-ref-format-oor (2017-10-18) 3 commits
296
(merged to 'next' on 2017-10-18 at 8b17566c80)
@@ -253,10 +331,13 @@ of the repositories listed at
331
332
333
* np/config-path-doc (2017-10-19) 1 commit
256
- - config doc: clarify "git config --path" example
334
+ (merged to 'next' on 2017-10-26 at c17a3daafc)
335
+ + config doc: clarify "git config --path" example
336
337
Doc update.
338
339
+ Will merge to 'master'.
340
+
341
342
* jc/branch-name-sanity (2017-10-14) 3 commits
343
(merged to 'next' on 2017-10-16 at 174646d1c3)
@@ -303,11 +384,16 @@ of the repositories listed at
384
385
386
* hv/fetch-moved-submodules-on-demand (2017-10-17) 3 commits
306
- - submodule: simplify decision tree whether to or not to fetch
307
- - implement fetching of moved submodules
308
- - fetch: add test to make sure we stay backwards compatible
387
+ (merged to 'next' on 2017-10-26 at c446ea3e9a)
388
+ + submodule: simplify decision tree whether to or not to fetch
389
+ + implement fetching of moved submodules
390
+ + fetch: add test to make sure we stay backwards compatible
391
310
- Needs review.
392
+ "git fetch --recurse-submodules" now knows that submodules can be
393
+ moved around in the superproject in addition to getting updated,
394
+ and finds the ones that need to be fetched accordingly.
395
+
396
+ Will cook in 'next'.
397
398
399
* js/for-each-ref-remote-name-and-ref (2017-10-11) 3 commits
@@ -598,8 +684,9 @@ of the repositories listed at
684
685
686
* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
601
- - Documentation/checkout: clarify submodule HEADs to be detached
602
- - recursive submodules: detach HEAD from new state
687
+ (merged to 'next' on 2017-10-26 at 30994b4c76)
688
+ + Documentation/checkout: clarify submodule HEADs to be detached
689
+ + recursive submodules: detach HEAD from new state
690
691
"git checkout --recursive" may overwrite and rewind the history of
692
the branch that happens to be checked out in submodule
@@ -631,81 +718,6 @@ of the repositories listed at
718
--------------------------------------------------
719
[Discarded]
720
634
-* jc/ref-filter-colors-fix (2017-10-14) 2 commits
635
- . colors: git_default_config() does not read color.ui
636
- . Revert "color: check color.ui in git_default_config()"
637
-
638
- Recent tip of 'master' and 'maint' (at least as of v2.14.2) has a
639
- regression in "git add -p" for those who set ui.color=always in
640
- their configuration, caused by us being overly aggressive in
641
- allowing plumbing commands to honor the configuration to fix a
642
- fallout from an earlier change that made everybody, even the
643
- plumbing commands, to automatically color its output by default.
644
- Revert it for now from the released version (and to be released
645
- one) until we come up with a different fix to the problem.
646
-
647
-
648
-* jc/allow-lazy-cas (2017-07-06) 1 commit
649
- . push: disable lazy --force-with-lease by default
650
-
651
- Because "git push --force-with-lease[=<ref>]" that relies on the
652
- stability of remote-tracking branches is unsafe when something
653
- fetches into the repository behind user's back, it is now disabled
654
- by default. A new configuration variable can be used to enable it
655
- by users who know what they are doing. This would pave the way to
656
- possibly turn `--force` into `--force-with-lease`.
657
-
658
- Independent from disabling the feature by default, this stirred up
659
- a discussion to replace the DWIM heuristics with a better one, which
660
- deserves to be its own topic.
661
- cf. <alpine.DEB.2.21.1.1707131435220.4193@virtualbox>
662
-
663
-
664
-* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
665
- . Documentation/clone: document ignored configuration variables
666
- . clone: respect additional configured fetch refspecs during initial fetch
667
- (this branch is used by sg/remote-no-string-refspecs.)
668
-
669
- "git clone -c var=val" is a way to set configuration variables in
670
- the resulting repository, but it is more useful to also make these
671
- variables take effect while the initial clone is happening,
672
- e.g. these configuration variables could be fetch refspecs.
673
-
674
- Got tired of waiting for a response.
675
- cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>
676
- cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>
677
-
678
-
679
-* rs/sha1-file-micro-optim (2017-07-09) 2 commits
680
- . SQUASH???
681
- . sha1_file: add slash once in for_each_file_in_obj_subdir()
682
-
683
- Code cleanup.
684
-
685
- Perhaps drop.
686
- cf. <f59c8256-716b-9305-2a4f-d4fe49f666ff@web.de>
687
-
688
-
689
-* mg/merge-pre-merge-hook (2017-09-24) 4 commits
690
- . t7503: add tests for pre-merge-hook
691
- . merge: --no-verify to bypass pre-merge hook
692
- . merge: do no-verify like commit
693
- . git-merge: honor pre-merge hook
694
-
695
- "git merge" learned a 'pre-merge' hook, that would be triggered
696
- before the merge commit is created by a clean auto-merge.
697
-
698
- What's the doneness of this? Is everybody happy?
699
-
700
-
701
-* jk/check-ref-format-oor-fix (2017-07-14) 1 commit
702
- . check-ref-format: require a repository for --branch
703
-
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
-
721
* jk/ui-color-always-to-auto-maint (2017-10-13) 2 commits
722
(merged to 'next' on 2017-10-13 at bb16e1edc8)
723
+ color: document that "git -c color.*=always" is a bit special