What's cooking (2016/11 #03)
Junio C Hamano committed
Nov 16, 2016 at 14:06 UTC
c0d2cbbc5c861e710d52c13690be5f8934bf4473
1 file changed
+141
-123
whats-cooking.txt
+141
-123
@@ -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, #02; Fri, 11)
3
+Subject: What's cooking in git.git (Nov 2016, #03; Wed, 16)
4
X-master-at: 3ab228137f980ff72dbdf5064a877d07bec76df9
5
-X-next-at: 34139e250de0af9c58221e12bf5da2af593901ac
5
+X-next-at: 51e66c2fa76b5b5131e8804974eee02d13e08b0f
6
7
-What's cooking in git.git (Nov 2016, #02; Fri, 11)
7
+What's cooking in git.git (Nov 2016, #03; Wed, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,144 +12,112 @@ 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
-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.
19
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
26
-[Graduated to "master"]
21
+[New Topics]
22
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
37
- (merged to 'next' on 2016-11-09 at 17fbe796e6)
38
- + t6026-merge-attr: don't fail if sleep exits early
23
+* dt/empty-submodule-in-merge (2016-11-12) 1 commit
24
+ - submodules: allow empty working-tree dirs in merge/cherry-pick
25
40
- Fix for a racy false-positive test failure.
26
+ An empty directory in a working tree that can simply be nuked used
27
+ to interfere while merging or cherry-picking a change to create a
28
+ submodule directory there, which has been fixed..
29
30
43
-* jk/alt-odb-cleanup (2016-11-08) 1 commit
44
- (merged to 'next' on 2016-11-09 at f7463a1abc)
45
- + alternates: re-allow relative paths from environment
31
+* bw/grep-recurse-submodules (2016-11-14) 6 commits
32
+ - grep: search history of moved submodules
33
+ - grep: enable recurse-submodules to work on <tree> objects
34
+ - grep: optionally recurse into submodules
35
+ - grep: add submodules as a grep source type
36
+ - submodules: load gitmodules file from commit sha1
37
+ - submodules: add helper functions to determine presence of submodules
38
47
- Fix a corner-case regression in a topic that graduated during the
48
- v2.11 cycle.
39
+ "git grep" learns to optionally recurse into submodules
40
41
51
-* jk/filter-process-fix (2016-11-02) 4 commits
52
- (merged to 'next' on 2016-11-09 at 535b4f4de9)
53
- + t0021: fix filehandle usage on older perl
54
- + t0021: use $PERL_PATH for rot13-filter.pl
55
- + t0021: put $TEST_ROOT in $PATH
56
- + t0021: use write_script to create rot13 shell script
42
+* dt/smart-http-detect-server-going-away (2016-11-14) 2 commits
43
+ - upload-pack: optionally allow fetching any sha1
44
+ - remote-curl: don't hang when a server dies before any output
45
58
- Test portability improvements and cleanups for t0021.
46
+ When the http server gives an incomplete response to a smart-http
47
+ rpc call, it could lead to client waiting for a full response that
48
+ will never come. Teach the client side to notice this condition
49
+ and abort the transfer.
50
51
+ An improvement counterproposal exists.
52
+ cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net>
53
61
-* js/prepare-sequencer (2016-11-08) 1 commit
62
- (merged to 'next' on 2016-11-10 at 91f76470d1)
63
- + sequencer: silence -Wtautological-constant-out-of-range-compare
54
65
- Silence a clang warning introduced by a recently graduated topic.
55
+* mm/push-social-engineering-attack-doc (2016-11-14) 1 commit
56
+ (merged to 'next' on 2016-11-16 at b7c1b27563)
57
+ + doc: mention transfer data leaks in more places
58
59
+ Doc update on fetching and pushing.
60
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
61
+ Will cook in 'next'.
62
72
- Last minute fixes to two fixups merged to 'master' recently.
63
64
+* nd/worktree-lock (2016-11-13) 1 commit
65
+ (merged to 'next' on 2016-11-16 at 67b731de07)
66
+ + git-worktree.txt: fix typo "to"/"two", and add comma
67
75
-* ls/filter-process (2016-11-11) 1 commit
76
- (merged to 'next' on 2016-11-11 at 2140b6d4ce)
77
- + t0021: remove debugging cruft
68
+ Typofix.
69
79
- Test portability improvements and optimization for an
80
- already-graduated topic.
70
+ Will merge to 'master'.
71
72
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
73
+* nd/worktree-move (2016-11-12) 11 commits
74
+ . worktree remove: new command
75
+ . worktree move: refuse to move worktrees with submodules
76
+ . worktree move: accept destination as directory
77
+ . worktree move: new command
78
+ . worktree.c: add update_worktree_location()
79
+ . worktree.c: add validate_worktree()
80
+ . copy.c: convert copy_file() to copy_dir_recursively()
81
+ . copy.c: style fix
82
+ . copy.c: convert bb_(p)error_msg to error(_errno)
83
+ . copy.c: delete unused code in copy_file()
84
+ . copy.c: import copy_file() from busybox
85
88
- Portability update and workaround for builds on recent Mac OS X.
86
+ "git worktree" learned move and remove subcommands.
87
88
+ Seems to break a test or two.
89
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
90
95
- Doc fix.
91
+* tk/diffcore-delta-remove-unused (2016-11-14) 1 commit
92
+ (merged to 'next' on 2016-11-16 at 51e66c2fa7)
93
+ + diffcore-delta: remove unused parameter to diffcore_count_changes()
94
95
+ Code cleanup.
96
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
97
+ Will merge to 'master'.
98
102
- An error message in fetch-pack executable that was newly marked for
103
- translation was misspelt, which has been fixed.
99
105
---------------------------------------------------
106
-[New Topics]
100
+* jc/compression-config (2016-11-15) 1 commit
101
+ - compression: unify pack.compression configuration parsing
102
108
-* bw/transport-protocol-policy (2016-11-09) 2 commits
109
- - transport: add protocol policy config option
110
- - lib-proto-disable: variable name fix
103
+ Compression setting for producing packfiles were spread across
104
+ three codepaths, one of which did not honor any configuration.
105
+ Unify these so that all of them honor core.compression and
106
+ pack.compression variables the same way.
107
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.
108
+ Needs tests for pack-objects and fast-import.
109
116
- Will merge to 'next'.
110
111
+* mm/gc-safety-doc (2016-11-16) 1 commit
112
+ - git-gc.txt: expand discussion of races with other processes
113
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.
114
+ Doc update.
115
116
Will merge to 'next'.
117
118
--------------------------------------------------
119
[Stalled]
120
138
-* hv/submodule-not-yet-pushed-fix (2016-10-10) 3 commits
139
- - batch check whether submodule needs pushing into one call
140
- - serialize collection of refs that contain submodule changes
141
- - serialize collection of changed submodules
142
-
143
- The code in "git push" to compute if any commit being pushed in the
144
- superproject binds a commit in a submodule that hasn't been pushed
145
- out was overly inefficient, making it unusable even for a small
146
- project that does not have any submodule but have a reasonable
147
- number of refs.
148
-
149
- Waiting for review.
150
- cf. <cover.1475851621.git.hvoigt@hvoigt.net>
151
-
152
-
121
* sb/push-make-submodule-check-the-default (2016-10-10) 2 commits
122
- push: change submodule default to check when submodules exist
123
- submodule add: extend force flag to add existing repos
@@ -202,32 +170,6 @@ of the repositories listed at
170
this.
171
172
205
-* kn/ref-filter-branch-list (2016-05-17) 17 commits
206
- - branch: implement '--format' option
207
- - branch: use ref-filter printing APIs
208
- - branch, tag: use porcelain output
209
- - ref-filter: allow porcelain to translate messages in the output
210
- - ref-filter: add `:dir` and `:base` options for ref printing atoms
211
- - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
212
- - ref-filter: introduce symref_atom_parser() and refname_atom_parser()
213
- - ref-filter: introduce refname_atom_parser_internal()
214
- - ref-filter: make "%(symref)" atom work with the ':short' modifier
215
- - ref-filter: add support for %(upstream:track,nobracket)
216
- - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
217
- - ref-filter: introduce format_ref_array_item()
218
- - ref-filter: move get_head_description() from branch.c
219
- - ref-filter: modify "%(objectname:short)" to take length
220
- - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
221
- - ref-filter: include reference to 'used_atom' within 'atom_value'
222
- - ref-filter: implement %(if), %(then), and %(else) atoms
223
-
224
- The code to list branches in "git branch" has been consolidated
225
- with the more generic ref-filter API.
226
-
227
- Rerolled.
228
- Needs review.
229
-
230
-
173
* ec/annotate-deleted (2015-11-20) 1 commit
174
- annotate: skip checking working tree if a revision is provided
175
@@ -273,6 +215,82 @@ of the repositories listed at
215
--------------------------------------------------
216
[Cooking]
217
218
+* hv/submodule-not-yet-pushed-fix (2016-11-16) 4 commits
219
+ - submodule_needs_pushing(): explain the behaviour when we cannot answer
220
+ - batch check whether submodule needs pushing into one call
221
+ - serialize collection of refs that contain submodule changes
222
+ - serialize collection of changed submodules
223
+
224
+ The code in "git push" to compute if any commit being pushed in the
225
+ superproject binds a commit in a submodule that hasn't been pushed
226
+ out was overly inefficient, making it unusable even for a small
227
+ project that does not have any submodule but have a reasonable
228
+ number of refs.
229
+
230
+ Looking good.
231
+
232
+
233
+* kn/ref-filter-branch-list (2016-11-15) 18 commits
234
+ - for-each-ref: do not segv with %(HEAD) on an unborn branch
235
+ - branch: implement '--format' option
236
+ - branch: use ref-filter printing APIs
237
+ - branch, tag: use porcelain output
238
+ - ref-filter: allow porcelain to translate messages in the output
239
+ - ref-filter: add `:dir` and `:base` options for ref printing atoms
240
+ - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
241
+ - ref-filter: introduce symref_atom_parser() and refname_atom_parser()
242
+ - ref-filter: introduce refname_atom_parser_internal()
243
+ - ref-filter: make "%(symref)" atom work with the ':short' modifier
244
+ - ref-filter: add support for %(upstream:track,nobracket)
245
+ - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
246
+ - ref-filter: introduce format_ref_array_item()
247
+ - ref-filter: move get_head_description() from branch.c
248
+ - ref-filter: modify "%(objectname:short)" to take length
249
+ - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
250
+ - ref-filter: include reference to 'used_atom' within 'atom_value'
251
+ - ref-filter: implement %(if), %(then), and %(else) atoms
252
+
253
+ The code to list branches in "git branch" has been consolidated
254
+ with the more generic ref-filter API.
255
+
256
+ Rerolled, reviewed, looking good.
257
+ Expecting a reroll.
258
+ cf. <20161108201211.25213-1-Karthik.188@gmail.com>
259
+ cf. <CAOLa=ZQqe3vEj_428d41vd_4kfjzsm87Wam6Zm2dhXWkPdJ8Rw@mail.gmail.com>
260
+ cf. <xmqq7f84tqa7.fsf_-_@gitster.mtv.corp.google.com>
261
+
262
+
263
+* bw/transport-protocol-policy (2016-11-09) 2 commits
264
+ (merged to 'next' on 2016-11-16 at 1391d3eeed)
265
+ + transport: add protocol policy config option
266
+ + lib-proto-disable: variable name fix
267
+
268
+ Finer-grained control of what protocols are allowed for transports
269
+ during clone/fetch/push have been enabled via a new configuration
270
+ mechanism.
271
+
272
+ Will cook in 'next'.
273
+
274
+
275
+* jk/create-branch-remove-unused-param (2016-11-09) 1 commit
276
+ (merged to 'next' on 2016-11-16 at 621254c832)
277
+ + create_branch: drop unused "head" parameter
278
+
279
+ Code clean-up.
280
+
281
+ Will merge to 'master'.
282
+
283
+
284
+* jt/fetch-no-redundant-tag-fetch-map (2016-11-11) 1 commit
285
+ (merged to 'next' on 2016-11-16 at 5846c27cc5)
286
+ + fetch: do not redundantly calculate tag refmap
287
+
288
+ Code cleanup to avoid using redundant refspecs while fetching with
289
+ the --tags option.
290
+
291
+ Will cook in 'next'.
292
+
293
+
294
* jc/retire-compaction-heuristics (2016-11-02) 3 commits
295
- SQUASH???
296
- SQUASH???