What's cooking (2016/12 #07)
Junio C Hamano committed
Dec 22, 2016 at 14:14 UTC
8a5748f8934caf3b12fbf59784306a5fc28e2144
1 file changed
+87
-171
whats-cooking.txt
+87
-171
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2016, #06; Wed, 21)
3
+Subject: What's cooking in git.git (Dec 2016, #07; Thu, 22)
4
X-master-at: 1d1bdafd64266e5ee3bd46c6965228f32e4022ea
5
-X-next-at: 71d7989c69ecdcefd19d2521182237e1294395ca
5
+X-next-at: 1ede815b8d1562f46b7aa5d55af084a3cad2ecf8
6
7
-What's cooking in git.git (Dec 2016, #06; Wed, 21)
7
+What's cooking in git.git (Dec 2016, #07; Thu, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -17,149 +17,9 @@ of the repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
---------------------------------------------------
21
-[Graduated to "master"]
22
-
23
-* jk/index-pack-wo-repo-from-stdin (2016-12-16) 4 commits
24
- (merged to 'next' on 2016-12-19 at 9a88221347)
25
- + index-pack: skip collision check when not in repository
26
- + t: use nongit() function where applicable
27
- + index-pack: complain when --stdin is used outside of a repo
28
- + t5000: extract nongit function to test-lib-functions.sh
29
-
30
- "git index-pack --stdin" needs an access to an existing repository,
31
- but "git index-pack file.pack" to generate an .idx file that
32
- corresponds to a packfile does not.
33
-
34
-
35
-* jk/parseopt-usage-msg-opt (2016-12-14) 1 commit
36
- (merged to 'next' on 2016-12-19 at c488c7c6e1)
37
- + parse-options: print "fatal:" before usage_msg_opt()
38
-
39
- The function usage_msg_opt() has been updated to say "fatal:"
40
- before the custom message programs give, when they want to die
41
- with a message about wrong command line options followed by the
42
- standard usage string.
43
-
44
-
45
-* jk/quote-env-path-list-component (2016-12-21) 5 commits
46
- (merged to 'next' on 2016-12-21 at 729971d31e)
47
- + t5615-alternate-env: double-quotes in file names do not work on Windows
48
- (merged to 'next' on 2016-12-16 at d2cd6008b9)
49
- + t5547-push-quarantine: run the path separator test on Windows, too
50
- + tmp-objdir: quote paths we add to alternates
51
- + alternates: accept double-quoted paths
52
- + Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component
53
-
54
- A recent update to receive-pack to make it easier to drop garbage
55
- objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot
56
- have a pathname with a colon in it (no surprise!), and this in turn
57
- made it impossible to push into a repository at such a path. This
58
- has been fixed by introducing a quoting mechanism used when
59
- appending such a path to the colon-separated list.
60
-
61
-
62
-* jt/mailinfo-fold-in-body-headers (2016-12-20) 1 commit
63
- (merged to 'next' on 2016-12-20 at ec9ae616aa)
64
- + mailinfo.c: move side-effects outside of assert
65
-
66
- Fix for NDEBUG builds.
67
-
68
-
69
-* nd/shallow-fixup (2016-12-07) 6 commits
70
- (merged to 'next' on 2016-12-13 at 1a3edb8bce)
71
- + shallow.c: remove useless code
72
- + shallow.c: bit manipulation tweaks
73
- + shallow.c: avoid theoretical pointer wrap-around
74
- + shallow.c: make paint_alloc slightly more robust
75
- + shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
76
- + shallow.c: rename fields in paint_info to better express their purposes
77
-
78
- Code cleanup in shallow boundary computation.
79
-
80
-
81
-* sb/sequencer-abort-safety (2016-12-14) 6 commits
82
- (merged to 'next' on 2016-12-16 at ec71fb1217)
83
- + Revert "sequencer: remove useless get_dir() function"
84
- (merged to 'next' on 2016-12-13 at 6107e43d65)
85
- + sequencer: remove useless get_dir() function
86
- + sequencer: make sequencer abort safer
87
- + t3510: test that cherry-pick --abort does not unsafely change HEAD
88
- + am: change safe_to_abort()'s not rewinding error into a warning
89
- + am: fix filename in safe_to_abort() error message
90
-
91
- Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
92
- to where cherry-pick started while picking multiple changes, when
93
- the cherry-pick stopped to ask for help from the user, and the user
94
- did "git reset --hard" to a different commit in order to re-attempt
95
- the operation.
96
-
97
-
98
-* vs/submodule-clone-nested-submodules-alternates (2016-12-12) 1 commit
99
- (merged to 'next' on 2016-12-13 at 8a317ab745)
100
- + submodule--helper: set alternateLocation for cloned submodules
101
-
102
- "git clone --reference $there --recurse-submodules $super" has been
103
- taught to guess repositories usable as references for submodules of
104
- $super that are embedded in $there while making a clone of the
105
- superproject borrow objects from $there; extend the mechanism to
106
- also allow submodules of these submodules to borrow repositories
107
- embedded in these clones of the submodules embedded in the clone of
108
- the superproject.
109
-
110
---------------------------------------------------
111
-[New Topics]
112
-
113
-* bw/push-submodule-only (2016-12-20) 3 commits
114
- - push: add option to push only submodules
115
- - submodules: add RECURSE_SUBMODULES_ONLY value
116
- - transport: reformat flag #defines to be more readable
117
-
118
- "git submodule push" learned "--recurse-submodules=only option to
119
- push submodules out without pushing the top-level superproject.
120
-
121
-
122
-* mk/mingw-winansi-ttyname-termination-fix (2016-12-20) 1 commit
123
- (merged to 'next' on 2016-12-21 at 1e8e994605)
124
- + mingw: consider that UNICODE_STRING::Length counts bytes
125
-
126
- A potential but unlikely buffer overflow in Windows port has been
127
- fixed.
128
-
129
- Will merge to 'master'.
130
-
131
-
132
-* nd/config-misc-fixes (2016-12-20) 4 commits
133
- - SQUASH???
134
- - config.c: handle lock file in error case in git_config_rename_...
135
- - config.c: rename label unlock_and_out
136
- - config.c: handle error case for fstat() calls
137
-
138
- Leakage of lockfiles in the config subsystem has been fixed.
139
-
140
-
141
-* va/i18n-even-more (2016-12-20) 1 commit
142
- - i18n: fix misconversion in shell scripts
143
-
144
- Will merge to 'next'.
145
-
20
--------------------------------------------------
21
[Stalled]
22
149
-* jc/retire-compaction-heuristics (2016-11-02) 3 commits
150
- - SQUASH???
151
- - SQUASH???
152
- - diff: retire the original experimental "compaction" heuristics
153
-
154
- Waiting for a reroll.
155
-
156
-
157
-* jc/abbrev-autoscale-config (2016-11-01) 1 commit
158
- - config.abbrev: document the new default that auto-scales
159
-
160
- Waiting for a reroll.
161
-
162
-
23
* jk/nofollow-attr-ignore (2016-11-02) 5 commits
24
- exclude: do not respect symlinks for in-tree .gitignore
25
- attr: do not respect symlinks for in-tree .gitattributes
@@ -282,6 +142,54 @@ of the repositories listed at
142
--------------------------------------------------
143
[Cooking]
144
145
+* jc/abbrev-autoscale-config (2016-12-22) 1 commit
146
+ - config.abbrev: document the new default that auto-scales
147
+
148
+ Will merge to 'next'.
149
+
150
+
151
+* jc/retire-compaction-heuristics (2016-12-22) 1 commit
152
+ - diff: retire the original experimental "compaction" heuristics
153
+
154
+ Will merge to 'next'.
155
+
156
+
157
+* bw/push-submodule-only (2016-12-20) 3 commits
158
+ - push: add option to push only submodules
159
+ - submodules: add RECURSE_SUBMODULES_ONLY value
160
+ - transport: reformat flag #defines to be more readable
161
+
162
+ "git submodule push" learned "--recurse-submodules=only option to
163
+ push submodules out without pushing the top-level superproject.
164
+
165
+
166
+* mk/mingw-winansi-ttyname-termination-fix (2016-12-20) 1 commit
167
+ (merged to 'next' on 2016-12-21 at 1e8e994605)
168
+ + mingw: consider that UNICODE_STRING::Length counts bytes
169
+
170
+ A potential but unlikely buffer overflow in Windows port has been
171
+ fixed.
172
+
173
+ Will merge to 'master'.
174
+
175
+
176
+* nd/config-misc-fixes (2016-12-22) 3 commits
177
+ - config.c: handle lock file in error case in git_config_rename_...
178
+ - config.c: rename label unlock_and_out
179
+ - config.c: handle error case for fstat() calls
180
+
181
+ Leakage of lockfiles in the config subsystem has been fixed.
182
+
183
+ Will merge to 'next'.
184
+
185
+
186
+* va/i18n-even-more (2016-12-20) 1 commit
187
+ (merged to 'next' on 2016-12-22 at 209eee0530)
188
+ + i18n: fix misconversion in shell scripts
189
+
190
+ Will merge to 'master'.
191
+
192
+
193
* gv/p4-multi-path-commit-fix (2016-12-19) 1 commit
194
(merged to 'next' on 2016-12-21 at f7ba714387)
195
+ git-p4: fix multi-path changelist empty commits
@@ -293,22 +201,25 @@ of the repositories listed at
201
Will merge to 'master'.
202
203
296
-* js/mingw-isatty (2016-12-21) 2 commits
297
- - mingw: replace isatty() hack
298
- - mingw: adjust is_console() to work with stdin
204
+* js/mingw-isatty (2016-12-22) 3 commits
205
+ (merged to 'next' on 2016-12-22 at 5be6c1a083)
206
+ + mingw: replace isatty() hack
207
+ + mingw: fix colourization on Cygwin pseudo terminals
208
+ + mingw: adjust is_console() to work with stdin
209
210
Update the isatty() emulation for Windows by updating the previous
211
hack that depended on internals of (older) MSVC runtime.
212
303
- Waiting for review to conclude.
213
+ Will merge to 'master'.
214
215
216
* ls/p4-lfs (2016-12-20) 1 commit
307
- - git-p4: add diff/merge properties to .gitattributes for GitLFS files
217
+ (merged to 'next' on 2016-12-22 at 0759f94c65)
218
+ + git-p4: add diff/merge properties to .gitattributes for GitLFS files
219
220
Update GitLFS integration with "git p4".
221
311
- Will merge to 'next'.
222
+ Will merge to 'master'.
223
224
225
* ls/p4-path-encoding (2016-12-18) 1 commit
@@ -318,7 +229,7 @@ of the repositories listed at
229
convert pathnames when the p4 used encoding different from the one
230
used on the Git side. This has been corrected.
231
321
- Waiting for review to conclude.
232
+ Will merge to 'next'.
233
234
235
* mh/fast-import-notes-fix-new (2016-12-20) 1 commit
@@ -427,12 +338,16 @@ of the repositories listed at
338
"git shortlog" learned "--committer" option to group commits by
339
committer, instead of author.
340
341
+ Will merge to 'master'.
342
+
343
431
-* bw/realpath-wo-chdir (2016-12-12) 4 commits
432
- - real_path: have callers use real_pathdup and strbuf_realpath
433
- - real_path: create real_pathdup
434
- - real_path: convert real_path_internal to strbuf_realpath
435
- - real_path: resolve symlinks by hand
344
+* bw/realpath-wo-chdir (2016-12-22) 5 commits
345
+ (merged to 'next' on 2016-12-22 at fea8fa870f)
346
+ + real_path: canonicalize directory separators in root parts
347
+ + real_path: have callers use real_pathdup and strbuf_realpath
348
+ + real_path: create real_pathdup
349
+ + real_path: convert real_path_internal to strbuf_realpath
350
+ + real_path: resolve symlinks by hand
351
(this branch is used by bw/grep-recurse-submodules.)
352
353
The implementation of "real_path()" was to go there with chdir(2)
@@ -440,8 +355,7 @@ of the repositories listed at
355
threaded environment. Rewrite it to manually resolve relative
356
paths including symbolic links in path components.
357
443
- Will wait for an issue on Windows to be resolved.
444
- cf. <097e3e2e-f46d-b0aa-be9c-68c274c5e3dc@kdbg.org>
358
+ Will merge to 'master'.
359
360
361
* jk/difftool-in-subdir (2016-12-11) 4 commits
@@ -506,19 +420,20 @@ of the repositories listed at
420
Will merge to 'master'.
421
422
509
-* bw/grep-recurse-submodules (2016-12-16) 7 commits
510
- - grep: search history of moved submodules
511
- - grep: enable recurse-submodules to work on <tree> objects
512
- - grep: optionally recurse into submodules
513
- - grep: add submodules as a grep source type
514
- - submodules: load gitmodules file from commit sha1
515
- - submodules: add helper to determine if a submodule is initialized
516
- - submodules: add helper to determine if a submodule is populated
423
+* bw/grep-recurse-submodules (2016-12-22) 7 commits
424
+ (merged to 'next' on 2016-12-22 at 1ede815b8d)
425
+ + grep: search history of moved submodules
426
+ + grep: enable recurse-submodules to work on <tree> objects
427
+ + grep: optionally recurse into submodules
428
+ + grep: add submodules as a grep source type
429
+ + submodules: load gitmodules file from commit sha1
430
+ + submodules: add helper to determine if a submodule is initialized
431
+ + submodules: add helper to determine if a submodule is populated
432
(this branch uses bw/realpath-wo-chdir.)
433
434
"git grep" learns to optionally recurse into submodules.
435
521
- Will hold until bw/realpath-wo-chdir settles.
436
+ Will merge to 'master'.
437
438
439
* dt/smart-http-detect-server-going-away (2016-11-18) 2 commits
@@ -600,8 +515,8 @@ of the repositories listed at
515
The code to list branches in "git branch" has been consolidated
516
with the more generic ref-filter API.
517
603
- What's the doneness of the topic? I recall discussing die vs empty
604
- and also saw a "squash this in when you reroll", but I lost track.
518
+ Waiting for a reroll.
519
+ cf. <CAOLa=ZREUWqdH_2HNn_JQcf4RW9k1dAN5BtwPN2HnzuDoUdkWw@mail.gmail.com>
520
521
522
* bw/transport-protocol-policy (2016-12-15) 6 commits
@@ -642,7 +557,7 @@ of the repositories listed at
557
558
Minor code clean-up.
559
645
- Will cook in 'next'.
560
+ Will merge to 'master'.
561
562
563
* jc/push-default-explicit (2016-10-31) 2 commits
@@ -656,7 +571,7 @@ of the repositories listed at
571
specified refspec to perform 'current', 'simple', or 'upstream'
572
push, causing unnecessary "ambiguous ref" errors.
573
659
- Will cook in 'next'.
574
+ Will merge to 'master'.
575
576
577
* jc/git-open-cloexec (2016-11-02) 3 commits
@@ -667,7 +582,8 @@ of the repositories listed at
582
The codeflow of setting NOATIME and CLOEXEC on file descriptors Git
583
opens has been simplified.
584
670
- We may want to drop the tip one.
585
+ Will merge to 'next'.
586
+ We may want to drop the tip one, but we'll see.
587
588
589
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit