What's cooking (2016/12 #08)
Junio C Hamano committed
Dec 27, 2016 at 15:07 UTC
2135c1c06eeb728901f96ac403a8af10e6145065
1 file changed
+293
-205
whats-cooking.txt
+293
-205
@@ -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, #07; Thu, 22)
4
-X-master-at: 1d1bdafd64266e5ee3bd46c6965228f32e4022ea
5
-X-next-at: 1ede815b8d1562f46b7aa5d55af084a3cad2ecf8
3
+Subject: What's cooking in git.git (Dec 2016, #08; Tue, 27)
4
+X-master-at: e05806da9ec4aff8adfed142ab2a2b3b02e33c8c
5
+X-next-at: c69c2f50cfc0dcd4bcd014c7fd56e344a7c5522f
6
7
-What's cooking in git.git (Dec 2016, #07; Thu, 22)
7
+What's cooking in git.git (Dec 2016, #08; Tue, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,259 @@ 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
+This will be the last issue of the "What's cooking" report this
16
+year. I will be travelling and expect to be slow to respond for a
17
+week or so. Hence there is no "short-term" summary; the topics
18
+marked as "Will merge to 'master'" may stay until the second week of
19
+next month.
20
+
21
You can find the changes described here in the integration branches
22
of the repositories listed at
23
24
http://git-blame.blogspot.com/p/git-public-repositories.html
25
26
+--------------------------------------------------
27
+[Graduated to "master"]
28
+
29
+* bw/transport-protocol-policy (2016-12-15) 6 commits
30
+ (merged to 'next' on 2016-12-19 at 166168205c)
31
+ + http: respect protocol.*.allow=user for http-alternates
32
+ + transport: add from_user parameter to is_transport_allowed
33
+ + http: create function to get curl allowed protocols
34
+ + transport: add protocol policy config option
35
+ + http: always warn if libcurl version is too old
36
+ + lib-proto-disable: variable name fix
37
+
38
+ Finer-grained control of what protocols are allowed for transports
39
+ during clone/fetch/push have been enabled via a new configuration
40
+ mechanism.
41
+
42
+
43
+* cp/merge-continue (2016-12-15) 4 commits
44
+ (merged to 'next' on 2016-12-19 at 8ba0094f45)
45
+ + merge: mark usage error strings for translation
46
+ + merge: ensure '--abort' option takes no arguments
47
+ + completion: add --continue option for merge
48
+ + merge: add '--continue' option as a synonym for 'git commit'
49
+
50
+ "git merge --continue" has been added as a synonym to "git commit"
51
+ to conclude a merge that has stopped due to conflicts.
52
+
53
+
54
+* gv/p4-multi-path-commit-fix (2016-12-19) 1 commit
55
+ (merged to 'next' on 2016-12-21 at f7ba714387)
56
+ + git-p4: fix multi-path changelist empty commits
57
+
58
+ "git p4" that tracks multile p4 paths imported a single changelist
59
+ that touches files in these multiple paths as one commit, followed
60
+ by many empty commits. This has been fixed.
61
+
62
+
63
+* jc/lock-report-on-error (2016-12-27) 1 commit
64
+ (merged to 'next' on 2016-12-27 at ab2ae230f4)
65
+ + lockfile: move REPORT_ON_ERROR bit elsewhere
66
+
67
+ Hotfix for a topic already merged to 'master'.
68
+
69
+
70
+* jc/push-default-explicit (2016-10-31) 2 commits
71
+ (merged to 'next' on 2016-12-05 at d63f3777af)
72
+ + push: test pushing ambiguously named branches
73
+ + push: do not use potentially ambiguous default refspec
74
+
75
+ Originally merged to 'next' on 2016-11-01
76
+
77
+ A lazy "git push" without refspec did not internally use a fully
78
+ specified refspec to perform 'current', 'simple', or 'upstream'
79
+ push, causing unnecessary "ambiguous ref" errors.
80
+
81
+
82
+* jk/difftool-in-subdir (2016-12-11) 4 commits
83
+ (merged to 'next' on 2016-12-21 at c1056e014b)
84
+ + difftool: rename variables for consistency
85
+ + difftool: chdir as early as possible
86
+ + difftool: sanitize $workdir as early as possible
87
+ + difftool: fix dir-diff index creation when in a subdirectory
88
+
89
+ Even though an fix was attempted in Git 2.9.3 days, but running
90
+ "git difftool --dir-diff" from a subdirectory never worked. This
91
+ has been fixed.
92
+
93
+
94
+* js/mingw-isatty (2016-12-22) 3 commits
95
+ (merged to 'next' on 2016-12-22 at 5be6c1a083)
96
+ + mingw: replace isatty() hack
97
+ + mingw: fix colourization on Cygwin pseudo terminals
98
+ + mingw: adjust is_console() to work with stdin
99
+
100
+ Update the isatty() emulation for Windows by updating the previous
101
+ hack that depended on internals of (older) MSVC runtime.
102
+
103
+
104
+* ld/p4-compare-dir-vs-symlink (2016-12-18) 1 commit
105
+ (merged to 'next' on 2016-12-20 at f58fed9ef8)
106
+ + git-p4: avoid crash adding symlinked directory
107
+
108
+ "git p4" misbehaved when swapping a directory and a symbolic link.
109
+
110
+
111
+* ls/filter-process (2016-12-18) 2 commits
112
+ (merged to 'next' on 2016-12-19 at 5ed29656db)
113
+ + t0021: fix flaky test
114
+ (merged to 'next' on 2016-12-12 at 8ed1f9eb02)
115
+ + docs: warn about possible '=' in clean/smudge filter process values
116
+
117
+ Doc update.
118
+
119
+
120
+* ls/p4-lfs (2016-12-20) 1 commit
121
+ (merged to 'next' on 2016-12-22 at 0759f94c65)
122
+ + git-p4: add diff/merge properties to .gitattributes for GitLFS files
123
+
124
+ Update GitLFS integration with "git p4".
125
+
126
+
127
+* lt/shortlog-by-committer (2016-12-20) 3 commits
128
+ (merged to 'next' on 2016-12-21 at c72e6e7f76)
129
+ + t4201: make tests work with and without the MINGW prerequiste
130
+ (merged to 'next' on 2016-12-19 at 555976fc0a)
131
+ + shortlog: test and document --committer option
132
+ + shortlog: group by committer information
133
+
134
+ "git shortlog" learned "--committer" option to group commits by
135
+ committer, instead of author.
136
+
137
+
138
+* mk/mingw-winansi-ttyname-termination-fix (2016-12-20) 1 commit
139
+ (merged to 'next' on 2016-12-21 at 1e8e994605)
140
+ + mingw: consider that UNICODE_STRING::Length counts bytes
141
+
142
+ A potential but unlikely buffer overflow in Windows port has been
143
+ fixed.
144
+
145
+
146
+* sb/submodule-config-cleanup (2016-11-22) 3 commits
147
+ (merged to 'next' on 2016-12-05 at 658b8764bf)
148
+ + submodule-config: clarify parsing of null_sha1 element
149
+ + submodule-config: rename commit_sha1 to treeish_name
150
+ + submodule config: inline config_from_{name, path}
151
+
152
+ Originally merged to 'next' on 2016-11-23
153
+
154
+ Minor code clean-up.
155
+
156
+
157
+* va/i18n-even-more (2016-12-20) 1 commit
158
+ (merged to 'next' on 2016-12-22 at 209eee0530)
159
+ + i18n: fix misconversion in shell scripts
160
+
161
+ Hotfix for a topic already merged to 'master'.
162
+
163
+
164
+* va/i18n-perl-scripts (2016-12-14) 16 commits
165
+ (merged to 'next' on 2016-12-19 at ec800aba9f)
166
+ + i18n: difftool: mark warnings for translation
167
+ + i18n: send-email: mark composing message for translation
168
+ + i18n: send-email: mark string with interpolation for translation
169
+ + i18n: send-email: mark warnings and errors for translation
170
+ + i18n: send-email: mark strings for translation
171
+ + i18n: add--interactive: mark status words for translation
172
+ + i18n: add--interactive: remove %patch_modes entries
173
+ + i18n: add--interactive: mark edit_hunk_manually message for translation
174
+ + i18n: add--interactive: i18n of help_patch_cmd
175
+ + i18n: add--interactive: mark patch prompt for translation
176
+ + i18n: add--interactive: mark plural strings
177
+ + i18n: clean.c: match string with git-add--interactive.perl
178
+ + i18n: add--interactive: mark strings with interpolation for translation
179
+ + i18n: add--interactive: mark simple here-documents for translation
180
+ + i18n: add--interactive: mark strings for translation
181
+ + Git.pm: add subroutines for commenting lines
182
+
183
+ Porcelain scripts written in Perl are getting internationalized.
184
+
185
+--------------------------------------------------
186
+[New Topics]
187
+
188
+* dt/disable-bitmap-in-auto-gc (2016-12-23) 2 commits
189
+ - repack: die on incremental + write-bitmap-index
190
+ - auto gc: don't write bitmaps for incremental repacks
191
+
192
+ It is natural that "git gc --auto" may not attempt to pack
193
+ everything into a single pack, and there is no point in warning
194
+ when the user has configured the system to use the pack bitmap,
195
+ leading to disabling further "gc".
196
+
197
+ Waiting for review to conclude.
198
+ cf. <20161224025730.vwz2k4af6z6piinl@sigill.intra.peff.net>
199
+ (GNUism must go.)
200
+
201
+
202
+* js/mingw-test-push-unc-path (2016-12-23) 1 commit
203
+ - mingw: add a regression test for pushing to UNC paths
204
+
205
+ "git push \\server\share\dir" has recently regressed and then
206
+ fixed. A test has retroactively been added for this breakage.
207
+
208
+ Waiting for review to conclude.
209
+ cf. <6d69b529-a42c-9f93-f342-7c6c19170285@kdbg.org>
210
+ (check the final result.)
211
+
212
+
213
+* nd/log-graph-configurable-colors (2016-12-25) 1 commit
214
+ - log --graph: customize the graph lines with config log.graphColors
215
+
216
+ Some people feel the default set of colors used by "git log --graph"
217
+ rather limiting. A mechanism to customize the set of colors has
218
+ been introduced.
219
+
220
+ Waiting for review to conclude.
221
+ cf. <xmqqzijjd34j.fsf@gitster.mtv.corp.google.com>
222
+ (Should it be cumulative?)
223
+
224
+
225
+* sb/submodule-rm-absorb (2016-12-27) 4 commits
226
+ - rm: absorb a submodules git dir before deletion
227
+ - submodule: rename and add flags to ok_to_remove_submodule
228
+ - submodule: modernize ok_to_remove_submodule to use argv_array
229
+ - submodule.h: add extern keyword to functions
230
+ (this branch uses sb/submodule-embed-gitdir.)
231
+
232
+ "git rm" used to refuse to remove a submodule when it has its own
233
+ git repository embedded in its working tree. It learned to move
234
+ the repository away to $GIT_DIR/modules/ of the superproject
235
+ instead, and allow the submodule to be deleted (as long as there
236
+ will be no loss of local modifications, that is).
237
+
238
+
239
+* cc/split-index-config (2016-12-26) 21 commits
240
+ - Documentation/git-update-index: explain splitIndex.*
241
+ - Documentation/config: add splitIndex.sharedIndexExpire
242
+ - read-cache: use freshen_shared_index() in read_index_from()
243
+ - read-cache: refactor read_index_from()
244
+ - t1700: test shared index file expiration
245
+ - read-cache: unlink old sharedindex files
246
+ - config: add git_config_get_expiry() from gc.c
247
+ - read-cache: touch shared index files when used
248
+ - sha1_file: make check_and_freshen_file() non static
249
+ - Documentation/config: add splitIndex.maxPercentChange
250
+ - t1700: add tests for splitIndex.maxPercentChange
251
+ - read-cache: regenerate shared index if necessary
252
+ - config: add git_config_get_max_percent_split_change()
253
+ - Documentation/git-update-index: talk about core.splitIndex config var
254
+ - Documentation/config: add information for core.splitIndex
255
+ - t1700: add tests for core.splitIndex
256
+ - update-index: warn in case of split-index incoherency
257
+ - read-cache: add and then use tweak_split_index()
258
+ - split-index: add {add,remove}_split_index() functions
259
+ - config: add git_config_get_split_index()
260
+ - config: mark an error message up for translation
261
+
262
+ The experimental "split index" feature has gained a few
263
+ configuration variables to make it easier to use.
264
+
265
+ Waiting for review to conclude.
266
+ cf. <20161226102222.17150-1-chriscool@tuxfamily.org>
267
+
268
--------------------------------------------------
269
[Stalled]
270
@@ -143,15 +391,25 @@ of the repositories listed at
391
[Cooking]
392
393
* jc/abbrev-autoscale-config (2016-12-22) 1 commit
146
- - config.abbrev: document the new default that auto-scales
394
+ (merged to 'next' on 2016-12-27 at 631e4200e2)
395
+ + config.abbrev: document the new default that auto-scales
396
148
- Will merge to 'next'.
397
+ Recent update to the default abbreviation length that auto-scales
398
+ lacked documentation update, which has been corrected.
399
400
+ Will merge to 'master'.
401
+
402
+
403
+* jc/retire-compaction-heuristics (2016-12-23) 1 commit
404
+ (merged to 'next' on 2016-12-27 at c69c2f50cf)
405
+ + diff: retire "compaction" heuristics
406
151
-* jc/retire-compaction-heuristics (2016-12-22) 1 commit
152
- - diff: retire the original experimental "compaction" heuristics
407
+ "git diff" and its family had two experimental heuristics to shift
408
+ the contents of a hunk to make the patch easier to read. One of
409
+ them turns out to be better than the other, so leave only the
410
+ "--indent-heuristic" option and remove the other one.
411
154
- Will merge to 'next'.
412
+ Will merge to 'master'.
413
414
415
* bw/push-submodule-only (2016-12-20) 3 commits
@@ -163,62 +421,14 @@ of the repositories listed at
421
push submodules out without pushing the top-level superproject.
422
423
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
-
424
* 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
425
+ (merged to 'next' on 2016-12-27 at 6be64a8671)
426
+ + config.c: handle lock file in error case in git_config_rename_...
427
+ + config.c: rename label unlock_and_out
428
+ + config.c: handle error case for fstat() calls
429
430
Leakage of lockfiles in the config subsystem has been fixed.
431
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
196
-
197
- "git p4" that tracks multile p4 paths imported a single changelist
198
- that touches files in these multiple paths as one commit, followed
199
- by many empty commits. This has been fixed.
200
-
201
- Will merge to 'master'.
202
-
203
-
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
-
213
- Will merge to 'master'.
214
-
215
-
216
-* ls/p4-lfs (2016-12-20) 1 commit
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
-
432
Will merge to 'master'.
433
434
@@ -229,16 +439,18 @@ of the repositories listed at
439
convert pathnames when the p4 used encoding different from the one
440
used on the Git side. This has been corrected.
441
232
- Will merge to 'next'.
442
+ Will be rerolled.
443
+ cf. <7E1C7387-4F37-423F-803D-3B5690B49D40@gmail.com>
444
445
446
* mh/fast-import-notes-fix-new (2016-12-20) 1 commit
236
- - fast-import: properly fanout notes when tree is imported
447
+ (merged to 'next' on 2016-12-27 at b63805e6f6)
448
+ + fast-import: properly fanout notes when tree is imported
449
450
"git fast-import" sometimes mishandled while rebalancing notes
451
tree, which has been fixed.
452
241
- Will merge to 'next'.
453
+ Will merge to 'master'.
454
455
456
* bw/pathspec-cleanup (2016-12-14) 16 commits
@@ -264,28 +476,6 @@ of the repositories listed at
476
Waiting for the (hopefully) final round of review before 'next'.
477
478
267
-* cp/merge-continue (2016-12-15) 4 commits
268
- (merged to 'next' on 2016-12-19 at 8ba0094f45)
269
- + merge: mark usage error strings for translation
270
- + merge: ensure '--abort' option takes no arguments
271
- + completion: add --continue option for merge
272
- + merge: add '--continue' option as a synonym for 'git commit'
273
-
274
- "git merge --continue" has been added as a synonym to "git commit"
275
- to conclude a merge that has stopped due to conflicts.
276
-
277
- Will merge to 'master'.
278
-
279
-
280
-* ld/p4-compare-dir-vs-symlink (2016-12-18) 1 commit
281
- (merged to 'next' on 2016-12-20 at f58fed9ef8)
282
- + git-p4: avoid crash adding symlinked directory
283
-
284
- "git p4" misbehaved when swapping a directory and a symbolic link.
285
-
286
- Will merge to 'master'.
287
-
288
-
479
* js/prepare-sequencer-more (2016-12-14) 34 commits
480
- sequencer (rebase -i): write out the final message
481
- sequencer (rebase -i): write the progress into files
@@ -328,19 +518,6 @@ of the repositories listed at
518
Waiting for review to conclude.
519
520
331
-* lt/shortlog-by-committer (2016-12-20) 3 commits
332
- (merged to 'next' on 2016-12-21 at c72e6e7f76)
333
- + t4201: make tests work with and without the MINGW prerequiste
334
- (merged to 'next' on 2016-12-19 at 555976fc0a)
335
- + shortlog: test and document --committer option
336
- + shortlog: group by committer information
337
-
338
- "git shortlog" learned "--committer" option to group commits by
339
- committer, instead of author.
340
-
341
- Will merge to 'master'.
342
-
343
-
521
* bw/realpath-wo-chdir (2016-12-22) 5 commits
522
(merged to 'next' on 2016-12-22 at fea8fa870f)
523
+ real_path: canonicalize directory separators in root parts
@@ -358,31 +535,6 @@ of the repositories listed at
535
Will merge to 'master'.
536
537
361
-* jk/difftool-in-subdir (2016-12-11) 4 commits
362
- (merged to 'next' on 2016-12-21 at c1056e014b)
363
- + difftool: rename variables for consistency
364
- + difftool: chdir as early as possible
365
- + difftool: sanitize $workdir as early as possible
366
- + difftool: fix dir-diff index creation when in a subdirectory
367
-
368
- Even though an fix was attempted in Git 2.9.3 days, but running
369
- "git difftool --dir-diff" from a subdirectory never worked. This
370
- has been fixed.
371
-
372
- Will merge to 'master'.
373
-
374
-
375
-* ls/filter-process (2016-12-18) 2 commits
376
- (merged to 'next' on 2016-12-19 at 5ed29656db)
377
- + t0021: fix flaky test
378
- (merged to 'next' on 2016-12-12 at 8ed1f9eb02)
379
- + docs: warn about possible '=' in clean/smudge filter process values
380
-
381
- Doc update.
382
-
383
- Will merge to 'master'.
384
-
385
-
538
* js/difftool-builtin (2016-11-28) 2 commits
539
- difftool: implement the functionality in the builtin
540
- difftool: add a skeleton for the upcoming builtin
@@ -403,7 +555,9 @@ of the repositories listed at
555
Will cook in 'next'.
556
557
406
-* sb/submodule-embed-gitdir (2016-12-12) 6 commits
558
+* sb/submodule-embed-gitdir (2016-12-27) 7 commits
559
+ (merged to 'next' on 2016-12-27 at 2b43c15479)
560
+ + worktree: initialize return value for submodule_uses_worktrees
561
(merged to 'next' on 2016-12-21 at e6cdbcf013)
562
+ submodule: add absorb-git-dir function
563
+ move connect_work_tree_and_git_dir to dir.h
@@ -411,6 +565,7 @@ of the repositories listed at
565
+ test-lib-functions.sh: teach test_commit -C <dir>
566
+ submodule helper: support super prefix
567
+ submodule: use absolute path for computing relative path connecting
568
+ (this branch is used by sb/submodule-rm-absorb.)
569
570
A new submodule helper "git submodule embedgitdirs" to make it
571
easier to move embedded .git/ directory for submodules in a
@@ -451,7 +606,7 @@ of the repositories listed at
606
An improvement counterproposal has failed.
607
cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net>
608
454
- Will cook in 'next'.
609
+ Will merge to 'master'.
610
611
612
* mm/push-social-engineering-attack-doc (2016-11-14) 1 commit
@@ -462,7 +617,7 @@ of the repositories listed at
617
618
Doc update on fetching and pushing.
619
465
- Will cook in 'next'.
620
+ Will merge to 'master'.
621
622
623
* jc/compression-config (2016-11-15) 1 commit
@@ -476,7 +631,7 @@ of the repositories listed at
631
Unify these so that all of them honor core.compression and
632
pack.compression variables the same way.
633
479
- Will cook in 'next'.
634
+ Will merge to 'master'.
635
636
637
* mm/gc-safety-doc (2016-11-16) 1 commit
@@ -487,16 +642,17 @@ of the repositories listed at
642
643
Doc update.
644
490
- Will cook in 'next'.
645
+ Will merge to 'master'.
646
647
493
-* kn/ref-filter-branch-list (2016-12-08) 20 commits
648
+* kn/ref-filter-branch-list (2016-12-27) 20 commits
649
- branch: implement '--format' option
650
- branch: use ref-filter printing APIs
651
- branch, tag: use porcelain output
652
- ref-filter: allow porcelain to translate messages in the output
653
- ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames
654
- ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>'
655
+ - ref-filter: Do not abruptly die when using the 'lstrip=<N>' option
656
- ref-filter: rename the 'strip' option to 'lstrip'
657
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
658
- ref-filter: introduce refname_atom_parser()
@@ -510,29 +666,11 @@ of the repositories listed at
666
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
667
- ref-filter: include reference to 'used_atom' within 'atom_value'
668
- ref-filter: implement %(if), %(then), and %(else) atoms
513
- - for-each-ref: do not segv with %(HEAD) on an unborn branch
669
670
The code to list branches in "git branch" has been consolidated
671
with the more generic ref-filter API.
672
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
523
- (merged to 'next' on 2016-12-19 at 166168205c)
524
- + http: respect protocol.*.allow=user for http-alternates
525
- + transport: add from_user parameter to is_transport_allowed
526
- + http: create function to get curl allowed protocols
527
- + transport: add protocol policy config option
528
- + http: always warn if libcurl version is too old
529
- + lib-proto-disable: variable name fix
530
-
531
- Finer-grained control of what protocols are allowed for transports
532
- during clone/fetch/push have been enabled via a new configuration
533
- mechanism.
534
-
535
- Will merge to 'master'.
673
+ Waiting for review to conclude.
674
675
676
* jt/fetch-no-redundant-tag-fetch-map (2016-11-11) 1 commit
@@ -544,45 +682,19 @@ of the repositories listed at
682
Code cleanup to avoid using redundant refspecs while fetching with
683
the --tags option.
684
547
- Will cook in 'next'.
548
-
549
-
550
-* sb/submodule-config-cleanup (2016-11-22) 3 commits
551
- (merged to 'next' on 2016-12-05 at 658b8764bf)
552
- + submodule-config: clarify parsing of null_sha1 element
553
- + submodule-config: rename commit_sha1 to treeish_name
554
- + submodule config: inline config_from_{name, path}
555
-
556
- Originally merged to 'next' on 2016-11-23
557
-
558
- Minor code clean-up.
559
-
560
- Will merge to 'master'.
561
-
562
-
563
-* jc/push-default-explicit (2016-10-31) 2 commits
564
- (merged to 'next' on 2016-12-05 at d63f3777af)
565
- + push: test pushing ambiguously named branches
566
- + push: do not use potentially ambiguous default refspec
567
-
568
- Originally merged to 'next' on 2016-11-01
569
-
570
- A lazy "git push" without refspec did not internally use a fully
571
- specified refspec to perform 'current', 'simple', or 'upstream'
572
- push, causing unnecessary "ambiguous ref" errors.
573
-
685
Will merge to 'master'.
686
687
688
* jc/git-open-cloexec (2016-11-02) 3 commits
578
- - sha1_file: stop opening files with O_NOATIME
579
- - git_open_cloexec(): use fcntl(2) w/ FD_CLOEXEC fallback
580
- - git_open(): untangle possible NOATIME and CLOEXEC interactions
689
+ (merged to 'next' on 2016-12-27 at 487682eb6e)
690
+ + sha1_file: stop opening files with O_NOATIME
691
+ + git_open_cloexec(): use fcntl(2) w/ FD_CLOEXEC fallback
692
+ + git_open(): untangle possible NOATIME and CLOEXEC interactions
693
694
The codeflow of setting NOATIME and CLOEXEC on file descriptors Git
695
opens has been simplified.
696
585
- Will merge to 'next'.
697
+ Will merge to 'master'.
698
We may want to drop the tip one, but we'll see.
699
700
@@ -742,30 +854,6 @@ of the repositories listed at
854
with bw/pathspec-cleanup topic and has been dropped for now.
855
856
745
-* va/i18n-perl-scripts (2016-12-14) 16 commits
746
- (merged to 'next' on 2016-12-19 at ec800aba9f)
747
- + i18n: difftool: mark warnings for translation
748
- + i18n: send-email: mark composing message for translation
749
- + i18n: send-email: mark string with interpolation for translation
750
- + i18n: send-email: mark warnings and errors for translation
751
- + i18n: send-email: mark strings for translation
752
- + i18n: add--interactive: mark status words for translation
753
- + i18n: add--interactive: remove %patch_modes entries
754
- + i18n: add--interactive: mark edit_hunk_manually message for translation
755
- + i18n: add--interactive: i18n of help_patch_cmd
756
- + i18n: add--interactive: mark patch prompt for translation
757
- + i18n: add--interactive: mark plural strings
758
- + i18n: clean.c: match string with git-add--interactive.perl
759
- + i18n: add--interactive: mark strings with interpolation for translation
760
- + i18n: add--interactive: mark simple here-documents for translation
761
- + i18n: add--interactive: mark strings for translation
762
- + Git.pm: add subroutines for commenting lines
763
-
764
- Porcelain scripts written in Perl are getting internationalized.
765
-
766
- Will merge to 'master'.
767
-
768
-
857
* jc/latin-1 (2016-09-26) 2 commits
858
(merged to 'next' on 2016-12-05 at fb549caa12)
859
+ utf8: accept "latin-1" as ISO-8859-1
@@ -777,7 +865,7 @@ of the repositories listed at
865
the wild in e-mail headers; replace them with "iso-8859-1" that is
866
more widely known when conversion fails from/to it.
867
780
- Will cook in 'next'.
868
+ Will merge to 'master'.
869
870
871
* sg/fix-versioncmp-with-common-suffix (2016-12-08) 8 commits