What's cooking (2017/11 #04)
Junio C Hamano committed
Nov 14, 2017 at 12:46 UTC
be0495e0ad2c7c503d33ca361891f9466789cb24
1 file changed
+415
-276
whats-cooking.txt
+415
-276
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2017, #03; Wed, 8)
4
-X-master-at: 7668cbc60578f99a4c048f8f8f38787930b8147b
5
-X-next-at: 9af6a3dea062db2d4b3807c453d2f678c7f12e9c
3
+Subject: What's cooking in git.git (Nov 2017, #04; Tue, 14)
4
+X-master-at: d8df70f2739af78cab6d7f9b942e890da6fbd01d
5
+X-next-at: 0d8980c5de90c09f1fb308c53a14d7d082f5358b
6
7
-What's cooking in git.git (Nov 2017, #03; Wed, 8)
7
+What's cooking in git.git (Nov 2017, #04; Tue, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,37 +20,285 @@ of the repositories listed at
20
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
+--------------------------------------------------
24
+[Graduated to "master"]
25
+
26
+* ad/5580-unc-tests-on-cygwin (2017-11-01) 1 commit
27
+ (merged to 'next' on 2017-11-07 at 34fc479da2)
28
+ + t5580: add Cygwin support
29
+
30
+ UNC paths are also relevant in Cygwin builds and they are now
31
+ tested just like Mingw builds.
32
+
33
+
34
+* ao/diff-populate-filespec-lstat-errorpath-fix (2017-10-29) 1 commit
35
+ (merged to 'next' on 2017-11-07 at b03241e6e5)
36
+ + diff: fix lstat() error handling in diff_populate_filespec()
37
+
38
+ After an error from lstat(), diff_populate_filespec() function
39
+ sometimes still went ahead and used invalid data in struct stat,
40
+ which has been fixed.
41
+
42
+
43
+* bw/diff-opt-impl-to-bitfields (2017-11-01) 8 commits
44
+ (merged to 'next' on 2017-11-07 at 8be78206ba)
45
+ + diff: make struct diff_flags members lowercase
46
+ + diff: remove DIFF_OPT_CLR macro
47
+ + diff: remove DIFF_OPT_SET macro
48
+ + diff: remove DIFF_OPT_TST macro
49
+ + diff: remove touched flags
50
+ + diff: add flag to indicate textconv was set via cmdline
51
+ + diff: convert flags to be stored in bitfields
52
+ + add, reset: use DIFF_OPT_SET macro to set a diff flag
53
+
54
+ A single-word "unsigned flags" in the diff options is being split
55
+ into a structure with many bitfields.
56
+
57
+
58
+* dk/libsecret-unlock-to-load-fix (2017-11-04) 1 commit
59
+ (merged to 'next' on 2017-11-07 at 57d1d76c8c)
60
+ + credential-libsecret: unlock locked secrets
61
+
62
+ The credential helper for libsecret (in contrib/) has been improved
63
+ to allow possibly prompting the end user to unlock secrets that are
64
+ currently locked (otherwise the secrets may not be loaded).
65
+
66
+
67
+* jm/relnotes-2.15-typofix (2017-11-06) 1 commit
68
+ (merged to 'next' on 2017-11-07 at 60fc937b62)
69
+ + fix typos in 2.15.0 release notes
70
+
71
+ Typofix.
72
+
73
+
74
+* jm/status-ignored-files-list (2017-10-31) 4 commits
75
+ (merged to 'next' on 2017-11-07 at 682c74a2cb)
76
+ + status: test ignored modes
77
+ + status: document options to show matching ignored files
78
+ + status: report matching ignored and normal untracked
79
+ + status: add option to show ignored files differently
80
+
81
+ Originally merged to 'next' on 2017-11-01
82
+
83
+ The set of paths output from "git status --ignored" was tied
84
+ closely with its "--untracked=<mode>" option, but now it can be
85
+ controlled more flexibly. Most notably, a directory that is
86
+ ignored because it is listed to be ignored in the ignore/exclude
87
+ mechanism can be handled differently from a directory that ends up
88
+ to be ignored only because all files in it are ignored.
89
+
90
+
91
+* js/early-config (2017-11-03) 1 commit
92
+ (merged to 'next' on 2017-11-07 at 9477c7c8ea)
93
+ + setup: avoid double slashes when looking for HEAD
94
+
95
+ Correct start-up sequence so that a repository could be placed
96
+ immediately under the root directory again (which was broken at
97
+ around Git 2.13).
98
+
99
+
100
+* js/mingw-full-version-in-resources (2017-11-01) 1 commit
101
+ (merged to 'next' on 2017-11-07 at 3a256b5ddc)
102
+ + mingw: include the full version information in the resources
103
+
104
+ MinGW updates.
105
+
106
+
107
+* js/mingw-redirect-std-handles (2017-11-02) 3 commits
108
+ (merged to 'next' on 2017-11-07 at 9af6a3dea0)
109
+ + mingw: document the standard handle redirection
110
+ + mingw: optionally redirect stderr/stdout via the same handle
111
+ + mingw: add experimental feature to redirect standard handles
112
+
113
+ MinGW updates.
114
+
115
+
116
+* js/wincred-empty-cred (2017-11-01) 2 commits
117
+ (merged to 'next' on 2017-11-07 at 43d3fcc30a)
118
+ + wincred: handle empty username/password correctly
119
+ + t0302: check helper can handle empty credentials
120
+
121
+ MinGW updates.
122
+
123
+
124
+* ks/mailmap (2017-11-03) 1 commit
125
+ (merged to 'next' on 2017-11-07 at 46975637c7)
126
+ + mailmap: use Kaartic Sivaraam's new address
127
+
128
+
129
+* rs/hex-to-bytes-cleanup (2017-11-01) 3 commits
130
+ (merged to 'next' on 2017-11-07 at fac14770e1)
131
+ + sha1_file: use hex_to_bytes()
132
+ + http-push: use hex_to_bytes()
133
+ + notes: move hex_to_bytes() to hex.c and export it
134
+
135
+ Code cleanup.
136
+
137
+
138
+* sb/blame-config-doc (2017-11-06) 1 commit
139
+ (merged to 'next' on 2017-11-07 at 0576cb452f)
140
+ + config: document blame configuration
141
+
142
+ Description of blame.{showroot,blankboundary,showemail,date}
143
+ configuration variables have been added to "git config --help".
144
+
145
+
146
+* sg/travis-fixes (2017-11-02) 2 commits
147
+ (merged to 'next' on 2017-11-07 at bbf39361b6)
148
+ + travis-ci: don't build Git for the static analysis job
149
+ + travis-ci: fix running P4 and Git LFS tests in Linux build jobs
150
+
151
+ TravisCI build updates.
152
+
153
--------------------------------------------------
154
[New Topics]
155
26
-* bw/rebase-i-ignored-submodule-fix (2017-11-07) 1 commit
27
- - wt-status: actually ignore submodules when requested
156
+* ad/rebase-i-serie-typofix (2017-11-09) 1 commit
157
+ (merged to 'next' on 2017-11-13 at 199e79b29e)
158
+ + rebase -i: fix comment typo
159
29
- "git rebase -i" recently started misbehaving when a submodule that
30
- is configured with 'submodule.<name>.ignore' is dirty; this has
31
- been corrected.
160
+ Will merge to 'master'.
161
+
162
+
163
+* ad/submitting-patches-title-decoration (2017-11-11) 1 commit
164
+ - doc/SubmittingPatches: correct subject guidance
165
+
166
+ Doc update around use of "format-patch --subject-prefix" etc.
167
168
Will merge to 'next'.
34
- I've edited in the tweak brought up in the discussion. Please
35
- eyeball to sanity check.
169
170
38
-* ar/unconfuse-three-dots (2017-11-07) 3 commits
39
- - Documentation: revisions: add note about 3dots usages as continuation indications
40
- - Documentation: user-manual: limit potentially confusing usage of 3dots (and 2dots)
41
- - checkout: describe_detached_head: remove 3dots after committish
171
+* jc/merge-base-fork-point-doc (2017-11-09) 1 commit
172
+ - merge-base --fork-point doc: clarify the example and failure modes
173
43
- Ancient part of codebase still shows dots after an abbreviated
44
- object name just to show that it is not a full object name, but
45
- these ellipses are confusing to people who newly discovered Git
46
- who are used to seeing abbreviated object names and find them
47
- confusing with the range syntax.
174
+ Clarify and enhance documentation for "merge-base --fork-point", as
175
+ it was clear what it computed but not why/what for.
176
177
50
-* jt/submodule-tests-cleanup (2017-11-08) 1 commit
51
- - Tests: clean up and document submodule helpers
178
+* tz/fsf-address-update (2017-11-09) 3 commits
179
+ (merged to 'next' on 2017-11-13 at 97965f70d9)
180
+ + Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update
181
+ + Replace Free Software Foundation address in license notices
182
+ + Replace Free Software Foundation address in license notices
183
+
184
+ Will merge to 'master'.
185
+
186
+
187
+* bp/fastindex (2017-11-11) 5 commits
188
+ - SQUASH???
189
+ - fastindex: add documentation for the fastindex extension
190
+ - fastindex: add test tools and a test script
191
+ - update-index: add fastindex support to update-index
192
+ - fastindex: speed up index load through parallelization
193
+
194
+
195
+* pw/sequencer-in-process-commit (2017-11-11) 10 commits
196
+ - SQUASH??? styles
197
+ - sequencer: try to commit without forking 'git commit'
198
+ - sequencer: load commit related config
199
+ - sequencer: simplify adding Signed-off-by: trailer
200
+ - sequencer: don't die in print_commit_summary()
201
+ - commit: move print_commit_summary() to libgit
202
+ - commit: move post-rewrite code to libgit
203
+ - Add a function to update HEAD after creating a commit
204
+ - commit: move empty message checks to libgit
205
+ - t3404: check intermediate squash messages
206
+
207
+ The sequencer infrastructure is shared across "git cherry-pick",
208
+ "git rebase -i", etc., and has always spawned "git commit" when it
209
+ needs to create a commit. It has been taught to do so internally,
210
+ when able, by reusing the codepath "git commit" itself uses.
211
+
212
+
213
+* rs/apply-fuzzy-match-fix (2017-11-12) 1 commit
214
+ - apply: avoid out-of-bounds access in fuzzy_matchlines()
215
+
216
+ A fix for an ancient bug in "git apply --ignore-space-change" codepath.
217
+
218
+ Will merge to 'next'.
219
+
220
+
221
+* sb/test-cherry-pick-submodule-getting-in-a-way (2017-11-12) 1 commit
222
+ - t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
223
+
224
+ An additional test, in anticipation for a fix.
225
226
Will merge to 'next'.
227
+ It would be very preferrable if we can merge an actual fix together
228
+ to 'next', though.
229
+
230
+
231
+* ab/pcre-v2 (2017-11-13) 1 commit
232
+ (merged to 'next' on 2017-11-13 at 66bf57f071)
233
+ + grep: fix NO_LIBPCRE1_JIT to fully disable JIT
234
+
235
+ Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.
236
+
237
+ Will merge to 'master'.
238
+
239
+
240
+* cb/t4201-robustify (2017-11-13) 1 commit
241
+ (merged to 'next' on 2017-11-13 at b83957b8f2)
242
+ + t4201: make use of abbreviation in the test more robust
243
+
244
+ A test update.
245
+
246
+ Will merge to 'master'.
247
+
248
+
249
+* jk/info-alternates-fix (2017-11-13) 1 commit
250
+ (merged to 'next' on 2017-11-13 at ac84a7580a)
251
+ + link_alt_odb_entries: make empty input a noop
252
+
253
+ We used to add an empty alternate object database to the system
254
+ that does not help anything; it has been corrected.
255
+
256
+ Will merge to 'master'.
257
+
258
+
259
+* rd/bisect-view-is-visualize (2017-11-13) 1 commit
260
+ (merged to 'next' on 2017-11-13 at a36423f4ba)
261
+ + bisect: mention "view" as an alternative to "visualize"
262
+
263
+ Doc and message updates to teach users "bisect view" is a synonym
264
+ for "bisect visualize".
265
+
266
+ Will merge to 'master'.
267
+
268
+
269
+* sb/bisect-run-empty (2017-11-13) 1 commit
270
+ (merged to 'next' on 2017-11-13 at 90d20b8686)
271
+ + bisect run: die if no command is given
272
+
273
+ "git bisect run" that did not specify any command to run used to go
274
+ ahead and treated all commits to be tested as 'good'. This has
275
+ been corrected by making the command error out.
276
+
277
+ Will merge to 'master'.
278
+
279
+
280
+* en/rename-progress (2017-11-14) 5 commits
281
+ - sequencer: show rename progress during cherry picks
282
+ - diff: remove silent clamp of renameLimit
283
+ - SQUASH???
284
+ - progress: fix progress meters when dealing with lots of work
285
+ - sequencer: warn when internal merge may be suboptimal due to renameLimit
286
+
287
+ Historically, the diff machinery for rename detection had a
288
+ hardcoded limit of 32k paths; this is being lifted to allow users
289
+ trade cycles with a (possibly) easier to read result.
290
+
291
+ Will squash in the type-fix and merge to 'next'.
292
+
293
+
294
+* tz/redirect-fix (2017-11-14) 2 commits
295
+ - rebase: fix stderr redirect in apply_autostash()
296
+ - t/lib-gpg: fix gpgconf stderr redirect to /dev/null
297
+
298
+ A few scripts (both in production and tests) incorrectly redirected
299
+ their error output. These have been corrected.
300
+
301
+ Wait for the third one and then merge to 'next'.
302
303
--------------------------------------------------
304
[Stalled]
@@ -176,67 +424,80 @@ of the repositories listed at
424
--------------------------------------------------
425
[Cooking]
426
179
-* js/for-each-ref-remote-name-and-ref (2017-11-08) 3 commits
180
- - for-each-ref: test :remotename and :remoteref
181
- - for-each-ref: let upstream/push report the remote ref name
182
- - for-each-ref: let upstream/push optionally report the remote name
427
+* bw/rebase-i-ignored-submodule-fix (2017-11-07) 1 commit
428
+ (merged to 'next' on 2017-11-10 at a0a54103ed)
429
+ + wt-status: actually ignore submodules when requested
430
184
- The "--format=..." option "git for-each-ref" takes learned to show
185
- the name of the 'remote' repository and the ref at the remote side
186
- that is affected for 'upstream' and 'push' via "%(push:remotename)"
187
- and friends.
431
+ "git rebase -i" recently started misbehaving when a submodule that
432
+ is configured with 'submodule.<name>.ignore' is dirty; this has
433
+ been corrected.
434
189
- Will merge to 'next'.
435
+ Will merge to 'master'.
436
437
192
-* js/mingw-redirect-std-handles (2017-11-02) 3 commits
193
- (merged to 'next' on 2017-11-07 at 9af6a3dea0)
194
- + mingw: document the standard handle redirection
195
- + mingw: optionally redirect stderr/stdout via the same handle
196
- + mingw: add experimental feature to redirect standard handles
438
+* ar/unconfuse-three-dots (2017-11-07) 3 commits
439
+ - Documentation: revisions: add note about 3dots usages as continuation indications
440
+ - Documentation: user-manual: limit potentially confusing usage of 3dots (and 2dots)
441
+ - checkout: describe_detached_head: remove 3dots after committish
442
+
443
+ Ancient part of codebase still shows dots after an abbreviated
444
+ object name just to show that it is not a full object name, but
445
+ these ellipses are confusing to people who newly discovered Git
446
+ who are used to seeing abbreviated object names and find them
447
+ confusing with the range syntax.
448
198
- MinGW updates.
449
+
450
+* jt/submodule-tests-cleanup (2017-11-08) 1 commit
451
+ (merged to 'next' on 2017-11-10 at c6cbcdeaa4)
452
+ + Tests: clean up and document submodule helpers
453
454
Will merge to 'master'.
455
456
203
-* ma/bisect-leakfix (2017-11-06) 4 commits
204
- - bisect: fix memory leak when returning best element
205
- - bisect: fix off-by-one error in `best_bisection_sorted()`
206
- - bisect: fix memory leak in `find_bisection()`
207
- - bisect: change calling-convention of `find_bisection()`
457
+* js/for-each-ref-remote-name-and-ref (2017-11-08) 3 commits
458
+ (merged to 'next' on 2017-11-10 at 254af5d602)
459
+ + for-each-ref: test :remotename and :remoteref
460
+ + for-each-ref: let upstream/push report the remote ref name
461
+ + for-each-ref: let upstream/push optionally report the remote name
462
209
- Leak fixes.
463
+ The "--format=..." option "git for-each-ref" takes learned to show
464
+ the name of the 'remote' repository and the ref at the remote side
465
+ that is affected for 'upstream' and 'push' via "%(push:remotename)"
466
+ and friends.
467
211
- Will merge to 'next'.
468
+ Will merge to 'master'.
469
470
214
-* ma/reduce-heads-leakfix (2017-11-08) 2 commits
215
- - reduce_heads: fix memory leaks
216
- - builtin/merge-base: free commit lists
471
+* ma/bisect-leakfix (2017-11-06) 4 commits
472
+ (merged to 'next' on 2017-11-09 at c280d786f4)
473
+ + bisect: fix memory leak when returning best element
474
+ + bisect: fix off-by-one error in `best_bisection_sorted()`
475
+ + bisect: fix memory leak in `find_bisection()`
476
+ + bisect: change calling-convention of `find_bisection()`
477
478
Leak fixes.
479
220
- Will merge to 'next'.
480
+ Will merge to 'master'.
481
482
223
-* sg/travis-fixes (2017-11-02) 2 commits
224
- (merged to 'next' on 2017-11-07 at bbf39361b6)
225
- + travis-ci: don't build Git for the static analysis job
226
- + travis-ci: fix running P4 and Git LFS tests in Linux build jobs
483
+* ma/reduce-heads-leakfix (2017-11-08) 2 commits
484
+ (merged to 'next' on 2017-11-10 at 9428953ec8)
485
+ + reduce_heads: fix memory leaks
486
+ + builtin/merge-base: free commit lists
487
228
- TravisCI build updates.
488
+ Leak fixes.
489
490
Will merge to 'master'.
491
492
493
* sr/wrapper-quote-filenames (2017-11-06) 1 commit
234
- - wrapper.c: consistently quote filenames in error messages
494
+ (merged to 'next' on 2017-11-09 at a14ac8da60)
495
+ + wrapper.c: consistently quote filenames in error messages
496
497
Some error messages did not quote filenames shown in it, which have
498
been fixed.
499
239
- Will merge to 'next'.
500
+ Will merge to 'master'.
501
502
503
* jh/fsck-promisors (2017-11-08) 9 commits
@@ -263,42 +524,24 @@ of the repositories listed at
524
525
526
* jh/partial-clone (2017-11-08) 15 commits
266
- - fixup! upload-pack: add object filtering for partial clone
267
- - index-pack: silently assume missing objects are promisor
268
- - fetch-pack: restore save_commit_buffer after use
269
- - unpack-trees: batch fetching of missing blobs
270
- - t5500: more tests for partial clone and fetch
271
- - t5601: test for partial clone
272
- - t5500: add fetch-pack tests for partial clone
273
- - fetch: add from_promisor and exclude-promisor-objects parameters
274
- - fetch-pack: test support excluding large blobs
275
- - pack-objects: test support for blob filtering
276
- - remote-curl: add object filtering for partial clone
277
- - fetch: add object filtering for partial fetch
278
- - fetch: refactor calculation of remote list
279
- - clone, fetch-pack, index-pack, transport: partial clone
280
- - upload-pack: add object filtering for partial clone
527
+ . fixup! upload-pack: add object filtering for partial clone
528
+ . index-pack: silently assume missing objects are promisor
529
+ . fetch-pack: restore save_commit_buffer after use
530
+ . unpack-trees: batch fetching of missing blobs
531
+ . t5500: more tests for partial clone and fetch
532
+ . t5601: test for partial clone
533
+ . t5500: add fetch-pack tests for partial clone
534
+ . fetch: add from_promisor and exclude-promisor-objects parameters
535
+ . fetch-pack: test support excluding large blobs
536
+ . pack-objects: test support for blob filtering
537
+ . remote-curl: add object filtering for partial clone
538
+ . fetch: add object filtering for partial fetch
539
+ . fetch: refactor calculation of remote list
540
+ . clone, fetch-pack, index-pack, transport: partial clone
541
+ . upload-pack: add object filtering for partial clone
542
(this branch uses jh/fsck-promisors and jh/object-filtering.)
543
544
284
-* js/early-config (2017-11-03) 1 commit
285
- (merged to 'next' on 2017-11-07 at 9477c7c8ea)
286
- + setup: avoid double slashes when looking for HEAD
287
-
288
- Correct start-up sequence so that a repository could be placed
289
- immediately under the root directory again (which was broken at
290
- around Git 2.13).
291
-
292
- Will merge to 'master'.
293
-
294
-
295
-* ks/mailmap (2017-11-03) 1 commit
296
- (merged to 'next' on 2017-11-07 at 46975637c7)
297
- + mailmap: use Kaartic Sivaraam's new address
298
-
299
- Will merge to 'master'.
300
-
301
-
545
* rs/imap-send-next-arg-fix (2017-11-03) 2 commits
546
(merged to 'next' on 2017-11-07 at f4df55fe5b)
547
+ imap-send: handle missing response codes gracefully
@@ -310,85 +553,37 @@ of the repositories listed at
553
Will merge to 'master'.
554
555
313
-* dk/libsecret-unlock-to-load-fix (2017-11-04) 1 commit
314
- (merged to 'next' on 2017-11-07 at 57d1d76c8c)
315
- + credential-libsecret: unlock locked secrets
316
-
317
- The credential helper for libsecret (in contrib/) has been improved
318
- to allow possibly prompting the end user to unlock secrets that are
319
- currently locked (otherwise the secrets may not be loaded).
320
-
321
- Will merge to 'master'.
322
-
323
-
324
-* jm/relnotes-2.15-typofix (2017-11-06) 1 commit
325
- (merged to 'next' on 2017-11-07 at 60fc937b62)
326
- + fix typos in 2.15.0 release notes
327
-
328
- Typofix.
329
-
330
- Will merge to 'master'.
331
-
332
-
333
-* sb/blame-config-doc (2017-11-06) 1 commit
334
- (merged to 'next' on 2017-11-07 at 0576cb452f)
335
- + config: document blame configuration
336
-
337
- Description of blame.{showroot,blankboundary,showemail,date}
338
- configuration variables have been added to "git config --help".
339
-
340
- Will merge to 'master'.
341
-
342
-
343
-* ad/5580-unc-tests-on-cygwin (2017-11-01) 1 commit
344
- (merged to 'next' on 2017-11-07 at 34fc479da2)
345
- + t5580: add Cygwin support
346
-
347
- UNC paths are also relevant in Cygwin builds and they are now
348
- tested just like Mingw builds.
349
-
350
- Will merge to 'master'.
351
-
352
-
556
* ao/merge-verbosity-getenv-just-once (2017-11-01) 1 commit
354
- - merge-recursive: check GIT_MERGE_VERBOSITY only once
557
+ (merged to 'next' on 2017-11-09 at e7cfb8dcec)
558
+ + merge-recursive: check GIT_MERGE_VERBOSITY only once
559
560
Code cleanup.
561
358
- Will merge to 'next'.
562
+ Will merge to 'master'.
563
564
565
* bp/read-index-from-skip-verification (2017-11-08) 1 commit
362
- - read_index_from(): speed index loading by skipping verification of the entry order
566
+ (merged to 'next' on 2017-11-10 at 3c3e32f1ed)
567
+ + read_index_from(): speed index loading by skipping verification of the entry order
568
569
Drop (perhaps overly cautious) sanity check before using the index
570
read from the filesystem at runtime.
571
367
- Will merge to 'next'.
368
-
369
-
370
-* rs/hex-to-bytes-cleanup (2017-11-01) 3 commits
371
- (merged to 'next' on 2017-11-07 at fac14770e1)
372
- + sha1_file: use hex_to_bytes()
373
- + http-push: use hex_to_bytes()
374
- + notes: move hex_to_bytes() to hex.c and export it
375
-
376
- Code cleanup.
377
-
572
Will merge to 'master'.
573
574
575
* rs/sequencer-rewrite-file-cleanup (2017-11-02) 3 commits
382
- - sequencer.c: check return value of close() in rewrite_file()
383
- - sequencer: use O_TRUNC to truncate files
384
- - sequencer: factor out rewrite_file()
576
+ (merged to 'next' on 2017-11-09 at 06f45be770)
577
+ + sequencer.c: check return value of close() in rewrite_file()
578
+ + sequencer: use O_TRUNC to truncate files
579
+ + sequencer: factor out rewrite_file()
580
581
Code cleanup.
582
388
- Will merge to 'next'.
583
+ Will merge to 'master'.
584
585
391
-* sb/describe-blob (2017-11-03) 7 commits
586
+* sb/describe-blob (2017-11-13) 7 commits
587
- builtin/describe.c: describe a blob
588
- builtin/describe.c: factor out describe_commit
589
- builtin/describe.c: print debug statements earlier
@@ -422,85 +617,44 @@ of the repositories listed at
617
618
619
* ab/mediawiki-namespace (2017-11-08) 7 commits
425
- - remote-mediawiki: show progress while fetching namespaces
426
- - remote-mediawiki: process namespaces in order
427
- - remote-mediawiki: support fetching from (Main) namespace
428
- - remote-mediawiki: skip virtual namespaces
429
- - remote-mediawiki: show known namespace choices on failure
430
- - remote-mediawiki: allow fetching namespaces with spaces
431
- - remote-mediawiki: add namespace support
620
+ (merged to 'next' on 2017-11-10 at 1cf9cfdfbc)
621
+ + remote-mediawiki: show progress while fetching namespaces
622
+ + remote-mediawiki: process namespaces in order
623
+ + remote-mediawiki: support fetching from (Main) namespace
624
+ + remote-mediawiki: skip virtual namespaces
625
+ + remote-mediawiki: show known namespace choices on failure
626
+ + remote-mediawiki: allow fetching namespaces with spaces
627
+ + remote-mediawiki: add namespace support
628
629
The remote-helper for talking to MediaWiki has been updated to
630
work with mediawiki namespaces.
631
436
- Will merge to 'next'.
437
-
438
-
439
-* js/mingw-full-version-in-resources (2017-11-01) 1 commit
440
- (merged to 'next' on 2017-11-07 at 3a256b5ddc)
441
- + mingw: include the full version information in the resources
442
-
443
- MinGW updates.
444
-
445
- Will merge to 'master'.
446
-
447
-
448
-* js/wincred-empty-cred (2017-11-01) 2 commits
449
- (merged to 'next' on 2017-11-07 at 43d3fcc30a)
450
- + wincred: handle empty username/password correctly
451
- + t0302: check helper can handle empty credentials
452
-
453
- MinGW updates.
454
-
455
- Will merge to 'master'.
456
-
457
-
458
-* bw/diff-opt-impl-to-bitfields (2017-11-01) 8 commits
459
- (merged to 'next' on 2017-11-07 at 8be78206ba)
460
- + diff: make struct diff_flags members lowercase
461
- + diff: remove DIFF_OPT_CLR macro
462
- + diff: remove DIFF_OPT_SET macro
463
- + diff: remove DIFF_OPT_TST macro
464
- + diff: remove touched flags
465
- + diff: add flag to indicate textconv was set via cmdline
466
- + diff: convert flags to be stored in bitfields
467
- + add, reset: use DIFF_OPT_SET macro to set a diff flag
468
-
469
- A single-word "unsigned flags" in the diff options is being split
470
- into a structure with many bitfields.
471
-
632
Will merge to 'master'.
633
634
635
* mh/tidy-ref-update-flags (2017-11-06) 10 commits
476
- - refs: update some more docs to use "oid" rather than "sha1"
477
- - write_packed_entry(): take `object_id` arguments
478
- - refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`
479
- - refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`
480
- - refs: tidy up and adjust visibility of the `ref_update` flags
481
- - ref_transaction_add_update(): remove a check
482
- - ref_transaction_update(): die on disallowed flags
483
- - prune_ref(): call `ref_transaction_add_update()` directly
484
- - files_transaction_prepare(): don't leak flags to packed transaction
485
- - Merge branch 'bc/object-id' into base
636
+ (merged to 'next' on 2017-11-09 at 5231330c1c)
637
+ + refs: update some more docs to use "oid" rather than "sha1"
638
+ + write_packed_entry(): take `object_id` arguments
639
+ + refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`
640
+ + refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`
641
+ + refs: tidy up and adjust visibility of the `ref_update` flags
642
+ + ref_transaction_add_update(): remove a check
643
+ + ref_transaction_update(): die on disallowed flags
644
+ + prune_ref(): call `ref_transaction_add_update()` directly
645
+ + files_transaction_prepare(): don't leak flags to packed transaction
646
+ + Merge branch 'bc/object-id' into base
647
648
Code clean-up in refs API implementation.
649
489
- Will merge to 'next'.
490
-
491
-
492
-* ao/diff-populate-filespec-lstat-errorpath-fix (2017-10-29) 1 commit
493
- (merged to 'next' on 2017-11-07 at b03241e6e5)
494
- + diff: fix lstat() error handling in diff_populate_filespec()
495
-
496
- After an error from lstat(), diff_populate_filespec() function
497
- sometimes still went ahead and used invalid data in struct stat,
498
- which has been fixed.
499
-
650
Will merge to 'master'.
651
652
503
-* av/fsmonitor (2017-11-01) 4 commits
653
+* av/fsmonitor (2017-11-13) 7 commits
654
+ (merged to 'next' on 2017-11-13 at db56ad7eef)
655
+ + fsmonitor: simplify determining the git worktree under Windows
656
+ + fsmonitor: store fsmonitor bitmap before splitting index
657
+ + fsmonitor: read from getcwd(), not the PWD environment variable
658
(merged to 'next' on 2017-11-07 at a06178754d)
659
+ fsmonitor: delay updating state until after split index is merged
660
+ fsmonitor: document GIT_TRACE_FSMONITOR
@@ -510,17 +664,45 @@ of the repositories listed at
664
665
Various fixes to bp/fsmonitor topic.
666
513
- Will merge to 'master'.
667
+ Waiting for follow-on fixes to settle.
668
+
669
670
+* bp/fsmonitor (2017-10-05) 15 commits
671
+ (merged to 'next' on 2017-11-07 at b08d44ba60)
672
+ + fsmonitor: preserve utf8 filenames in fsmonitor-watchman log
673
+ + fsmonitor: read entirety of watchman output
674
+ + fsmonitor: MINGW support for watchman integration
675
+ + fsmonitor: add a performance test
676
+ + fsmonitor: add a sample integration script for Watchman
677
+ + fsmonitor: add test cases for fsmonitor extension
678
+ + split-index: disable the fsmonitor extension when running the split index test
679
+ + fsmonitor: add a test tool to dump the index extension
680
+ + update-index: add fsmonitor support to update-index
681
+ + ls-files: Add support in ls-files to display the fsmonitor valid bit
682
+ + fsmonitor: add documentation for the fsmonitor extension.
683
+ + fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.
684
+ + update-index: add a new --force-write-index option
685
+ + preload-index: add override to enable testing preload-index
686
+ + bswap: add 64 bit endianness helper get_be64
687
+ (this branch is used by av/fsmonitor.)
688
516
-* bc/submitting-patches-in-asciidoc (2017-10-30) 2 commits
517
- - Documentation: convert SubmittingPatches to AsciiDoc
518
- - Documentation: enable compat-mode for Asciidoctor
689
+ Originally merged to 'next' on 2017-10-05
690
+
691
+ We learned to talk to watchman to speed up "git status" and other
692
+ operations that need to see which paths have been modified.
693
+
694
+ Waiting for follow-on fixes to settle.
695
+
696
+
697
+* bc/submitting-patches-in-asciidoc (2017-11-13) 2 commits
698
+ (merged to 'next' on 2017-11-13 at 70f65b981a)
699
+ + Documentation: convert SubmittingPatches to AsciiDoc
700
+ + Documentation: enable compat-mode for Asciidoctor
701
702
The SubmittingPatches document has been converted to produce an
703
HTML version via AsciiDoc/Asciidoctor.
704
523
- Any further comments? Otherwise, will merge to 'next'.
705
+ Will merge to 'master'.
706
707
708
* pb/bisect-helper-2 (2017-10-28) 8 commits
@@ -546,49 +728,32 @@ of the repositories listed at
728
729
730
* mh/avoid-rewriting-packed-refs (2017-10-30) 2 commits
549
- - files-backend: don't rewrite the `packed-refs` file unnecessarily
550
- - t1409: check that `packed-refs` is not rewritten unnecessarily
731
+ (merged to 'next' on 2017-11-09 at 272e27cc9a)
732
+ + files-backend: don't rewrite the `packed-refs` file unnecessarily
733
+ + t1409: check that `packed-refs` is not rewritten unnecessarily
734
735
Recent update to the refs infrastructure implementation started
736
rewriting packed-refs file more often than before; this has been
737
optimized again for most trivial cases.
738
556
- Will merge to 'next'.
739
+ Will merge to 'master'.
740
741
742
* cc/git-packet-pm (2017-11-07) 8 commits
560
- - Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
561
- - t0021/rot13-filter: add capability functions
562
- - t0021/rot13-filter: refactor checking final lf
563
- - t0021/rot13-filter: add packet_initialize()
564
- - t0021/rot13-filter: improve error message
565
- - t0021/rot13-filter: improve 'if .. elsif .. else' style
566
- - t0021/rot13-filter: refactor packet reading functions
567
- - t0021/rot13-filter: fix list comparison
743
+ (merged to 'next' on 2017-11-10 at b40bc2c0bb)
744
+ + Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
745
+ + t0021/rot13-filter: add capability functions
746
+ + t0021/rot13-filter: refactor checking final lf
747
+ + t0021/rot13-filter: add packet_initialize()
748
+ + t0021/rot13-filter: improve error message
749
+ + t0021/rot13-filter: improve 'if .. elsif .. else' style
750
+ + t0021/rot13-filter: refactor packet reading functions
751
+ + t0021/rot13-filter: fix list comparison
752
753
Parts of a test to drive the long-running content filter interface
754
has been split into its own module, hopefully to eventually become
755
reusable.
756
573
- Will merge to 'next'.
574
-
575
-
576
-* jm/status-ignored-files-list (2017-10-31) 4 commits
577
- (merged to 'next' on 2017-11-07 at 682c74a2cb)
578
- + status: test ignored modes
579
- + status: document options to show matching ignored files
580
- + status: report matching ignored and normal untracked
581
- + status: add option to show ignored files differently
582
-
583
- Originally merged to 'next' on 2017-11-01
584
-
585
- The set of paths output from "git status --ignored" was tied
586
- closely with its "--untracked=<mode>" option, but now it can be
587
- controlled more flexibly. Most notably, a directory that is
588
- ignored because it is listed to be ignored in the ignore/exclude
589
- mechanism can be handled differently from a directory that ends up
590
- to be ignored only because all files in it are ignored.
591
-
757
Will merge to 'master'.
758
759
@@ -626,33 +791,6 @@ of the repositories listed at
791
Will merge to 'next'.
792
793
629
-* bp/fsmonitor (2017-10-05) 15 commits
630
- (merged to 'next' on 2017-11-07 at b08d44ba60)
631
- + fsmonitor: preserve utf8 filenames in fsmonitor-watchman log
632
- + fsmonitor: read entirety of watchman output
633
- + fsmonitor: MINGW support for watchman integration
634
- + fsmonitor: add a performance test
635
- + fsmonitor: add a sample integration script for Watchman
636
- + fsmonitor: add test cases for fsmonitor extension
637
- + split-index: disable the fsmonitor extension when running the split index test
638
- + fsmonitor: add a test tool to dump the index extension
639
- + update-index: add fsmonitor support to update-index
640
- + ls-files: Add support in ls-files to display the fsmonitor valid bit
641
- + fsmonitor: add documentation for the fsmonitor extension.
642
- + fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.
643
- + update-index: add a new --force-write-index option
644
- + preload-index: add override to enable testing preload-index
645
- + bswap: add 64 bit endianness helper get_be64
646
- (this branch is used by av/fsmonitor.)
647
-
648
- Originally merged to 'next' on 2017-10-05
649
-
650
- We learned to talk to watchman to speed up "git status" and other
651
- operations that need to see which paths have been modified.
652
-
653
- Will merge to 'master'.
654
-
655
-
794
* bw/protocol-v1 (2017-10-17) 11 commits
795
- Documentation: document Extra Parameters
796
- ssh: introduce a 'simple' ssh variant
@@ -674,7 +812,7 @@ of the repositories listed at
812
Waiting for jn/ssh-wrappers topic.
813
814
677
-* bc/hash-algo (2017-10-30) 4 commits
815
+* bc/hash-algo (2017-11-13) 4 commits
816
- Switch empty tree and blob lookups to use hash abstraction
817
- Integrate hash algorithm support with repo setup
818
- Add structure representing hash algorithm
@@ -684,7 +822,8 @@ of the repositories listed at
822
introduced, and an effort to plumb that throughout various
823
codepaths has been started.
824
687
- cf. <20171028181239.59458-1-sandals@crustytoothpaste.net>
825
+ Looked more or less OK to me. Ready to merge to 'next'? Further
826
+ comments?
827
828
829
* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits