What's cooking (2019/04 #03)
Junio C Hamano committed
Apr 16, 2019 at 22:15 UTC
9fac90436f6257ff26624c3ef6f5aaf67a8e23e0
1 file changed
+693
-703
whats-cooking.txt
+693
-703
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2019, #02; Wed, 10)
4
-X-master-at: e35b8cb8e212e3557efc565157ceb5cbaaf0d87f
5
-X-next-at: 511ec345e18b91bfc070cff61e34b433cb3e5a41
3
+Subject: What's cooking in git.git (Apr 2019, #03; Tue, 16)
4
+X-master-at: ffac537e6cbbf934b08745a378932722df287a53
5
+X-next-at: eec228f530d9d313a19229f23f7408717d5bfe04
6
7
-What's cooking in git.git (Apr 2019, #02; Wed, 10)
7
+What's cooking in git.git (Apr 2019, #03; Tue, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -24,118 +24,494 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
27
-* ar/t4150-remove-cruft (2019-03-13) 1 commit
28
- (merged to 'next' on 2019-03-20 at a0106a8d5c)
29
- + t4150: remove unused variable
27
+* ab/doc-misc-typofixes (2019-03-18) 1 commit
28
+ (merged to 'next' on 2019-04-10 at 06d19acd7e)
29
+ + doc: fix typos in man pages
30
31
- Test cleanup.
31
+ Typofixes.
32
33
34
-* dl/ignore-docs (2019-03-08) 2 commits
35
- (merged to 'next' on 2019-03-20 at f1f50c07ef)
36
- + docs: move core.excludesFile from git-add to gitignore
37
- + git-clean.txt: clarify ignore pattern files
34
+* ab/drop-scripted-rebase (2019-03-20) 1 commit
35
+ (merged to 'next' on 2019-04-10 at ff8abf36ae)
36
+ + rebase: remove the rebase.useBuiltin setting
37
39
- Doc update.
38
+ Retire scripted "git rebase" implementation.
39
40
42
-* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
43
- (merged to 'next' on 2019-03-20 at 984b4586c7)
44
- + git-reset.txt: clarify documentation
41
+* bb/unicode-12 (2019-03-22) 1 commit
42
+ (merged to 'next' on 2019-04-10 at b0dfa1001e)
43
+ + unicode: update the width tables to Unicode 12
44
+
45
+ Unicode update.
46
+
47
+
48
+* dl/subtree-limit-to-one-rev (2019-03-12) 1 commit
49
+ (merged to 'next' on 2019-04-10 at 8631f869c5)
50
+ + contrib/subtree: ensure only one rev is provided
51
+
52
+ "git subtree" (in contrib/) update.
53
+
54
+
55
+* jc/format-patch-error-check (2019-02-22) 2 commits
56
+ (merged to 'next' on 2019-04-10 at 6ca358b7ef)
57
+ + format-patch: notice failure to open cover letter for writing
58
+ + builtin/log: downcase the beginning of error messages
59
+ (this branch is used by jc/format-patch-noclobber.)
60
+
61
+ "git format-patch" used overwrite an existing patch/cover-letter
62
+ file. A new "--no-clobber" option stops it.
63
+
64
+
65
+* jh/midx-verify-too-many-packs (2019-03-22) 4 commits
66
+ (merged to 'next' on 2019-04-10 at 2ac6c933d4)
67
+ + midx: during verify group objects by packfile to speed verification
68
+ + midx: add progress indicators in multi-pack-index verify
69
+ + trace2:data: add trace2 data to midx
70
+ + progress: add sparse mode to force 100% complete message
71
+
72
+ "git multi-pack-index verify" did not scale well with the number of
73
+ packfiles, which is being improved.
74
+
75
+
76
+* jk/http-walker-status-fix (2019-03-24) 3 commits
77
+ (merged to 'next' on 2019-04-10 at d49336dd3b)
78
+ + http: use normalize_curl_result() instead of manual conversion
79
+ + http: normalize curl results for dumb loose and alternates fetches
80
+ + http: factor out curl result code normalization
81
+
82
+ dumb-http walker has been updated to share more error recovery
83
+ strategy with the normal codepath.
84
+
85
+
86
+* jk/perf-lib-tee (2019-03-18) 1 commit
87
+ (merged to 'next' on 2019-04-10 at de18327138)
88
+ + perf-lib.sh: rely on test-lib.sh for --tee handling
89
+
90
+ Code cleanup in the test framework.
91
+
92
+
93
+* jk/refs-double-abort (2019-03-22) 2 commits
94
+ (merged to 'next' on 2019-04-10 at e160d4a5b0)
95
+ + refs/files-backend: don't look at an aborted transaction
96
+ + refs/files-backend: handle packed transaction prepare failure
97
+
98
+ A corner case bug in the refs API has been corrected.
99
+
100
+
101
+* js/anonymize-remote-curl-diag (2019-03-05) 1 commit
102
+ (merged to 'next' on 2019-04-10 at 137a191021)
103
+ + curl: anonymize URLs in error messages and warnings
104
+ (this branch is used by js/remote-curl-i18n.)
105
+
106
+ remote-http transport did not anonymize URLs reported in its error
107
+ messages at places.
108
+
109
+
110
+* js/get-short-oid-drop-cache (2019-03-14) 4 commits
111
+ (merged to 'next' on 2019-04-10 at 5c77e39722)
112
+ + get_oid(): when an object was not found, try harder
113
+ + sequencer: move stale comment into correct location
114
+ + sequencer: improve error message when an OID could not be parsed
115
+ + rebase -i: demonstrate obscure loose object cache bug
116
+
117
+ A corner-case object name ambiguity while the sequencer machinery
118
+ is working (e.g. "rebase -i -x") has been fixed.
119
+
120
+
121
+* js/init-db-update-for-mingw (2019-03-12) 1 commit
122
+ (merged to 'next' on 2019-04-10 at 1d5768849f)
123
+ + mingw: respect core.hidedotfiles = false in git-init again
124
+
125
+ "git init" forgot to read platform-specific repository
126
+ configuration, which made Windows port to ignore settings of
127
+ core.hidedotfiles, for example.
128
+
129
+
130
+* js/remote-curl-i18n (2019-03-06) 1 commit
131
+ (merged to 'next' on 2019-04-10 at 4814acf6c8)
132
+ + remote-curl: mark all error messages for translation
133
+ (this branch uses js/anonymize-remote-curl-diag.)
134
+
135
+ Error messages given from the http transport have been updated so
136
+ that they can be localized.
137
+
138
+
139
+* jt/t5551-protocol-v2-does-not-have-half-auth (2019-03-24) 1 commit
140
+ (merged to 'next' on 2019-04-10 at 86ca3ebf33)
141
+ + t5551: mark half-auth no-op fetch test as v0-only
142
+
143
+ Test update.
144
+
145
+
146
+* jt/test-protocol-version (2019-03-07) 8 commits
147
+ (merged to 'next' on 2019-03-20 at 0c97907bdb)
148
+ + t5552: compensate for v2 filtering ref adv.
149
+ + tests: fix protocol version for overspecifications
150
+ + t5700: only run with protocol version 1
151
+ + t5512: compensate for v0 only sending HEAD symrefs
152
+ + t5503: fix overspecification of trace expectation
153
+ + tests: always test fetch of unreachable with v0
154
+ + t5601: check ssh command only with protocol v0
155
+ + tests: define GIT_TEST_PROTOCOL_VERSION
156
+ (this branch is used by jt/fetch-no-update-shallow-in-proto-v2.)
157
+
158
+ Help developers by making it easier to run most of the tests under
159
+ different versions of over-the-wire protocols.
160
+
161
+
162
+* ma/asciidoctor-fixes (2019-03-11) 3 commits
163
+ (merged to 'next' on 2019-04-10 at 41a7f51003)
164
+ + asciidoctor-extensions: fix spurious space after linkgit
165
+ + Documentation/Makefile: add missing dependency on asciidoctor-extensions
166
+ + Documentation/Makefile: add missing xsl dependencies for manpages
167
+
168
+ Build fix around use of asciidoctor instead of asciidoc
169
+
170
+
171
+* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
172
+ (merged to 'next' on 2019-04-10 at 77cf886e7e)
173
+ + Documentation: turn middle-of-line tabs into spaces
174
+ + git-svn.txt: drop escaping '\' that ends up being rendered
175
+ + git.txt: remove empty line before list continuation
176
+ + config/fsck.txt: avoid starting line with dash
177
+ + config/diff.txt: drop spurious backtick
178
+
179
+ Documentation mark-up fixes.
180
+
181
+
182
+* ma/doc-diff-doc-vs-doctor-comparison (2019-03-18) 4 commits
183
+ (merged to 'next' on 2019-04-10 at af08a97ab9)
184
+ + doc-diff: add `--cut-header-footer`
185
+ + doc-diff: support diffing from/to AsciiDoc(tor)
186
+ + doc-diff: let `render_tree()` take an explicit directory name
187
+ + Doc: auto-detect changed build flags
188
+
189
+ Dev support update to make it easier to compare two formatted
190
+ results from our documentation.
191
+ cf. <20190319031412.GC6173@sigill.intra.peff.net>
192
+
193
+
194
+* mh/pack-protocol-doc-fix (2019-03-18) 1 commit
195
+ (merged to 'next' on 2019-04-10 at 037673d71c)
196
+ + fix pack protocol example client/server communication
197
+
198
+ Docfix.
199
+
200
+
201
+* nd/checkout-f-while-conflicted-fix (2019-03-21) 1 commit
202
+ (merged to 'next' on 2019-04-10 at 1afc977435)
203
+ + unpack-trees: fix oneway_merge accidentally carry over stage index
204
+
205
+ "git checkout -f <branch>" while the index has an unmerged path
206
+ incorrectly left some paths in an unmerged state, which has been
207
+ corrected.
208
+
209
+
210
+* nd/checkout-m-doc-update (2019-03-21) 1 commit
211
+ (merged to 'next' on 2019-04-10 at cdda4e833e)
212
+ + checkout.txt: note about losing staged changes with --merge
213
+
214
+
215
+* nd/diff-parseopt-3 (2019-03-07) 20 commits
216
+ (merged to 'next' on 2019-03-20 at ee79d4924b)
217
+ + diff-parseopt: convert --submodule
218
+ + diff-parseopt: convert --ignore-submodules
219
+ + diff-parseopt: convert --textconv
220
+ + diff-parseopt: convert --ext-diff
221
+ + diff-parseopt: convert --quiet
222
+ + diff-parseopt: convert --exit-code
223
+ + diff-parseopt: convert --color-words
224
+ + diff-parseopt: convert --word-diff-regex
225
+ + diff-parseopt: convert --word-diff
226
+ + diff-parseopt: convert --[no-]color
227
+ + diff-parseopt: convert --[no-]follow
228
+ + diff-parseopt: convert -R
229
+ + diff-parseopt: convert -a|--text
230
+ + diff-parseopt: convert --full-index
231
+ + diff-parseopt: convert --binary
232
+ + diff-parseopt: convert --anchored
233
+ + diff-parseopt: convert --diff-algorithm
234
+ + diff-parseopt: convert --histogram
235
+ + diff-parseopt: convert --patience
236
+ + diff-parseopt: convert --[no-]indent-heuristic
237
+ (this branch is used by nd/diff-parseopt-4.)
238
+
239
+ Third batch to teach the diff machinery to use the parse-options
240
+ API.
241
+
242
+
243
+* pw/rerere-autoupdate (2019-03-18) 2 commits
244
+ (merged to 'next' on 2019-04-10 at cf79e86682)
245
+ + merge: tweak --rerere-autoupdate documentation
246
+ + am/cherry-pick/rebase/revert: document --rerere-autoupdate
247
+
248
+ Doc updates.
249
+
250
+
251
+* sg/t5318-cleanup (2019-03-24) 1 commit
252
+ (merged to 'next' on 2019-04-10 at 787b1b5073)
253
+ + t5318-commit-graph: remove unused variable
254
+
255
+ Code cleanup.
256
46
- Doc update.
257
+
258
+* tb/trace2-va-list-fix (2019-03-20) 1 commit
259
+ (merged to 'next' on 2019-04-10 at 94fe0f66d8)
260
+ + trace2: NULL is not allowed for va_list
261
+
262
+ Fix some code that passed a NULL when a va_list was expected.
263
264
49
-* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
50
- (merged to 'next' on 2019-03-20 at f3238df381)
51
- + Doc: fix misleading asciidoc formating
265
+* tg/glossary-overlay (2019-03-18) 1 commit
266
+ (merged to 'next' on 2019-04-10 at f5415c65cc)
267
+ + glossary: add definition for overlay
268
269
Doc update.
270
271
56
-* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit
57
- (merged to 'next' on 2019-03-20 at 92a24b29ed)
58
- + convert: avoid malloc of original file size
272
+* tz/completion (2019-03-21) 4 commits
273
+ (merged to 'next' on 2019-04-10 at a26ec8420f)
274
+ + completion: use __git when calling --list-cmds
275
+ + completion: fix multiple command removals
276
+ + t9902: test multiple removals via completion.commands
277
+ + git: read local config in --list-cmds
278
60
- When the "clean" filter can reduce the size of a huge file in the
61
- working tree down to a small "token" (a la Git LFS), there is no
62
- point in allocating a huge scratch area upfront, but the buffer is
63
- sized based on the original file size. The convert mechanism now
64
- allocates very minimum and reallocates as it receives the output
65
- from the clean filter process.
279
+ The completion helper code now pays attention to repository-local
280
+ configuration (when available), which allows --list-cmds to honour
281
+ a repository specific setting of completion.commands, for example.
282
+ cf. <20190320180329.22280-1-tmz@pobox.com> (v3)
283
284
68
-* jk/line-log-with-patch (2019-03-11) 2 commits
69
- (merged to 'next' on 2019-03-20 at 21afea908c)
70
- + line-log: detect unsupported formats
71
- + line-log: suppress diff output with "-s"
285
+* tz/t4038-bash-redirect-target-workaround (2019-03-18) 1 commit
286
+ (merged to 'next' on 2019-04-10 at 9845123f19)
287
+ + t4038-diff-combined: quote paths with whitespace
288
73
- "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
74
- output as it should. This has been corrected.
289
+ Work-around extra warning from bash in our tests.
290
+
291
+--------------------------------------------------
292
+[New Topics]
293
+
294
+* hs/send-email-transferencoding-fix (2019-04-10) 1 commit
295
+ - send-email: honor transferencoding config option again
296
+
297
+ Since "git send-email" learned to take 'auto' as the value for the
298
+ transfer-encoding, it by mistake stopped honoring the values given
299
+ to the configuration variables sendemail.transferencoding and/or
300
+ sendemail.<ident>.transferencoding. Attempt to correct this.
301
+
302
+ Not quite.
303
+ cf. <xmqq8swi34h5.fsf@gitster-ct.c.googlers.com>
304
+
305
+
306
+* jk/xmalloc (2019-04-12) 4 commits
307
+ - progress: use xmalloc/xcalloc
308
+ - xdiff: use xmalloc/xrealloc
309
+ - xdiff: use git-compat-util
310
+ - test-prio-queue: use xmalloc
311
+
312
+ The code is updated to check the result of memory allocation before
313
+ it is used in more places, by using xmalloc and/or xcalloc calls.
314
+
315
+ Will merge to 'next'.
316
317
77
-* jk/promote-ggg (2019-03-13) 1 commit
78
- (merged to 'next' on 2019-03-20 at 3db7d2566d)
79
- + point pull requesters to GitGitGadget
318
+* js/untracked-cache-allocfix (2019-04-12) 1 commit
319
+ - untracked cache: fix off-by-one
320
81
- Suggest GitGitGadget instead of submitGit as a way to submit
82
- patches based on GitHub PR to us.
321
+ An underallocation in the code to read the untracked cache
322
+ extension has been corrected.
323
324
+ Will merge to 'next'.
325
+
326
+
327
+* km/t3000-retitle (2019-04-12) 1 commit
328
+ - t3000 (ls-files -o): widen description to reflect current tests
329
85
-* jk/sha1dc (2019-03-13) 1 commit
86
- (merged to 'next' on 2019-03-20 at 969280e8e5)
87
- + Makefile: fix unaligned loads in sha1dc with UBSan
330
+ A test update.
331
+
332
+ Will merge to 'next'.
333
89
- Build update for SHA-1 with collision detection.
334
335
+* bc/send-email-qp-cr (2019-04-14) 1 commit
336
+ - send-email: default to quoted-printable when CR is present
337
92
-* js/rebase-deprecate-preserve-merges (2019-03-12) 1 commit
93
- (merged to 'next' on 2019-03-20 at 32baac3acd)
94
- + rebase: deprecate --preserve-merges
338
+ "git send-email" has been taught to use quoted-printable when the
339
+ payload contains carriage-return. The use of the mechanism is in
340
+ line with the design originally added the codepath that chooses QP
341
+ when the payload has overly long lines.
342
96
- "git rebase --rebase-merges" replaces its old "--preserve-merges"
97
- option; the latter is now marked as deprecated.
343
+ Will merge to 'next'.
344
+
345
+
346
+* jc/gettext-test-fix (2019-04-15) 1 commit
347
+ - gettext tests: export the restored GIT_TEST_GETTEXT_POISON
348
+
349
+ The GETTEXT_POISON test option has been quite broken ever since it
350
+ was made runtime-tunable, which has been fixed.
351
+
352
+ Will merge to 'next'.
353
+
354
+
355
+* jk/fetch-reachability-error-fix (2019-04-15) 7 commits
356
+ - fetch: do not consider peeled tags as advertised tips
357
+ - remote.c: make singular free_ref() public
358
+ - fetch: use free_refs()
359
+ - pkt-line: prepare buffer before handling ERR packets
360
+ - upload-pack: send ERR packet for non-tip objects
361
+ - t5530: check protocol response for "not our ref"
362
+ - t5516: drop ok=sigpipe from unreachable-want tests
363
+
364
+ Code clean-up and a fix for "git fetch" by an explicit object name
365
+ (as opposed to fetching refs by name).
366
+
367
+ Will merge to 'next'.
368
+
369
+
370
+* jk/pack-objects-reports-num-objects-to-trace2 (2019-04-12) 1 commit
371
+ - pack-objects: write objects packed to trace2
372
+
373
+ The "git pack-objects" command learned to report the number of
374
+ objects it packed via the trace2 mechanism.
375
+
376
+ Will merge to 'next'.
377
+
378
+
379
+* js/iso8895-test-on-apfs (2019-04-15) 1 commit
380
+ - t9822: skip tests if file names cannot be ISO-8859-1 encoded
381
+
382
+ Test fix on APFS that is incapable of store paths in Latin-1.
383
+
384
+ Will merge to 'next'.
385
+
386
+
387
+* js/macos-gettext-build (2019-04-15) 1 commit
388
+ - macOS: make sure that gettext is found
389
+
390
+ Build with gettext breaks on recent macOS w/ Homebrew when
391
+ /usr/local/bin is not on PATH, which has been corrected.
392
+
393
+
394
+* js/misc-doc-fixes (2019-04-15) 7 commits
395
+ - test-tool: handle the `-C <directory>` option just like `git`
396
+ - check-docs: do not bother checking for legacy scripts' documentation
397
+ - SQUASH???
398
+ - docs: exclude documentation for commands that have been excluded
399
+ - check-docs: do not pretend that commands are listed which are excluded
400
+ - help -a: do not list commands that are excluded from the build
401
+ - remote-testgit: move it into the support directory for t5801
402
+ (this branch uses js/check-docs-exe.)
403
+
404
+ "make check-docs", "git help -a", etc. did not account for cases
405
+ where a particular build may deliberately omit some subcommands,
406
+ which has been corrected.
407
+
408
+ Under review.
409
+
410
+
411
+* nd/submodule-foreach-quiet (2019-04-15) 1 commit
412
+ - submodule foreach: fix "<command> --quiet" not being respected
413
+
414
+ "git submodule foreach <command> --quiet" did not pass the option
415
+ down correctly, which has been corrected.
416
+
417
+ Will merge to 'next'.
418
+
419
+--------------------------------------------------
420
+[Stalled]
421
+
422
+* nb/branch-show-other-worktrees-head (2019-03-18) 3 commits
423
+ - branch: add worktree info on verbose output
424
+ - branch: update output to include worktree info
425
+ - ref-filter: add worktreepath atom
426
+
427
+ "git branch --list" learned to show branches that are checked out
428
+ in other worktrees connected to the same repository prefixed with
429
+ '+', similar to the way the currently checked out branch is shown
430
+ with '*' in front.
431
+
432
+ Getting there...
433
+ cf. <20190316013807.38756-1-nbelakovski@gmail.com> (v9)
434
+ cf. <20190318121054.GC24175@szeder.dev>
435
+
436
+
437
+* jt/fetch-cdn-offload (2019-03-12) 9 commits
438
+ - SQUASH???
439
+ - upload-pack: send part of packfile response as uri
440
+ - fetch-pack: support more than one pack lockfile
441
+ - upload-pack: refactor reading of pack-objects out
442
+ - Documentation: add Packfile URIs design doc
443
+ - Documentation: order protocol v2 sections
444
+ - http-fetch: support fetching packfiles by URL
445
+ - http: improve documentation of http_pack_request
446
+ - http: use --stdin when getting dumb HTTP pack
447
+
448
+ WIP for allowing a response to "git fetch" to instruct the bulk of
449
+ the pack contents to be instead taken from elsewhere (aka CDN).
450
+
451
+ Waiting for the final version.
452
+
453
+
454
+* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
455
+ - add -p: coalesce hunks before testing applicability
456
+
457
+ Applicability check after a patch is edited in a "git add -i/p"
458
+ session has been improved.
459
+
460
+ Will hold.
461
+ cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
462
+
463
+
464
+* ds/midx-expire-repack (2019-01-27) 10 commits
465
+ - midx: add test that 'expire' respects .keep files
466
+ - multi-pack-index: test expire while adding packs
467
+ - midx: implement midx_repack()
468
+ - multi-pack-index: prepare 'repack' subcommand
469
+ - multi-pack-index: implement 'expire' subcommand
470
+ - midx: refactor permutation logic and pack sorting
471
+ - midx: simplify computation of pack name lengths
472
+ - multi-pack-index: prepare for 'expire' subcommand
473
+ - Docs: rearrange subcommands for multi-pack-index
474
+ - repack: refactor pack deletion for future use
475
+
476
+ "git multi-pack-index expire/repack" are new subcommands that
477
+ consult midx file and are used to drop unused pack files and
478
+ coalesce small pack files that are still in use.
479
480
+ Comments?
481
100
-* jt/submodule-fetch-errmsg (2019-03-14) 1 commit
101
- (merged to 'next' on 2019-03-20 at a6b0efa76f)
102
- + submodule: explain first attempt failure clearly
482
104
- Error message update.
105
- cf. <20190313175738.252961-1-jonathantanmy@google.com> (v2)
483
+* js/protocol-advertise-multi (2018-12-28) 1 commit
484
+ - protocol: advertise multiple supported versions
485
486
+ The transport layer has been updated so that the protocol version
487
+ used can be negotiated between the parties, by the initiator
488
+ listing the protocol versions it is willing to talk, and the other
489
+ side choosing from one of them.
490
108
-* ms/worktree-add-atomic-mkdir (2019-03-12) 1 commit
109
- (merged to 'next' on 2019-03-20 at ded442ed02)
110
- + worktree: fix worktree add race
491
+ Expecting a reroll.
492
+ cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
493
112
- "git worktree add" used to do a "find an available name with stat
113
- and then mkdir", which is race-prone. This has been fixed by using
114
- mkdir and reacting to EEXIST in a loop.
494
495
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
496
+ - zlib.c: use size_t for size
497
117
-* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits
118
- (merged to 'next' on 2019-03-20 at 5369a2e1f6)
119
- + Make sure refs/rewritten/ is per-worktree
120
- + files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
121
- + files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
498
+ The wrapper to call into zlib followed our long tradition to use
499
+ "unsigned long" for sizes of regions in memory, which have been
500
+ updated to use "size_t".
501
123
- "git rebase" uses the refs/rewritten/ hierarchy to store its
124
- intermediate states, which inherently makes the hierarchy per
125
- worktree, but it didn't quite work well.
502
503
+* dl/remote-save-to-push (2018-12-11) 1 commit
504
+ - remote: add --save-to-push option to git remote set-url
505
128
-* ra/t3600-test-path-funcs (2019-03-08) 3 commits
129
- (merged to 'next' on 2019-03-20 at 404110d291)
130
- + t3600: use helpers to replace test -d/f/e/s <path>
131
- + t3600: modernize style
132
- + test functions: add function `test_file_not_empty`
506
+ "git remote set-url" learned a new option that moves existing value
507
+ of the URL field to pushURL field of the remote before replacing
508
+ the URL field with a new value.
509
134
- A GSoC micro.
135
- cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)
510
+ Anybody who wants to champion this topic?
511
+ I am personally not yet quite convinced if this is worth pursuing.
512
513
--------------------------------------------------
138
-[New Topics]
514
+[Cooking]
515
516
* bs/sendemail-tighten-anything-by (2019-04-04) 1 commit
517
- send-email: don't cc *-by lines with '-' prefix
@@ -149,25 +525,27 @@ of the repositories listed at
525
526
527
* da/smerge (2019-04-04) 2 commits
152
- - contrib/completion: add smerge to the mergetool completion candidates
153
- - mergetools: add support for smerge (Sublime Merge)
528
+ (merged to 'next' on 2019-04-16 at 80bf79fee1)
529
+ + contrib/completion: add smerge to the mergetool completion candidates
530
+ + mergetools: add support for smerge (Sublime Merge)
531
532
"git mergetool" learned to offer Sublime Merge (smerge) as one of
533
its backends.
534
158
- Will merge to 'next'.
535
+ Will merge to 'master'.
536
537
538
* dl/flex-str-cocci (2019-04-04) 2 commits
162
- - cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR
163
- - midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR
539
+ (merged to 'next' on 2019-04-16 at e5cb2927b3)
540
+ + cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR
541
+ + midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR
542
543
Code clean-up.
544
167
- Will merge to 'next'.
545
+ Will merge to 'master'.
546
547
170
-* dl/warn-tagging-a-tag (2019-04-09) 2 commits
548
+* dl/warn-tagging-a-tag (2019-04-12) 2 commits
549
- tag: advise on nested tags
550
- tag: fix formatting
551
@@ -191,14 +569,15 @@ of the repositories listed at
569
570
571
* jk/revision-rewritten-parents-in-prio-queue (2019-04-04) 1 commit
194
- - revision: use a prio_queue to hold rewritten parents
572
+ (merged to 'next' on 2019-04-16 at bdc1465128)
573
+ + revision: use a prio_queue to hold rewritten parents
574
575
Performance fix for "rev-list --parents -- pathspec".
576
198
- Will merge to 'next'.
577
+ Will merge to 'master'.
578
579
201
-* tb/unexpected (2019-04-05) 7 commits
580
+* tb/unexpected (2019-04-10) 7 commits
581
- rev-list: detect broken root trees
582
- rev-list: let traversal die when --missing is not in use
583
- get_commit_tree(): return NULL for broken tree
@@ -211,9 +590,6 @@ of the repositories listed at
590
of a different type is expected, instead of blindly assuming that
591
the connection between objects are correctly made.
592
214
- Waiting for a reroll.
215
- cf. <20190406053308.GC37216@Taylors-MBP.hsd1.wa.comcast.net>
216
-
593
594
* en/merge-directory-renames (2019-04-08) 15 commits
595
- merge-recursive: switch directory rename detection default
@@ -244,26 +620,26 @@ of the repositories listed at
620
Will merge to 'next'.
621
622
247
-* jk/server-info-rabbit-hole (2019-04-08) 14 commits
248
- - update_info_refs(): drop unused force parameter
249
- - server-info: drop objdirlen pointer arithmetic
250
- - server-info: drop nr_alloc struct member
251
- - server-info: use strbuf to read old info/packs file
252
- - server-info: simplify cleanup in parse_pack_def()
253
- - server-info: fix blind pointer arithmetic
254
- - http: simplify parsing of remote objects/info/packs
255
- - packfile: fix pack basename computation
256
- - midx: check both pack and index names for containment
257
- - t5319: drop useless --buffer from cat-file
258
- - t5319: fix bogus cat-file argument
259
- - pack-revindex: open index if necessary
260
- - SQUASH???
261
- - packfile.h: drop extern from function declarations
623
+* jk/server-info-rabbit-hole (2019-04-16) 13 commits
624
+ (merged to 'next' on 2019-04-16 at 3dded8be9a)
625
+ + update_info_refs(): drop unused force parameter
626
+ + server-info: drop objdirlen pointer arithmetic
627
+ + server-info: drop nr_alloc struct member
628
+ + server-info: use strbuf to read old info/packs file
629
+ + server-info: simplify cleanup in parse_pack_def()
630
+ + server-info: fix blind pointer arithmetic
631
+ + http: simplify parsing of remote objects/info/packs
632
+ + packfile: fix pack basename computation
633
+ + midx: check both pack and index names for containment
634
+ + t5319: drop useless --buffer from cat-file
635
+ + t5319: fix bogus cat-file argument
636
+ + pack-revindex: open index if necessary
637
+ + packfile.h: drop extern from function declarations
638
639
Code clean-up around a much-less-important-than-it-used-to-be
640
update_server_info() funtion.
641
266
- Will merge to 'next' after squashing the SQUASH?? in.
642
+ Will merge to 'master'.
643
644
645
* js/rev-list-exclude-promisor-objects (2019-04-09) 1 commit
@@ -277,8 +653,11 @@ of the repositories listed at
653
cf. <xmqqo95f43dq.fsf@gitster-ct.c.googlers.com>
654
655
280
-* jt/clone-server-option (2019-04-09) 1 commit
656
+* jt/clone-server-option (2019-04-15) 4 commits
657
+ - SQUASH???
658
- clone: send server options when using protocol v2
659
+ - SQUASH???
660
+ - transport: die if server options are unsupported
661
662
"git clone" learned a new --server-option option when talking over
663
the protocol version 2.
@@ -324,21 +703,20 @@ of the repositories listed at
703
Will merge to 'next'.
704
705
327
-* tz/doc-apostrophe-no-longer-needed (2019-04-08) 1 commit
328
- - Documentation/git-show-branch: drop last use of {apostrophe}
706
+* tz/doc-apostrophe-no-longer-needed (2019-04-10) 1 commit
707
+ - Documentation/git-show-branch: avoid literal {apostrophe}
708
709
Doc formatting fix.
710
711
Will merge to 'next'.
712
713
335
-* tz/git-svn-doc-markup-fix (2019-04-08) 1 commit
714
+* tz/git-svn-doc-markup-fix (2019-04-10) 1 commit
715
- Documentation/git-svn: improve asciidoctor compatibility
716
717
Doc formatting fix.
718
340
- Needs a better description.
341
- cf. <CAN0heSpL_pQMtDaEdDgcsC_Sso45owHjRttrdp7cQdYOb7i9BA@mail.gmail.com>
719
+ Will merge to 'next'.
720
721
722
* js/t3301-unbreak-notes-test (2019-04-09) 1 commit
@@ -358,102 +736,6 @@ of the repositories listed at
736
May want to clarify the log message?
737
cf. <af640e82-ca1a-9c96-da47-62aaea1cc18e@web.de>
738
361
---------------------------------------------------
362
-[Stalled]
363
-
364
-* nb/branch-show-other-worktrees-head (2019-03-18) 3 commits
365
- - branch: add worktree info on verbose output
366
- - branch: update output to include worktree info
367
- - ref-filter: add worktreepath atom
368
-
369
- "git branch --list" learned to show branches that are checked out
370
- in other worktrees connected to the same repository prefixed with
371
- '+', similar to the way the currently checked out branch is shown
372
- with '*' in front.
373
-
374
- Getting there...
375
- cf. <20190316013807.38756-1-nbelakovski@gmail.com> (v9)
376
- cf. <20190318121054.GC24175@szeder.dev>
377
-
378
-
379
-* jt/fetch-cdn-offload (2019-03-12) 9 commits
380
- - SQUASH???
381
- - upload-pack: send part of packfile response as uri
382
- - fetch-pack: support more than one pack lockfile
383
- - upload-pack: refactor reading of pack-objects out
384
- - Documentation: add Packfile URIs design doc
385
- - Documentation: order protocol v2 sections
386
- - http-fetch: support fetching packfiles by URL
387
- - http: improve documentation of http_pack_request
388
- - http: use --stdin when getting dumb HTTP pack
389
-
390
- WIP for allowing a response to "git fetch" to instruct the bulk of
391
- the pack contents to be instead taken from elsewhere (aka CDN).
392
-
393
- Waiting for the final version.
394
-
395
-
396
-* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
397
- - add -p: coalesce hunks before testing applicability
398
-
399
- Applicability check after a patch is edited in a "git add -i/p"
400
- session has been improved.
401
-
402
- Will hold.
403
- cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
404
-
405
-
406
-* ds/midx-expire-repack (2019-01-27) 10 commits
407
- - midx: add test that 'expire' respects .keep files
408
- - multi-pack-index: test expire while adding packs
409
- - midx: implement midx_repack()
410
- - multi-pack-index: prepare 'repack' subcommand
411
- - multi-pack-index: implement 'expire' subcommand
412
- - midx: refactor permutation logic and pack sorting
413
- - midx: simplify computation of pack name lengths
414
- - multi-pack-index: prepare for 'expire' subcommand
415
- - Docs: rearrange subcommands for multi-pack-index
416
- - repack: refactor pack deletion for future use
417
-
418
- "git multi-pack-index expire/repack" are new subcommands that
419
- consult midx file and are used to drop unused pack files and
420
- coalesce small pack files that are still in use.
421
-
422
- Comments?
423
-
424
-
425
-* js/protocol-advertise-multi (2018-12-28) 1 commit
426
- - protocol: advertise multiple supported versions
427
-
428
- The transport layer has been updated so that the protocol version
429
- used can be negotiated between the parties, by the initiator
430
- listing the protocol versions it is willing to talk, and the other
431
- side choosing from one of them.
432
-
433
- Expecting a reroll.
434
- cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
435
-
436
-
437
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
438
- - zlib.c: use size_t for size
439
-
440
- The wrapper to call into zlib followed our long tradition to use
441
- "unsigned long" for sizes of regions in memory, which have been
442
- updated to use "size_t".
443
-
444
-
445
-* dl/remote-save-to-push (2018-12-11) 1 commit
446
- - remote: add --save-to-push option to git remote set-url
447
-
448
- "git remote set-url" learned a new option that moves existing value
449
- of the URL field to pushURL field of the remote before replacing
450
- the URL field with a new value.
451
-
452
- Anybody who wants to champion this topic?
453
- I am personally not yet quite convinced if this is worth pursuing.
454
-
455
---------------------------------------------------
456
-[Cooking]
739
740
* tb/stash-in-c-unused-param-fix (2019-03-11) 1 commit
741
(merged to 'next' on 2019-03-20 at 5ccac5f80d)
@@ -462,56 +744,58 @@ of the repositories listed at
744
745
Code clean-up.
746
465
- Will cook in 'next'.
466
-
467
-
468
-* dl/subtree-limit-to-one-rev (2019-03-12) 1 commit
469
- (merged to 'next' on 2019-04-10 at 8631f869c5)
470
- + contrib/subtree: ensure only one rev is provided
471
-
472
- "git subtree" (in contrib/) update.
473
-
474
- Will merge to 'master'.
747
+ Will merge to 'master' together with other stash-in-c topics.
748
749
750
* cb/doco-mono (2019-03-13) 2 commits
478
- - doc: format pathnames and URLs as monospace.
479
- - doc/CodingGuidelines: URLs and paths as monospace
751
+ (merged to 'next' on 2019-04-16 at 91f5d71452)
752
+ + doc: format pathnames and URLs as monospace.
753
+ + doc/CodingGuidelines: URLs and paths as monospace
754
755
Clean-up markup in the documentation suite.
756
483
- Will merge to 'next'.
757
+ Will merge to 'master'.
758
759
486
-* cc/multi-promisor (2019-04-08) 13 commits
487
- - SQUASH??? do not include fetch-objects.h
488
- - SQUASH??? r->name[] is a flexarray that cannot be NULL
760
+* cc/multi-promisor (2019-04-15) 17 commits
761
+ - Move core_partial_clone_filter_default to promisor-remote.c
762
+ - Move repository_format_partial_clone to promisor-remote.c
763
+ - Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
764
- remote: add promisor and partial clone config to the doc
765
- partial-clone: add multiple remotes in the doc
766
- t0410: test fetching from many promisor remotes
767
- builtin/fetch: remove unique promisor remote limitation
768
- promisor-remote: parse remote.*.partialclonefilter
769
+ - diff: use promisor-remote.h instead of fetch-object.h
770
- Use promisor_remote_get_direct() and has_promisor_remote()
771
- promisor-remote: use repository_format_partial_clone
772
- promisor-remote: add promisor_remote_reinit()
773
- promisor-remote: implement promisor_remote_get_direct()
774
- Add initial support for many promisor remotes
775
- fetch-object: make functions return an error code
776
+ - t0410: remove pipes after git commands
777
+ - Merge branch 'jt/batch-fetch-blobs-in-diff' into cc/multi-promisor
778
+ (this branch uses jt/batch-fetch-blobs-in-diff.)
779
501
- Expecting a reroll.
780
+ Teach the lazy clone machinery that there can be more than one
781
+ promisor remote and consult them in order when downloading missing
782
+ objects on demand.
783
503
- An earlier breakage on 'pu' due to incorrect semantic conflict
504
- resolution has been corrected.
784
+ Needs review.
785
786
507
-* nd/switch-and-restore (2019-04-02) 39 commits
787
+* nd/switch-and-restore (2019-04-12) 43 commits
788
+ - help: move git-diff and git-reset to different groups
789
+ - rm: add --staged as alias for --cached
790
- doc: promote "git restore"
791
+ - user-manual.txt: prefer 'merge --abort' over 'reset --hard'
792
- completion: support restore
510
- - SQUASH??? move -p test to 2071 from 2070
793
- t: add tests for restore
794
- restore: support --patch
513
- - restore: default to --source=HEAD when only --index is specified
514
- - restore: add --worktree and --index
795
+ - restore: replace --force with --ignore-unmerged
796
+ - restore: default to --source=HEAD when only --staged is specified
797
+ - restore: reject invalid combinations with --staged
798
+ - restore: add --worktree and --staged
799
- checkout: factor out worktree checkout code
800
- restore: disable overlay mode by default
801
- restore: make pathspec mandatory
@@ -552,39 +836,22 @@ of the repositories listed at
836
command.
837
838
cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)
555
- cf. <20190308101655.9767-1-pclouds@gmail.com> (restore v1)
556
-
557
-
558
-* ab/doc-misc-typofixes (2019-03-18) 1 commit
559
- (merged to 'next' on 2019-04-10 at 06d19acd7e)
560
- + doc: fix typos in man pages
561
-
562
- Typofixes.
563
-
564
- Will merge to 'master'.
565
-
566
-
567
-* ab/drop-scripted-rebase (2019-03-20) 1 commit
568
- (merged to 'next' on 2019-04-10 at ff8abf36ae)
569
- + rebase: remove the rebase.useBuiltin setting
570
-
571
- Retire scripted "git rebase" implementation.
572
-
573
- Will merge to 'master'.
839
+ cf. <20190411131218.19195-1-pclouds@gmail.com> (restore v2)
840
841
842
* ab/gc-reflog (2019-04-01) 7 commits
577
- - gc: handle & check gc.reflogExpire config
578
- - reflog tests: assert lack of early exit with expiry="never"
579
- - reflog tests: test for the "points nowhere" warning
580
- - reflog tests: make use of "test_config" idiom
581
- - gc: refactor a "call me once" pattern
582
- - gc: convert to using the_hash_algo
583
- - gc: remove redundant check for gc_auto_threshold
843
+ (merged to 'next' on 2019-04-16 at aa27f951a8)
844
+ + gc: handle & check gc.reflogExpire config
845
+ + reflog tests: assert lack of early exit with expiry="never"
846
+ + reflog tests: test for the "points nowhere" warning
847
+ + reflog tests: make use of "test_config" idiom
848
+ + gc: refactor a "call me once" pattern
849
+ + gc: convert to using the_hash_algo
850
+ + gc: remove redundant check for gc_auto_threshold
851
852
Fix various glitches in "git gc" around reflog handling.
853
587
- Will merge to 'next'.
854
+ Will merge to 'master'.
855
856
857
* ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits
@@ -599,103 +866,41 @@ of the repositories listed at
866
Will merge to 'next'.
867
868
602
-* jk/perf-lib-tee (2019-03-18) 1 commit
603
- (merged to 'next' on 2019-04-10 at de18327138)
604
- + perf-lib.sh: rely on test-lib.sh for --tee handling
605
-
606
- Code cleanup in the test framework.
607
-
608
- Will merge to 'master'.
609
-
610
-
869
* js/check-docs-exe (2019-04-01) 5 commits
612
- - check-docs: fix for setups where executables have an extension
613
- - check-docs: do not expect guide pages to correspond to commands
614
- - check-docs: really look at the documented commands again
615
- - docs: do not document the `git remote-testgit` command
616
- - docs: move gitremote-helpers into section 7
870
+ (merged to 'next' on 2019-04-16 at 98570caa8c)
871
+ + check-docs: fix for setups where executables have an extension
872
+ + check-docs: do not expect guide pages to correspond to commands
873
+ + check-docs: really look at the documented commands again
874
+ + docs: do not document the `git remote-testgit` command
875
+ + docs: move gitremote-helpers into section 7
876
+ (this branch is used by js/misc-doc-fixes.)
877
878
Dev support update.
879
620
- Will merge to 'next'.
880
+ Will merge to 'master'.
881
882
883
* js/difftool-no-index (2019-03-18) 3 commits
624
- - difftool: allow running outside Git worktrees with --no-index
625
- - parse-options: make OPT_ARGUMENT() more useful
626
- - difftool: remove obsolete (and misleading) comment
884
+ (merged to 'next' on 2019-04-16 at 7313f9ff18)
885
+ + difftool: allow running outside Git worktrees with --no-index
886
+ + parse-options: make OPT_ARGUMENT() more useful
887
+ + difftool: remove obsolete (and misleading) comment
888
889
"git difftool" can now run outside a repository.
890
630
- Will merge to 'next'.
631
-
632
-
633
-* js/get-short-oid-drop-cache (2019-03-14) 4 commits
634
- (merged to 'next' on 2019-04-10 at 5c77e39722)
635
- + get_oid(): when an object was not found, try harder
636
- + sequencer: move stale comment into correct location
637
- + sequencer: improve error message when an OID could not be parsed
638
- + rebase -i: demonstrate obscure loose object cache bug
639
-
640
- A corner-case object name ambiguity while the sequencer machinery
641
- is working (e.g. "rebase -i -x") has been (half) fixed.
642
-
643
- Will merge to 'master'.
644
-
645
-
646
-* ma/doc-diff-doc-vs-doctor-comparison (2019-03-18) 4 commits
647
- (merged to 'next' on 2019-04-10 at af08a97ab9)
648
- + doc-diff: add `--cut-header-footer`
649
- + doc-diff: support diffing from/to AsciiDoc(tor)
650
- + doc-diff: let `render_tree()` take an explicit directory name
651
- + Doc: auto-detect changed build flags
652
-
653
- Dev support update to make it easier to compare two formatted
654
- results from our documentation.
655
-
656
- Will merge to 'master'.
657
- cf. <20190319031412.GC6173@sigill.intra.peff.net>
658
-
659
-
660
-* mh/pack-protocol-doc-fix (2019-03-18) 1 commit
661
- (merged to 'next' on 2019-04-10 at 037673d71c)
662
- + fix pack protocol example client/server communication
663
-
664
- Docfix.
665
-
666
- Will merge to 'master'.
667
-
668
-
669
-* nd/checkout-f-while-conflicted-fix (2019-03-21) 1 commit
670
- (merged to 'next' on 2019-04-10 at 1afc977435)
671
- + unpack-trees: fix oneway_merge accidentally carry over stage index
672
-
673
- "git checkout -f <branch>" while the index has an unmerged path
674
- incorrectly left some paths in an unmerged state, which has been
675
- corrected.
676
-
891
Will merge to 'master'.
892
893
894
* pw/cherry-pick-continue (2019-03-18) 3 commits
681
- - cherry-pick --continue: remember options
682
- - cherry-pick: demonstrate option amnesia
683
- - sequencer: break some long lines
895
+ (merged to 'next' on 2019-04-16 at 1bfd7a7179)
896
+ + cherry-pick --continue: remember options
897
+ + cherry-pick: demonstrate option amnesia
898
+ + sequencer: break some long lines
899
900
"git cherry-pick --options A..B", after giving control back to the
901
user to ask help resolving a conflicted step, did not honor the
902
options it originally received, which has been corrected.
903
689
- Will merge to 'next'.
690
-
691
-
692
-* pw/rerere-autoupdate (2019-03-18) 2 commits
693
- (merged to 'next' on 2019-04-10 at cf79e86682)
694
- + merge: tweak --rerere-autoupdate documentation
695
- + am/cherry-pick/rebase/revert: document --rerere-autoupdate
696
-
697
- Doc updates.
698
-
904
Will merge to 'master'.
905
906
@@ -707,32 +912,14 @@ of the repositories listed at
912
+ git p4 test: clean up the p4d cleanup functions
913
+ git p4 test: use 'test_atexit' to kill p4d and the watchdog process
914
+ t0301-credential-cache: use 'test_atexit' to stop the credentials helper
710
- + tests: use 'test_atexit' to stop httpd
711
- + git-daemon: use 'test_atexit` to stop 'git-daemon'
712
- + test-lib: introduce 'test_atexit'
713
- + t/lib-git-daemon: make sure to kill the 'git-daemon' process
714
- + test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'
715
-
716
- Test framework update to more robustly clean up leftover files and
717
- processes after tests are done.
718
-
719
- Will merge to 'master'.
720
-
721
-
722
-* tb/trace2-va-list-fix (2019-03-20) 1 commit
723
- (merged to 'next' on 2019-04-10 at 94fe0f66d8)
724
- + trace2: NULL is not allowed for va_list
725
-
726
- Fix some code that passed a NULL when a va_list was expected.
727
-
728
- Will merge to 'master'.
729
-
730
-
731
-* tg/glossary-overlay (2019-03-18) 1 commit
732
- (merged to 'next' on 2019-04-10 at f5415c65cc)
733
- + glossary: add definition for overlay
915
+ + tests: use 'test_atexit' to stop httpd
916
+ + git-daemon: use 'test_atexit` to stop 'git-daemon'
917
+ + test-lib: introduce 'test_atexit'
918
+ + t/lib-git-daemon: make sure to kill the 'git-daemon' process
919
+ + test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'
920
735
- Doc update.
921
+ Test framework update to more robustly clean up leftover files and
922
+ processes after tests are done.
923
924
Will merge to 'master'.
925
@@ -744,36 +931,13 @@ of the repositories listed at
931
932
A regression fix.
933
747
- Will merge to 'master'.
748
-
749
-
750
-* tz/completion (2019-03-21) 4 commits
751
- (merged to 'next' on 2019-04-10 at a26ec8420f)
752
- + completion: use __git when calling --list-cmds
753
- + completion: fix multiple command removals
754
- + t9902: test multiple removals via completion.commands
755
- + git: read local config in --list-cmds
756
-
757
- The completion helper code now pays attention to repository-local
758
- configuration (when available), which allows --list-cmds to honour
759
- a repository specific setting of completion.commands, for example.
760
-
761
- Will merge to 'master'.
762
- cf. <20190320180329.22280-1-tmz@pobox.com> (v3)
763
-
764
-
765
-* tz/t4038-bash-redirect-target-workaround (2019-03-18) 1 commit
766
- (merged to 'next' on 2019-04-10 at 9845123f19)
767
- + t4038-diff-combined: quote paths with whitespace
768
-
769
- Work-around extra warning from bash in our tests.
770
-
771
- Will merge to 'master'.
934
+ Will merge to 'master' together with other stash-in-c topics.
935
936
937
* jc/format-patch-noclobber (2019-02-22) 1 commit
938
- format-patch: --no-clobber refrains from overwriting output files
776
- (this branch uses jc/format-patch-error-check.)
939
+
940
+ Undecided but inclined to discard.
941
942
943
* jk/unused-params-even-more (2019-03-21) 13 commits
@@ -798,19 +962,20 @@ of the repositories listed at
962
963
964
* ab/commit-graph-fixes (2019-04-01) 8 commits
801
- - commit-graph: improve & i18n error messages
802
- - commit-graph write: don't die if the existing graph is corrupt
803
- - commit-graph verify: detect inability to read the graph
804
- - commit-graph: don't pass filename to load_commit_graph_one_fd_st()
805
- - commit-graph: don't early exit(1) on e.g. "git status"
806
- - commit-graph: fix segfault on e.g. "git status"
807
- - commit-graph tests: test a graph that's too small
808
- - commit-graph tests: split up corrupt_graph_and_verify()
965
+ (merged to 'next' on 2019-04-16 at 97f4ba02f0)
966
+ + commit-graph: improve & i18n error messages
967
+ + commit-graph write: don't die if the existing graph is corrupt
968
+ + commit-graph verify: detect inability to read the graph
969
+ + commit-graph: don't pass filename to load_commit_graph_one_fd_st()
970
+ + commit-graph: don't early exit(1) on e.g. "git status"
971
+ + commit-graph: fix segfault on e.g. "git status"
972
+ + commit-graph tests: test a graph that's too small
973
+ + commit-graph tests: split up corrupt_graph_and_verify()
974
975
Code cleanup with more careful error checking before using data
976
read from the commit-graph file.
977
813
- Will merge to 'next'.
978
+ Will merge to 'master'.
979
980
981
* ab/gc-docs (2019-04-08) 11 commits
@@ -832,11 +997,12 @@ of the repositories listed at
997
998
999
* ab/test-lib-pass-trace2-env (2019-04-01) 1 commit
835
- - test-lib: whitelist GIT_TR2_* in the environment
1000
+ (merged to 'next' on 2019-04-16 at 4dad6d6d7a)
1001
+ + test-lib: whitelist GIT_TR2_* in the environment
1002
1003
Allow tracing of Git executable while running out tests.
1004
839
- Will merge to 'next'.
1005
+ Will merge to 'master'.
1006
1007
1008
* am/p4-branches-excludes (2019-04-02) 8 commits
@@ -854,60 +1020,52 @@ of the repositories listed at
1020
Is this ready for 'next'?
1021
1022
857
-* bb/unicode-12 (2019-03-22) 1 commit
858
- (merged to 'next' on 2019-04-10 at b0dfa1001e)
859
- + unicode: update the width tables to Unicode 12
860
-
861
- Unicode update.
862
-
863
- Will merge to 'master'.
864
-
865
-
1023
* bc/hash-transition-16 (2019-04-01) 35 commits
867
- - gitweb: make hash size independent
868
- - Git.pm: make hash size independent
869
- - read-cache: read data in a hash-independent way
870
- - dir: make untracked cache extension hash size independent
871
- - builtin/difftool: use parse_oid_hex
872
- - refspec: make hash size independent
873
- - archive: convert struct archiver_args to object_id
874
- - builtin/get-tar-commit-id: make hash size independent
875
- - get-tar-commit-id: parse comment record
876
- - hash: add a function to lookup hash algorithm by length
877
- - remote-curl: make hash size independent
878
- - http: replace sha1_to_hex
879
- - http: compute hash of downloaded objects using the_hash_algo
880
- - http: replace hard-coded constant with the_hash_algo
881
- - http-walker: replace sha1_to_hex
882
- - http-push: remove remaining uses of sha1_to_hex
883
- - http-backend: allow 64-character hex names
884
- - http-push: convert to use the_hash_algo
885
- - builtin/pull: make hash-size independent
886
- - builtin/am: make hash size independent
887
- - fast-import: replace sha1_to_hex
888
- - fast-import: make hash-size independent
889
- - builtin/name-rev: make hash-size independent
890
- - object-store: rename and expand packed_git's sha1 member
891
- - notes: replace sha1_to_hex
892
- - notes: make hash size independent
893
- - notes-merge: switch to use the_hash_algo
894
- - submodule: avoid hard-coded constants
895
- - pack-bitmap: switch hash tables to use struct object_id
896
- - pack-bitmap: switch hard-coded constants to the_hash_algo
897
- - pack-bitmap: replace sha1_to_hex
898
- - pack-bitmap: convert struct stored_bitmap to object_id
899
- - pack-bitmap: make bitmap header handling hash agnostic
900
- - khash: move oid hash table definition
901
- - t/lib-submodule-update: use appropriate length constant
1024
+ (merged to 'next' on 2019-04-16 at 8227fea6fa)
1025
+ + gitweb: make hash size independent
1026
+ + Git.pm: make hash size independent
1027
+ + read-cache: read data in a hash-independent way
1028
+ + dir: make untracked cache extension hash size independent
1029
+ + builtin/difftool: use parse_oid_hex
1030
+ + refspec: make hash size independent
1031
+ + archive: convert struct archiver_args to object_id
1032
+ + builtin/get-tar-commit-id: make hash size independent
1033
+ + get-tar-commit-id: parse comment record
1034
+ + hash: add a function to lookup hash algorithm by length
1035
+ + remote-curl: make hash size independent
1036
+ + http: replace sha1_to_hex
1037
+ + http: compute hash of downloaded objects using the_hash_algo
1038
+ + http: replace hard-coded constant with the_hash_algo
1039
+ + http-walker: replace sha1_to_hex
1040
+ + http-push: remove remaining uses of sha1_to_hex
1041
+ + http-backend: allow 64-character hex names
1042
+ + http-push: convert to use the_hash_algo
1043
+ + builtin/pull: make hash-size independent
1044
+ + builtin/am: make hash size independent
1045
+ + fast-import: replace sha1_to_hex
1046
+ + fast-import: make hash-size independent
1047
+ + builtin/name-rev: make hash-size independent
1048
+ + object-store: rename and expand packed_git's sha1 member
1049
+ + notes: replace sha1_to_hex
1050
+ + notes: make hash size independent
1051
+ + notes-merge: switch to use the_hash_algo
1052
+ + submodule: avoid hard-coded constants
1053
+ + pack-bitmap: switch hash tables to use struct object_id
1054
+ + pack-bitmap: switch hard-coded constants to the_hash_algo
1055
+ + pack-bitmap: replace sha1_to_hex
1056
+ + pack-bitmap: convert struct stored_bitmap to object_id
1057
+ + pack-bitmap: make bitmap header handling hash agnostic
1058
+ + khash: move oid hash table definition
1059
+ + t/lib-submodule-update: use appropriate length constant
1060
1061
Conversion from unsigned char[20] to struct object_id continues.
1062
905
- Will merge to 'next'.
1063
+ Will merge to 'master'.
1064
1065
908
-* cc/replace-graft-peel-tags (2019-04-01) 4 commits
909
- - replace: fix --graft when passing a tag first
910
- - replace: fix --graft when passing a tag as parent
1066
+* cc/replace-graft-peel-tags (2019-04-15) 4 commits
1067
+ - replace: peel tag when passing a tag first to --graft
1068
+ - replace: peel tag when passing a tag as parent to --graft
1069
- t6050: redirect expected error output to a file
1070
- t6050: use test_line_count instead of wc -l
1071
@@ -917,28 +1075,26 @@ of the repositories listed at
1075
mimick only allowed to replace one commit object with another.
1076
This has been fixed.
1077
920
- The title of the top two commits are fairly useless and does not
921
- say how the issue was fixed, but the fix is to peel the given tag
922
- ourselves down to the underlying commit object.
923
-
1078
Will merge to 'next'.
1079
1080
1081
* dk/blame-keep-origin-blob (2019-04-03) 1 commit
928
- - blame.c: don't drop origin blobs as eagerly
1082
+ (merged to 'next' on 2019-04-16 at 39679dde8b)
1083
+ + blame.c: don't drop origin blobs as eagerly
1084
1085
Performance fix around "git blame", especially in a linear history
1086
(which is the norm we should optimize for).
1087
933
- Will merge to 'next'.
1088
+ Will merge to 'master'.
1089
1090
936
-* dl/rebase-i-keep-base (2019-04-08) 5 commits
1091
+* dl/rebase-i-keep-base (2019-04-16) 6 commits
1092
- rebase: teach rebase --keep-base
1093
+ - rebase: fast-forward --fork-point in more cases
1094
- rebase: fast-forward --onto in more cases
1095
- t3432: test rebase fast-forward behavior
1096
- t3431: add rebase --fork-point tests
941
- - tests (rebase): spell out the `--keep-empty` option
1097
+ + tests (rebase): spell out the `--keep-empty` option
1098
(this branch is tangled with js/spell-out-options-in-tests.)
1099
1100
"git rebase --keep-base <upstream>" tries to find the original base
@@ -950,78 +1106,48 @@ of the repositories listed at
1106
1107
1108
* en/fast-import-parsing-fix (2019-04-01) 5 commits
953
- - fast-import: fix erroneous handling of get-mark with empty orphan commits
954
- - fast-import: only allow cat-blob requests where it makes sense
955
- - fast-import: check most prominent commands first
956
- - git-fast-import.txt: fix wording about where ls command can appear
957
- - t9300: demonstrate bug with get-mark and empty orphan commits
1109
+ (merged to 'next' on 2019-04-16 at b318831bde)
1110
+ + fast-import: fix erroneous handling of get-mark with empty orphan commits
1111
+ + fast-import: only allow cat-blob requests where it makes sense
1112
+ + fast-import: check most prominent commands first
1113
+ + git-fast-import.txt: fix wording about where ls command can appear
1114
+ + t9300: demonstrate bug with get-mark and empty orphan commits
1115
1116
"git fast-import" update.
1117
961
- Will merge to 'next'.
962
-
963
-
964
-* jh/midx-verify-too-many-packs (2019-03-22) 4 commits
965
- (merged to 'next' on 2019-04-10 at 2ac6c933d4)
966
- + midx: during verify group objects by packfile to speed verification
967
- + midx: add progress indicators in multi-pack-index verify
968
- + trace2:data: add trace2 data to midx
969
- + progress: add sparse mode to force 100% complete message
970
-
971
- "git multi-pack-index verify" did not scale well with the number of
972
- packfiles, which is being improved.
973
-
1118
Will merge to 'master'.
1119
1120
977
-* jh/trace2-sid-fix (2019-04-01) 7 commits
1121
+* jh/trace2-sid-fix (2019-04-16) 10 commits
1122
+ - trace2: update docs to describe system/global config settings
1123
- trace2: make SIDs more unique
1124
- trace2: clarify UTC datetime formatting
1125
- trace2: report peak memory usage of the process
981
- - trace2: use system config for default trace2 settings
1126
+ - trace2: use system/global config for default trace2 settings
1127
+ - config: add read_very_early_config()
1128
- trace2: find exec-dir before trace2 initialization
1129
- trace2: add absolute elapsed time to start event
1130
- trace2: refactor setting process starting time
1131
+ - config: initialize opts structure in repo_read_config()
1132
1133
Polishing of the new trace2 facility continues. The system-level
987
- configuration can specify site-wide trace2 settings (which would be
988
- loved by big-brother types ;-).
989
-
990
- Getting closer but still being discussed.
991
- cf. <20190403000032.GA190454@google.com>
992
-
993
-
994
-* jk/http-walker-status-fix (2019-03-24) 3 commits
995
- (merged to 'next' on 2019-04-10 at d49336dd3b)
996
- + http: use normalize_curl_result() instead of manual conversion
997
- + http: normalize curl results for dumb loose and alternates fetches
998
- + http: factor out curl result code normalization
999
-
1000
- dumb-http walker has been updated to share more error recovery
1001
- strategy with the normal codepath.
1002
-
1003
- Will merge to 'master'.
1004
-
1005
-
1006
-* jk/refs-double-abort (2019-03-22) 2 commits
1007
- (merged to 'next' on 2019-04-10 at e160d4a5b0)
1008
- + refs/files-backend: don't look at an aborted transaction
1009
- + refs/files-backend: handle packed transaction prepare failure
1010
-
1011
- A corner case bug in the refs API has been corrected.
1012
-
1013
- Will merge to 'master'.
1134
+ configuration can specify site-wide trace2 settings, which can be
1135
+ overridden with per-user configuration and environment variables.
1136
1015
-
1016
-* js/spell-out-options-in-tests (2019-04-02) 8 commits
1017
- - tests: disallow the use of abbreviated options (by default)
1018
- - tests (pack-objects): use the full, unabbreviated `--revs` option
1019
- - tests (status): spell out the `--find-renames` option in full
1020
- - tests (push): do not abbreviate the `--follow-tags` option
1021
- - t5531: avoid using an abbreviated option
1022
- - t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match`
1023
- - tests (rebase): spell out the `--force-rebase` option
1024
- - tests (rebase): spell out the `--keep-empty` option
1137
+ Will merge to 'next'.
1138
+ cf. <pull.169.v4.git.gitgitgadget@gmail.com> (v4)
1139
+
1140
+
1141
+* js/spell-out-options-in-tests (2019-04-15) 8 commits
1142
+ (merged to 'next' on 2019-04-16 at 1cfd7698b6)
1143
+ + tests: disallow the use of abbreviated options (by default)
1144
+ + tests (pack-objects): use the full, unabbreviated `--revs` option
1145
+ + tests (status): spell out the `--find-renames` option in full
1146
+ + tests (push): do not abbreviate the `--follow-tags` option
1147
+ + t5531: avoid using an abbreviated option
1148
+ + t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match`
1149
+ + tests (rebase): spell out the `--force-rebase` option
1150
+ + tests (rebase): spell out the `--keep-empty` option
1151
(this branch is tangled with dl/rebase-i-keep-base.)
1152
1153
The tests have been updated not to rely on the abbreviated option
@@ -1030,7 +1156,7 @@ of the repositories listed at
1156
command getting non-unique when a new option that share the same
1157
prefix is added.
1158
1033
- Will merge to 'next'.
1159
+ Will merge to 'master'.
1160
1161
1162
* js/trace2-to-directory (2019-03-22) 1 commit
@@ -1046,6 +1172,7 @@ of the repositories listed at
1172
* jt/batch-fetch-blobs-in-diff (2019-04-08) 2 commits
1173
- diff: batch fetching of missing blobs
1174
- sha1-file: support OBJECT_INFO_FOR_PREFETCH
1175
+ (this branch is used by cc/multi-promisor.)
1176
1177
While running "git diff" in a lazy clone, we can upfront know which
1178
missing blobs we will need, instead of waiting for the on-demand
@@ -1056,37 +1183,28 @@ of the repositories listed at
1183
1184
1185
* jt/fetch-no-update-shallow-in-proto-v2 (2019-04-01) 3 commits
1059
- - fetch-pack: respect --no-update-shallow in v2
1060
- - fetch-pack: call prepare_shallow_info only if v0
1061
- - Merge branch 'jt/test-protocol-version' into jt/fetch-no-update-shallow-in-proto-v2
1062
- (this branch uses jt/test-protocol-version.)
1186
+ (merged to 'next' on 2019-04-16 at 05c5ebe471)
1187
+ + fetch-pack: respect --no-update-shallow in v2
1188
+ + fetch-pack: call prepare_shallow_info only if v0
1189
+ + Merge branch 'jt/test-protocol-version' into jt/fetch-no-update-shallow-in-proto-v2
1190
1191
Fix for protocol v2 support in "git fetch-pack" of shallow clones.
1192
1066
- Will merge to 'next'.
1193
+ Will merge to 'master'.
1194
1195
1196
* jt/fetch-pack-wanted-refs-optim (2019-04-01) 1 commit
1070
- - fetch-pack: binary search when storing wanted-refs
1197
+ (merged to 'next' on 2019-04-16 at 051f6bd38a)
1198
+ + fetch-pack: binary search when storing wanted-refs
1199
1200
Performance fix around "git fetch" that grabs many refs.
1201
1074
- Will merge to 'next'.
1075
-
1076
-
1077
-* jt/t5551-protocol-v2-does-not-have-half-auth (2019-03-24) 1 commit
1078
- (merged to 'next' on 2019-04-10 at 86ca3ebf33)
1079
- + t5551: mark half-auth no-op fetch test as v0-only
1080
-
1081
- Test update.
1082
-
1202
Will merge to 'master'.
1203
1204
1086
-* km/empty-repo-is-still-a-repo (2019-04-03) 4 commits
1205
+* km/empty-repo-is-still-a-repo (2019-04-10) 3 commits
1206
+ - add: error appropriately on repository with no commits
1207
- dir: do not traverse repositories with no commits
1088
- - t3009: test that ls-files -o traverses bogus repo
1089
- - t3000: move non-submodule repo test to separate file
1208
- submodule: refuse to add repository with no commits
1209
1210
Running "git add" on a repository created inside the current
@@ -1097,15 +1215,15 @@ of the repositories listed at
1215
repository, which is not what the user wants. These problems are
1216
being addressed.
1217
1100
- Expecting a reroll.
1101
- cf. <87bm1mbua4.fsf@kyleam.com>
1218
+ Will merge to 'next'.
1219
1220
1221
* nd/checkout-m (2019-03-24) 4 commits
1105
- - checkout: prevent losing staged changes with --merge
1106
- - read-tree: add --quiet
1107
- - unpack-trees: rename "gently" flag to "quiet"
1108
- - unpack-trees: keep gently check inside add_rejected_path
1222
+ (merged to 'next' on 2019-04-16 at 4d7c322bed)
1223
+ + checkout: prevent losing staged changes with --merge
1224
+ + read-tree: add --quiet
1225
+ + unpack-trees: rename "gently" flag to "quiet"
1226
+ + unpack-trees: keep gently check inside add_rejected_path
1227
1228
"git checkout -m <other>" was about carrying the differences
1229
between HEAD and the working-tree files forward while checking out
@@ -1113,25 +1231,17 @@ of the repositories listed at
1231
index. The command has been taught to abort when the index and the
1232
HEAD are different.
1233
1116
- Will merge to 'next'.
1117
-
1118
-
1119
-* nd/checkout-m-doc-update (2019-03-21) 1 commit
1120
- (merged to 'next' on 2019-04-10 at cdda4e833e)
1121
- + checkout.txt: note about losing staged changes with --merge
1122
-
1123
- Doc about the above.
1124
-
1234
Will merge to 'master'.
1235
1236
1237
* nd/commit-a-with-paths-msg-update (2019-03-22) 1 commit
1129
- - commit: improve error message in "-a <paths>" case
1238
+ (merged to 'next' on 2019-04-16 at a36c712b39)
1239
+ + commit: improve error message in "-a <paths>" case
1240
1241
The message given when "git commit -a <paths>" errors out has been
1242
updated.
1243
1134
- Will merge to 'next'.
1244
+ Will merge to 'master'.
1245
1246
1247
* nd/diff-parseopt-4 (2019-03-24) 20 commits
@@ -1156,7 +1266,6 @@ of the repositories listed at
1266
+ diff-parseopt: convert -z
1267
+ diff-parseopt: convert --ita-[in]visible-in-index
1268
+ diff-parseopt: convert --ws-error-highlight
1159
- (this branch uses nd/diff-parseopt-3.)
1269
1270
Fourth batch to teach the diff machinery to use the parse-options
1271
API.
@@ -1165,19 +1274,21 @@ of the repositories listed at
1274
1275
1276
* nd/include-if-wildmatch (2019-04-01) 1 commit
1168
- - config: correct '**' matching in includeIf patterns
1277
+ (merged to 'next' on 2019-04-16 at db8b6a578a)
1278
+ + config: correct '**' matching in includeIf patterns
1279
1280
A buglet in configuration parser has been fixed.
1281
1172
- Will merge to 'next'.
1282
+ Will merge to 'master'.
1283
1284
1285
* nd/interpret-trailers-docfix (2019-04-01) 1 commit
1176
- - interpret-trailers.txt: start the desc line with a capital letter
1286
+ (merged to 'next' on 2019-04-16 at 6a57abc7e6)
1287
+ + interpret-trailers.txt: start the desc line with a capital letter
1288
1289
Doc update.
1290
1180
- Will merge to 'next'.
1291
+ Will merge to 'master'.
1292
1293
1294
* nd/precious (2019-04-09) 1 commit
@@ -1191,14 +1302,15 @@ of the repositories listed at
1302
1303
1304
* nd/read-tree-reset-doc (2019-04-02) 1 commit
1194
- - read-tree.txt: clarify --reset and worktree changes
1305
+ (merged to 'next' on 2019-04-16 at f2bef91774)
1306
+ + read-tree.txt: clarify --reset and worktree changes
1307
1308
The documentation for "git read-tree --reset -u" has been updated.
1309
1198
- Will merge to 'next'.
1310
+ Will merge to 'master'.
1311
1312
1201
-* nd/sha1-name-c-wo-the-repository (2019-04-08) 33 commits
1313
+* nd/sha1-name-c-wo-the-repository (2019-04-16) 34 commits
1314
- sha1-name.c: remove the_repo from get_oid_mb()
1315
- sha1-name.c: remove the_repo from other get_oid_*
1316
- sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name
@@ -1222,6 +1334,7 @@ of the repositories listed at
1334
- sha1-name.c: remove the_repo from find_abbrev_len_packed()
1335
- sha1-name.c: remove the_repo from sort_ambiguous()
1336
- commit.c: add repo_get_commit_tree()
1337
+ - commit.cocci: refactor code, avoid double rewrite
1338
- refs.c: remove the_repo from read_ref_at()
1339
- refs.c: add repo_dwim_log()
1340
- refs.c: add repo_dwim_ref()
@@ -1262,29 +1375,31 @@ of the repositories listed at
1375
1376
1377
* sg/asciidoctor-in-ci (2019-04-05) 6 commits
1265
- - ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build job
1266
- - ci: stick with Asciidoctor v1.5.8 for now
1267
- - ci: install Asciidoctor in 'ci/install-dependencies.sh'
1268
- - Documentation/technical/protocol-v2.txt: fix formatting
1269
- - Documentation/technical/api-config.txt: fix formatting
1270
- - Documentation/git-diff-tree.txt: fix formatting
1378
+ (merged to 'next' on 2019-04-16 at efdf919c16)
1379
+ + ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build job
1380
+ + ci: stick with Asciidoctor v1.5.8 for now
1381
+ + ci: install Asciidoctor in 'ci/install-dependencies.sh'
1382
+ + Documentation/technical/protocol-v2.txt: fix formatting
1383
+ + Documentation/technical/api-config.txt: fix formatting
1384
+ + Documentation/git-diff-tree.txt: fix formatting
1385
1386
Update our support to format documentation in the CI environment,
1387
either with AsciiDoc ro Asciidoctor.
1388
1275
- Will merge to 'next'.
1389
+ Will merge to 'master'.
1390
1391
1392
* sg/index-pack-progress (2019-04-01) 1 commit
1279
- - index-pack: show progress while checking objects
1393
+ (merged to 'next' on 2019-04-16 at a10bfdd950)
1394
+ + index-pack: show progress while checking objects
1395
1396
A progress indicator has been added to the "index-pack" step, which
1397
often makes users wait for completion during "git clone".
1398
1284
- Will merge to 'next'.
1399
+ Will merge to 'master'.
1400
1401
1287
-* sg/overlong-progress-fix (2019-04-05) 4 commits
1402
+* sg/overlong-progress-fix (2019-04-15) 4 commits
1403
- progress: break too long progress bar lines
1404
- progress: clear previous progress update dynamically
1405
- progress: assemble percentage and counters in a strbuf before printing
@@ -1296,32 +1411,13 @@ of the repositories listed at
1411
Will merge to 'next'.
1412
1413
1299
-* sg/t5318-cleanup (2019-03-24) 1 commit
1300
- (merged to 'next' on 2019-04-10 at 787b1b5073)
1301
- + t5318-commit-graph: remove unused variable
1302
-
1303
- Code cleanup.
1304
-
1305
- Will merge to 'master'.
1306
-
1307
-
1414
* tz/asciidoctor-fixes (2019-04-01) 2 commits
1309
- - Documentation/git-status: fix titles in porcelain v2 section
1310
- - Documentation/rev-list-options: wrap --date=<format> block with "--"
1415
+ (merged to 'next' on 2019-04-16 at 0cb17f579b)
1416
+ + Documentation/git-status: fix titles in porcelain v2 section
1417
+ + Documentation/rev-list-options: wrap --date=<format> block with "--"
1418
1419
Doc updates.
1420
1314
- Will merge to 'next'.
1315
-
1316
-
1317
-* js/init-db-update-for-mingw (2019-03-12) 1 commit
1318
- (merged to 'next' on 2019-04-10 at 1d5768849f)
1319
- + mingw: respect core.hidedotfiles = false in git-init again
1320
-
1321
- "git init" forgot to read platform-specific repository
1322
- configuration, which made Windows port to ignore settings of
1323
- core.hidedotfiles, for example.
1324
-
1421
Will merge to 'master'.
1422
1423
@@ -1334,103 +1430,7 @@ of the repositories listed at
1430
1431
Further fixes to "git stash" reimplemented in C.
1432
1337
- Will cook in 'next'.
1338
-
1339
-
1340
-* js/remote-curl-i18n (2019-03-06) 1 commit
1341
- (merged to 'next' on 2019-04-10 at 4814acf6c8)
1342
- + remote-curl: mark all error messages for translation
1343
- (this branch uses js/anonymize-remote-curl-diag.)
1344
-
1345
- Error messages given from the http transport have been updated so
1346
- that they can be localized.
1347
-
1348
- Will merge to 'master'.
1349
-
1350
-
1351
-* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
1352
- (merged to 'next' on 2019-04-10 at 77cf886e7e)
1353
- + Documentation: turn middle-of-line tabs into spaces
1354
- + git-svn.txt: drop escaping '\' that ends up being rendered
1355
- + git.txt: remove empty line before list continuation
1356
- + config/fsck.txt: avoid starting line with dash
1357
- + config/diff.txt: drop spurious backtick
1358
-
1359
- Documentation mark-up fixes.
1360
-
1361
- Will merge to 'master'.
1362
-
1363
-
1364
-* nd/diff-parseopt-3 (2019-03-07) 20 commits
1365
- (merged to 'next' on 2019-03-20 at ee79d4924b)
1366
- + diff-parseopt: convert --submodule
1367
- + diff-parseopt: convert --ignore-submodules
1368
- + diff-parseopt: convert --textconv
1369
- + diff-parseopt: convert --ext-diff
1370
- + diff-parseopt: convert --quiet
1371
- + diff-parseopt: convert --exit-code
1372
- + diff-parseopt: convert --color-words
1373
- + diff-parseopt: convert --word-diff-regex
1374
- + diff-parseopt: convert --word-diff
1375
- + diff-parseopt: convert --[no-]color
1376
- + diff-parseopt: convert --[no-]follow
1377
- + diff-parseopt: convert -R
1378
- + diff-parseopt: convert -a|--text
1379
- + diff-parseopt: convert --full-index
1380
- + diff-parseopt: convert --binary
1381
- + diff-parseopt: convert --anchored
1382
- + diff-parseopt: convert --diff-algorithm
1383
- + diff-parseopt: convert --histogram
1384
- + diff-parseopt: convert --patience
1385
- + diff-parseopt: convert --[no-]indent-heuristic
1386
- (this branch is used by nd/diff-parseopt-4.)
1387
-
1388
- Third batch to teach the diff machinery to use the parse-options
1389
- API.
1390
-
1391
- Will merge to 'master'.
1392
- cf. <20190305123026.7266-1-pclouds@gmail.com>
1393
-
1394
-
1395
-* jt/test-protocol-version (2019-03-07) 8 commits
1396
- (merged to 'next' on 2019-03-20 at 0c97907bdb)
1397
- + t5552: compensate for v2 filtering ref adv.
1398
- + tests: fix protocol version for overspecifications
1399
- + t5700: only run with protocol version 1
1400
- + t5512: compensate for v0 only sending HEAD symrefs
1401
- + t5503: fix overspecification of trace expectation
1402
- + tests: always test fetch of unreachable with v0
1403
- + t5601: check ssh command only with protocol v0
1404
- + tests: define GIT_TEST_PROTOCOL_VERSION
1405
- (this branch is used by jt/fetch-no-update-shallow-in-proto-v2.)
1406
-
1407
- Help developers by making it easier to run most of the tests under
1408
- different versions of over-the-wire protocols.
1409
-
1410
- Will merge to 'master'.
1411
- cf. <cover.1551131153.git.jonathantanmy@google.com>
1412
-
1413
-
1414
-* js/anonymize-remote-curl-diag (2019-03-05) 1 commit
1415
- (merged to 'next' on 2019-04-10 at 137a191021)
1416
- + curl: anonymize URLs in error messages and warnings
1417
- (this branch is used by js/remote-curl-i18n.)
1418
-
1419
- remote-http transport did not anonymize URLs reported in its error
1420
- messages at places.
1421
-
1422
- Will merge to 'master'.
1423
-
1424
-
1425
-* ma/asciidoctor-fixes (2019-03-11) 3 commits
1426
- (merged to 'next' on 2019-04-10 at 41a7f51003)
1427
- + asciidoctor-extensions: fix spurious space after linkgit
1428
- + Documentation/Makefile: add missing dependency on asciidoctor-extensions
1429
- + Documentation/Makefile: add missing xsl dependencies for manpages
1430
-
1431
- Build fix around use of asciidoctor instead of asciidoc
1432
-
1433
- Will merge to 'master'.
1433
+ Will merge to 'master' together with other stash-in-c topics.
1434
1435
1436
* nd/worktree-name-sanitization (2019-03-20) 2 commits
@@ -1456,19 +1456,7 @@ of the repositories listed at
1456
Will cook in 'next'.
1457
1458
1459
-* jc/format-patch-error-check (2019-02-22) 2 commits
1460
- (merged to 'next' on 2019-04-10 at 6ca358b7ef)
1461
- + format-patch: notice failure to open cover letter for writing
1462
- + builtin/log: downcase the beginning of error messages
1463
- (this branch is used by jc/format-patch-noclobber.)
1464
-
1465
- "git format-patch" used overwrite an existing patch/cover-letter
1466
- file. A new "--no-clobber" option stops it.
1467
-
1468
- Will merge to 'master'.
1469
-
1470
-
1471
-* dl/submodule-set-branch (2019-02-08) 3 commits
1459
+* dl/submodule-set-branch (2019-04-10) 3 commits
1460
- submodule: teach set-branch subcommand
1461
- submodule--helper: teach config subcommand --unset
1462
- git-submodule.txt: "--branch <branch>" option defaults to 'master'
@@ -1476,7 +1464,7 @@ of the repositories listed at
1464
"git submodule" learns "set-branch" subcommand that allows the
1465
submodule.*.branch settings to be modified.
1466
1479
- Needs sign-off on the tip commit; other than that it seems OK to be in 'next'.
1467
+ Will merge to 'next'.
1468
1469
1470
* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit
@@ -1505,18 +1493,18 @@ of the repositories listed at
1493
Needs update before merging to 'next'.
1494
1495
1508
-* br/blame-ignore (2019-04-04) 6 commits
1509
- - RFC blame: use a fingerprint heuristic to match ignored lines
1510
- - blame: add a config option to mark ignored lines
1496
+* br/blame-ignore (2019-04-14) 6 commits
1497
+ - blame: use a fingerprint heuristic to match ignored lines
1498
+ - blame: optionally track line fingerprints during fill_blame_origin()
1499
+ - blame: add config options to handle output for ignored lines
1500
- blame: add the ability to ignore commits and their changes
1512
- - blame: optionally track the line starts during fill_blame_origin()
1501
- blame: use a helper function in blame_chunk()
1502
- Move init_skiplist() outside of fsck
1503
1504
"git blame" learned to "ignore" commits in the history, whose
1505
effects (as well as their presence) get ignored.
1506
1519
- Expecting a reroll.
1507
+ Under discussion.
1508
cf. <8736mtqy9n.fsf@fencepost.gnu.org>
1509
cf. <6752a735-2e7b-7d13-799f-a42e6995498c@google.com>
1510
@@ -1553,7 +1541,9 @@ of the repositories listed at
1541
help the user explain the merge better.
1542
1543
Needs review.
1544
+ Expecting a reroll.
1545
cf. <cover.1553150827.git.liu.denton@gmail.com> (v9)
1546
+ cf. <20190409182247.GA7317@dev-l>
1547
1548
1549
* jn/unknown-index-extensions (2018-11-21) 2 commits
@@ -1636,4 +1626,4 @@ of the repositories listed at
1626
1627
"git stash" rewritten in C.
1628
1639
- Will cook in 'next'.
1629
+ Will merge to 'master' together with other stash-in-c topics.