What's cooking (2019/03 #04)
Junio C Hamano committed
Mar 20, 2019 at 12:11 UTC
be6eed6d9f1c0dfa4a732832c506318f916caf09
1 file changed
+385
-106
whats-cooking.txt
+385
-106
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2019, #03; Mon, 11)
4
-X-master-at: e902e9bcae2010bc42648c80ab6adc6c5a16a4a5
5
-X-next-at: 810b269d1ac4b032a1c9788e5590ee2dd9ccd984
3
+Subject: What's cooking in git.git (Mar 2019, #04; Wed, 20)
4
+X-master-at: 0e94f7aa730b108f7907cfab1b2a7fba965de442
5
+X-next-at: fef4c6d200cf268f44767029c50f1b592040de2e
6
7
-What's cooking in git.git (Mar 2019, #03; Mon, 11)
7
+What's cooking in git.git (Mar 2019, #04; Wed, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,153 +12,345 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The tip of 'next' has been rewound, ejecting a few topics that
16
-deserve a chance for a fresh restart. I plan to flush most of the
17
-other topics still in 'next' to 'master' sometime this week.
18
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
25
-[Graduated to "master"]
21
+[New Topics]
22
27
-* jk/guard-bswap-header (2019-03-07) 1 commit
28
- (merged to 'next' on 2019-03-07 at 8ba06b29d4)
29
- + compat/bswap: add include header guards
23
+* ms/worktree-add-atomic-mkdir (2019-03-12) 1 commit
24
+ - worktree: fix worktree add race
25
31
- The include file compat/bswap.h has been updated so that it is safe
32
- to (accidentally) include it more than once.
26
+ "git worktree add" used to do a "find an available name with stat
27
+ and then mkdir", which is race-prone. This has been fixed by using
28
+ mkdir and reacting to EEXIST in a loop.
29
30
+ Will merge to 'next'.
31
35
-* js/find-lib-h-with-ls-files-when-possible (2019-03-05) 1 commit
36
- (merged to 'next' on 2019-03-07 at 0572e4704c)
37
- + Makefile: use `git ls-files` to list header files, if possible
32
39
- The Makefile uses 'find' utility to enumerate all the *.h header
40
- files, which is expensive on platforms with slow filesystems; it
41
- now optionally uses "ls-files" if working within a repository,
42
- which is a trick similar to how all sources are enumerated to run
43
- ETAGS on.
33
+* tb/stash-in-c-unused-param-fix (2019-03-11) 1 commit
34
+ - stash: drop unused parameter
35
+ (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tg/stash-in-c-show-default-to-p-fix.)
36
37
+ Code clean-up.
38
46
-* js/rebase-recreate-merge (2019-03-01) 1 commit
47
- (merged to 'next' on 2019-03-07 at da81e64430)
48
- + rebase docs: fix "gitlink" typo
39
+ Will merge to 'next'.
40
50
- Docfix.
41
42
+* dl/subtree-limit-to-one-rev (2019-03-12) 1 commit
43
+ - contrib/subtree: ensure only one rev is provided
44
53
-* js/untravis-windows (2019-03-01) 1 commit
54
- (merged to 'next' on 2019-03-07 at 54ca7ffeea)
55
- + travis: remove the hack to build the Windows job on Azure Pipelines
45
+ "git subtree" (in contrib/) update.
46
57
- Dev support.
47
+ Will merge to 'next'.
48
49
60
-* rd/attr.c-comment-typofix (2019-03-07) 1 commit
61
- (merged to 'next' on 2019-03-07 at bf8e985dd8)
62
- + attr.c: ".gitattribute" -> ".gitattributes" (comments)
50
+* ar/t4150-remove-cruft (2019-03-13) 1 commit
51
+ - t4150: remove unused variable
52
64
- In-code comment typofix.
53
+ Test cleanup.
54
55
+ Will merge to 'next'.
56
67
-* rd/gc-prune-doc-fix (2019-03-03) 1 commit
68
- (merged to 'next' on 2019-03-07 at fdd4dda2e0)
69
- + docs/git-gc: fix typo "--prune=all" to "--prune=now"
57
71
- Docfix.
58
+* cb/doco-mono (2019-03-13) 2 commits
59
+ - doc: format pathnames and URLs as monospace.
60
+ - doc/CodingGuidelines: URLs and paths as monospace
61
62
+ Clean-up markup in the documentation suite.
63
74
-* rj/hdr-check-gcrypt-fix (2019-03-06) 1 commit
75
- (merged to 'next' on 2019-03-07 at ef95cd3878)
76
- + Makefile: fix 'hdr-check' when GCRYPT not installed
64
+ Will merge to 'next'.
65
78
- The set of header files used by "make hdr-check" unconditionally
79
- included sha256/gcrypt.h, even when it is not used, causing the
80
- make target to fail. We now skip it when GCRYPT_SHA256 is not in
81
- use.
66
67
+* cc/multi-promisor (2019-03-14) 12 commits
68
+ - promisor-remote.h: fix a 'hdr-check' warning
69
+ - remote: add promisor and partial clone config to the doc
70
+ - partial-clone: add multiple remotes in the doc
71
+ - t0410: test fetching from many promisor remotes
72
+ - builtin/fetch: remove unique promisor remote limitation
73
+ - promisor-remote: parse remote.*.partialclonefilter
74
+ - Use promisor_remote_get_direct() and has_promisor_remote()
75
+ - promisor-remote: use repository_format_partial_clone
76
+ - promisor-remote: add promisor_remote_reinit()
77
+ - promisor-remote: implement promisor_remote_get_direct()
78
+ - Add initial support for many promisor remotes
79
+ - fetch-object: make functions return an error code
80
84
-* yb/utf-16le-bom-spellfix (2019-03-07) 1 commit
85
- (merged to 'next' on 2019-03-07 at 541d9dca55)
86
- + gitattributes.txt: fix typo
81
88
- Doc update.
82
+* jk/promote-ggg (2019-03-13) 1 commit
83
+ - point pull requesters to GitGitGadget
84
90
---------------------------------------------------
91
-[New Topics]
85
+ Swap submitGit with GitGitGadget as a way to submit patches based
86
+ on GitHub PR to us.
87
93
-* dl/ignore-docs (2019-03-08) 2 commits
94
- - docs: move core.excludesFile from git-add to gitignore
95
- - git-clean.txt: clarify ignore pattern files
88
+ Will merge to 'next'.
89
97
- Doc update.
90
+
91
+* jk/sha1dc (2019-03-13) 1 commit
92
+ - Makefile: fix unaligned loads in sha1dc with UBSan
93
+
94
+ Build update for SHA-1 with collision detection.
95
96
Will merge to 'next'.
97
98
102
-* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit
103
- - convert: avoid malloc of original file size
99
+* jt/submodule-fetch-errmsg (2019-03-14) 1 commit
100
+ - submodule: explain first attempt failure clearly
101
105
- When the "clean" filter can reduce the size of a huge file in the
106
- working tree down to a small "token" (a la Git LFS), there is no
107
- point in allocating a huge scratch area upfront, but the buffer is
108
- sized based on the original file size. The convert mechanism now
109
- allocates very minimum and reallocates as it receives the output
110
- from the clean filter process.
102
+ Error message update.
103
104
Will merge to 'next'.
105
+ cf. <20190313175738.252961-1-jonathantanmy@google.com> (v2)
106
+
107
+
108
+* nd/switch-and-restore (2019-03-18) 38 commits
109
+ - doc: promote "git restore"
110
+ - completion: support restore
111
+ - SQUASH??? move -p test to 2071 from 2070
112
+ - t: add tests for restore
113
+ - restore: support --patch
114
+ - restore: default to --source=HEAD when only --index is specified
115
+ - restore: add --worktree and --index
116
+ - checkout: factor out worktree checkout code
117
+ - restore: disable overlay mode by default
118
+ - restore: make pathspec mandatory
119
+ - restore: take tree-ish from --source option instead
120
+ - checkout: split part of it to new command 'restore'
121
+ - doc: promote "git switch"
122
+ - completion: support switch
123
+ - t: add tests for switch
124
+ - switch: --orphan defaults to empty tree as HEAD
125
+ - switch: reject if some operation is in progress
126
+ - switch: no worktree status unless real branch switch happens
127
+ - switch: implicit dwim, use --no-guess to disable it
128
+ - switch: add short option for --detach
129
+ - switch: only allow explicit detached HEAD
130
+ - switch: reject "do nothing" case
131
+ - switch: stop accepting pathspec
132
+ - switch: remove -l
133
+ - switch: add --discard-changes
134
+ - switch: better names for -b and -B
135
+ - checkout: split part of it to new command 'switch'
136
+ - checkout: split options[] array in three pieces
137
+ - checkout: move 'confict_style' and 'dwim_..' to checkout_opts
138
+ - checkout: make "opts" in cmd_checkout() a pointer
139
+ - checkout: factor out some code in parse_branchname_arg()
140
+ - checkout: keep most #include sorted
141
+ - checkout: advice how to get out of detached HEAD mode
142
+ - t: rename t2014-switch.sh to t2014-checkout-switch.sh
143
+ - git-checkout.txt: fix monospace typeset
144
+ - doc: document --overwrite-ignore
145
+ - git-checkout.txt: fix one syntax line
146
+ - git-checkout.txt: spell out --no-option
147
+
148
+ Two new commands "git switch" and "git restore" are introduced to
149
+ split "checking out a branch to work on advancing its history" and
150
+ "checking out paths out of the index and/or a tree-ish to work on
151
+ advancing the current history" out of the single "git checkout"
152
+ command.
153
+
154
+ cf. <20190317124926.17137-1-pclouds@gmail.com> (switch v4)
155
+ cf. <20190308101655.9767-1-pclouds@gmail.com> (restore v1)
156
+
157
+
158
+* ab/doc-misc-typofixes (2019-03-18) 1 commit
159
+ - doc: fix typos in man pages
160
+
161
+ Typofixes.
162
163
+ Will merge to 'next'.
164
115
-* jk/line-log-with-patch (2019-03-11) 2 commits
116
- - line-log: detect unsupported formats
117
- - line-log: suppress diff output with "-s"
165
119
- "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
120
- output as it should. This has been corrected.
166
+* ab/drop-scripted-rebase (2019-03-20) 1 commit
167
+ - rebase: remove the rebase.useBuiltin setting
168
+
169
+ Retire scripted "git rebase" implementation.
170
171
Will merge to 'next'.
172
173
125
-* js/rebase-deprecate-preserve-merges (2019-03-08) 1 commit
126
- - rebase: deprecate --preserve-merges
174
+* ab/gc-reflog (2019-03-18) 8 commits
175
+ - reflog expire: don't assert the OID when locking refs
176
+ - gc: handle & check gc.reflogExpire config
177
+ - reflog tests: assert lack of early exit with expiry="never"
178
+ - reflog tests: test for the "points nowhere" warning
179
+ - reflog tests: make use of "test_config" idiom
180
+ - gc: refactor a "call me once" pattern
181
+ - gc: convert to using the_hash_algo
182
+ - gc: remove redundant check for gc_auto_threshold
183
128
- "git rebase --rebase-merges" replaces its old "--preserve-merges"
129
- option; the latter is now marked as deprecated.
184
+ Fix various glitches in "git gc" around reflog handling.
185
+
186
+ cf. <20190315155959.12390-1-avarab@gmail.com> (v3)
187
+
188
+
189
+* ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits
190
+ - pack-objects: default to writing bitmap hash-cache
191
+ - t5310: correctly remove bitmaps for jgit test
192
+ - repack: enable bitmaps by default on bare repos
193
+
194
+ The connectivity bitmaps are created by default in bare
195
+ repositories now; also the pathname hash-cache is created by
196
+ default to avoid making crappy deltas when repacking.
197
198
Will merge to 'next'.
199
200
134
-* js/init-db-update-for-mingw (2019-03-08) 1 commit
135
- - mingw: respect core.hidedotfiles = false in git-init again
201
+* jk/perf-lib-tee (2019-03-18) 1 commit
202
+ - perf-lib.sh: rely on test-lib.sh for --tee handling
203
137
- "git init" forgot to read platform-specific repository
138
- configuration, which made Windows port to ignore settings of
139
- core.hidedotfiles, for example.
204
+ Code cleanup in the test framework.
205
141
- cf. <xmqqva0ujboi.fsf@gitster-ct.c.googlers.com>
206
+ Will merge to 'next'.
207
208
144
-* js/stash-in-c-pathspec-fix (2019-03-08) 2 commits
145
- - built-in stash: handle :(glob) pathspecs again
146
- - legacy stash: fix "rudimentary backport of -q"
147
- (this branch uses ps/stash-in-c; is tangled with tb/stas-in-c-unused-param-fix.)
209
+* js/check-docs-exe (2019-03-14) 1 commit
210
+ - check-docs: fix for setups where executables have an extension
211
149
- Further fixes to "git stash" reimplemented in C.
212
+ Dev support update.
213
214
Will merge to 'next'.
215
216
154
-* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits
155
- - Make sure refs/rewritten/ is per-worktree
156
- - files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
157
- - files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
217
+* js/difftool-no-index (2019-03-18) 3 commits
218
+ - difftool: allow running outside Git worktrees with --no-index
219
+ - parse-options: make OPT_ARGUMENT() more useful
220
+ - difftool: remove obsolete (and misleading) comment
221
159
- "git rebase" uses the refs/rewritten/ hierarchy to store its
160
- intermediate states, which inherently makes the hierarchy per
161
- worktree, but it didn't quite work well.
222
+ "git difftool" can now run outside a repository.
223
+
224
+ Will merge to 'next'.
225
+
226
+
227
+* js/get-short-oid-drop-cache (2019-03-14) 4 commits
228
+ - get_oid(): when an object was not found, try harder
229
+ - sequencer: move stale comment into correct location
230
+ - sequencer: improve error message when an OID could not be parsed
231
+ - rebase -i: demonstrate obscure loose object cache bug
232
+
233
+ A corner-case object name ambiguity while the sequencer machinery
234
+ is working (e.g. "rebase -i -x") has been (half) fixed.
235
+
236
+ Will merge to 'next'.
237
+
238
+
239
+* ma/doc-diff-doc-vs-doctor-comparison (2019-03-18) 4 commits
240
+ - doc-diff: add `--cut-header-footer`
241
+ - doc-diff: support diffing from/to AsciiDoc(tor)
242
+ - doc-diff: let `render_tree()` take an explicit directory name
243
+ - Doc: auto-detect changed build flags
244
+
245
+ Dev support update to make it easier to compare two formatted
246
+ results from our documentation.
247
+
248
+ Will merge to 'next'.
249
+ cf. <20190319031412.GC6173@sigill.intra.peff.net>
250
+
251
+
252
+* mh/pack-protocol-doc-fix (2019-03-18) 1 commit
253
+ - fix pack protocol example client/server communication
254
+
255
+ Docfix.
256
+
257
+ Will merge to 'next'.
258
+
259
+
260
+* nd/checkout-f-while-conflicted-fix (2019-03-19) 1 commit
261
+ - unpack-trees: fix oneway_merge accidentally carry over stage index
262
+
263
+ "git checkout -f <branch>" while the index has an unmerged path
264
+ incorrectly left some paths in an unmerged state, which has been
265
+ corrected.
266
+
267
+ Will merge to 'next'.
268
+
269
+
270
+* pw/cherry-pick-continue (2019-03-18) 3 commits
271
+ - cherry-pick --continue: remember options
272
+ - cherry-pick: demonstrate option amnesia
273
+ - sequencer: break some long lines
274
+
275
+ "git cherry-pick --options A..B", after giving control back to the
276
+ user to ask help resolving a conflicted step, did not honor the
277
+ options it originally received, which has been corrected.
278
+
279
+ Will merge to 'next'.
280
+
281
+
282
+* pw/rerere-autoupdate (2019-03-18) 2 commits
283
+ - merge: tweak --rerere-autoupdate documentation
284
+ - am/cherry-pick/rebase/revert: document --rerere-autoupdate
285
+
286
+ Doc updates.
287
+
288
+ Will merge to 'next'.
289
+
290
+
291
+* sg/test-atexit (2019-03-14) 11 commits
292
+ - t9811-git-p4-label-import: fix pipeline negation
293
+ - git p4 test: disable '-x' tracing in the p4d watchdog loop
294
+ - git p4 test: simplify timeout handling
295
+ - git p4 test: clean up the p4d cleanup functions
296
+ - git p4 test: use 'test_atexit' to kill p4d and the watchdog process
297
+ - t0301-credential-cache: use 'test_atexit' to stop the credentials helper
298
+ - tests: use 'test_atexit' to stop httpd
299
+ - git-daemon: use 'test_atexit` to stop 'git-daemon'
300
+ - test-lib: introduce 'test_atexit'
301
+ - t/lib-git-daemon: make sure to kill the 'git-daemon' process
302
+ - test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'
303
+
304
+ Test framework update to more robustly clean up leftover files and
305
+ processes after tests are done.
306
+
307
+ Will merge to 'next'.
308
+
309
+
310
+* tb/trace2-va-list-fix (2019-03-20) 1 commit
311
+ - trace2: NULL is not allowed for va_list
312
+
313
+ Fix some code that passed a NULL when a va_list was expected.
314
+
315
+ Will merge to 'next'.
316
+
317
+
318
+* tg/glossary-overlay (2019-03-18) 1 commit
319
+ - glossary: add definition for overlay
320
+
321
+ Doc update.
322
+
323
+ Will merge to 'next'.
324
+
325
+
326
+* tg/stash-in-c-show-default-to-p-fix (2019-03-20) 1 commit
327
+ - stash: setup default diff output format if necessary
328
+ (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tb/stash-in-c-unused-param-fix.)
329
+
330
+ A regression fix.
331
+
332
+ Will merge to 'next'.
333
+
334
+
335
+* tz/completion (2019-03-18) 4 commits
336
+ - completion: use __git when calling --list-cmds
337
+ - completion: fix multiple command removals
338
+ - t9902: test multiple removals via completion.commands
339
+ - git: read local config in --list-cmds
340
+
341
+ The completion helper code now pays attention to repository-local
342
+ configuration (when available), which allows --list-cmds to honour
343
+ a repository specific setting of completion.commands, for example.
344
+
345
+ Getting there...
346
+ cf. <20190317181620.26727-1-tmz@pobox.com> (v2)
347
+ cf. <CACsJy8DiQwmAKMruOAO4roPbiRTvt5TESBTd682hTwkZjcoj2Q@mail.gmail.com>
348
+
349
+
350
+* tz/t4038-bash-redirect-target-workaround (2019-03-18) 1 commit
351
+ - t4038-diff-combined: quote paths with whitespace
352
+
353
+ Work-around extra warning from bash in our tests.
354
355
Will merge to 'next'.
356
@@ -243,9 +435,9 @@ of the repositories listed at
435
end-user complaints, but let's see.
436
437
246
-* nb/branch-show-other-worktrees-head (2019-02-01) 3 commits
247
- - branch: add an extra verbose output displaying worktree path for refs checked out in a linked worktree
248
- - branch: mark and color a branch differently if it is checked out in a linked worktree
438
+* nb/branch-show-other-worktrees-head (2019-03-18) 3 commits
439
+ - branch: add worktree info on verbose output
440
+ - branch: update output to include worktree info
441
- ref-filter: add worktreepath atom
442
443
"git branch --list" learned to show branches that are checked out
@@ -260,6 +452,80 @@ of the repositories listed at
452
--------------------------------------------------
453
[Cooking]
454
455
+* dl/ignore-docs (2019-03-08) 2 commits
456
+ - docs: move core.excludesFile from git-add to gitignore
457
+ - git-clean.txt: clarify ignore pattern files
458
+
459
+ Doc update.
460
+
461
+ Will merge to 'next'.
462
+
463
+
464
+* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit
465
+ - convert: avoid malloc of original file size
466
+
467
+ When the "clean" filter can reduce the size of a huge file in the
468
+ working tree down to a small "token" (a la Git LFS), there is no
469
+ point in allocating a huge scratch area upfront, but the buffer is
470
+ sized based on the original file size. The convert mechanism now
471
+ allocates very minimum and reallocates as it receives the output
472
+ from the clean filter process.
473
+
474
+ Will merge to 'next'.
475
+
476
+
477
+* jk/line-log-with-patch (2019-03-11) 2 commits
478
+ - line-log: detect unsupported formats
479
+ - line-log: suppress diff output with "-s"
480
+
481
+ "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
482
+ output as it should. This has been corrected.
483
+
484
+ Will merge to 'next'.
485
+
486
+
487
+* js/rebase-deprecate-preserve-merges (2019-03-12) 1 commit
488
+ - rebase: deprecate --preserve-merges
489
+
490
+ "git rebase --rebase-merges" replaces its old "--preserve-merges"
491
+ option; the latter is now marked as deprecated.
492
+
493
+ Will merge to 'next'.
494
+
495
+
496
+* js/init-db-update-for-mingw (2019-03-12) 1 commit
497
+ - mingw: respect core.hidedotfiles = false in git-init again
498
+
499
+ "git init" forgot to read platform-specific repository
500
+ configuration, which made Windows port to ignore settings of
501
+ core.hidedotfiles, for example.
502
+
503
+ Will merge to 'next'.
504
+
505
+
506
+* js/stash-in-c-pathspec-fix (2019-03-12) 3 commits
507
+ - stash: pass pathspec as pointer
508
+ - built-in stash: handle :(glob) pathspecs again
509
+ - legacy stash: fix "rudimentary backport of -q"
510
+ (this branch uses ps/stash-in-c; is tangled with tb/stash-in-c-unused-param-fix and tg/stash-in-c-show-default-to-p-fix.)
511
+
512
+ Further fixes to "git stash" reimplemented in C.
513
+
514
+ Will merge to 'next'.
515
+
516
+
517
+* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits
518
+ - Make sure refs/rewritten/ is per-worktree
519
+ - files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
520
+ - files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
521
+
522
+ "git rebase" uses the refs/rewritten/ hierarchy to store its
523
+ intermediate states, which inherently makes the hierarchy per
524
+ worktree, but it didn't quite work well.
525
+
526
+ Will merge to 'next'.
527
+
528
+
529
* br/commit-tree-parseopt (2019-03-08) 1 commit
530
(merged to 'next' on 2019-03-11 at e1228ef04f)
531
+ commit-tree: utilize parse-options api
@@ -292,8 +558,7 @@ of the repositories listed at
558
Error messages given from the http transport have been updated so
559
that they can be localized.
560
295
- The i18n of die() messages conflicts with topics in flight, so will
296
- be dealt with separately when the tree is more quiescent.
561
+ Will merge to 'next'.
562
563
564
* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
@@ -333,6 +598,9 @@ of the repositories listed at
598
Third batch to teach the diff machinery to use the parse-options
599
API.
600
601
+ Will merge to 'next'.
602
+ cf. <20190305123026.7266-1-pclouds@gmail.com>
603
+
604
605
* jt/test-protocol-version (2019-03-07) 8 commits
606
- t5552: compensate for v2 filtering ref adv.
@@ -347,6 +615,9 @@ of the repositories listed at
615
Help developers by making it easier to run most of the tests under
616
different versions of over-the-wire protocols.
617
618
+ Will merge to 'next'.
619
+ cf. <cover.1551131153.git.jonathantanmy@google.com>
620
+
621
622
* jk/bisect-final-output (2019-03-01) 3 commits
623
(merged to 'next' on 2019-03-11 at dea599eb04)
@@ -448,16 +719,14 @@ of the repositories listed at
719
Will merge to 'master'.
720
721
451
-* ma/asciidoctor-fixes (2019-03-11) 5 commits
452
- - asciidoctor-extensions: fix spurious space after linkgit in *.html
453
- - Documentation/Makefile: add missing dependencies on asciidoctor-extensions
722
+* ma/asciidoctor-fixes (2019-03-11) 3 commits
723
- asciidoctor-extensions: fix spurious space after linkgit
724
- Documentation/Makefile: add missing dependency on asciidoctor-extensions
725
- Documentation/Makefile: add missing xsl dependencies for manpages
726
727
Build fix around use of asciidoctor instead of asciidoc
728
460
- Ejected out of 'next' to allow a cleaner reroll.
729
+ Will merge to 'next'.
730
731
732
* nd/worktree-name-sanitization (2019-03-11) 2 commits
@@ -477,7 +746,8 @@ of the repositories listed at
746
747
A GSoC micro.
748
480
- I think this is almost there.
749
+ Will merge to 'next'.
750
+ cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)
751
752
753
* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
@@ -539,7 +809,8 @@ of the repositories listed at
809
Will merge to 'master'.
810
811
542
-* jt/fetch-cdn-offload (2019-03-11) 8 commits
812
+* jt/fetch-cdn-offload (2019-03-12) 9 commits
813
+ - SQUASH???
814
- upload-pack: send part of packfile response as uri
815
- fetch-pack: support more than one pack lockfile
816
- upload-pack: refactor reading of pack-objects out
@@ -642,15 +913,18 @@ of the repositories listed at
913
Will merge to 'master'.
914
915
645
-* dl/merge-cleanup-scissors-fix (2019-03-11) 8 commits
916
+* dl/merge-cleanup-scissors-fix (2019-03-18) 11 commits
917
- cherry-pick/revert: add scissors line on merge conflict
647
- - sequencer.c: define get_config_from_cleanup
918
+ - sequencer.c: define describe_cleanup_mode
919
- merge: add scissors line on merge conflict
920
- merge: cleanup messages like commit
921
- sequencer.c: remove duplicate code
922
+ - parse-options.h: extract common --cleanup option
923
- commit: extract cleanup_mode functions to sequencer
924
+ - t7502: clean up test style
925
+ - t7604: refactor out Git commands upstream of pipe
926
- t3507: cleanup space after redirection operators
653
- - t7600: clean up 'merge --squash c3 with c7' test
927
+ - t7600: clean up style
928
929
The list of conflicted paths shown in the editor while concluding a
930
conflicted merge was shown above the scissors line when the
@@ -658,7 +932,9 @@ of the repositories listed at
932
out just like the list of updated paths and other information to
933
help the user explain the merge better.
934
661
- cf. <cover.1552275703.git.liu.denton@gmail.com>
935
+ Getting there ;-)
936
+ cf. <cover.1552275703.git.liu.denton@gmail.com> (v7)
937
+ Expecting v9.
938
939
940
* jn/unknown-index-extensions (2018-11-21) 2 commits
@@ -698,6 +974,9 @@ of the repositories listed at
974
around in-core to avoid rewriting the same file over and over
975
unnecessarily.
976
977
+ Will merge to 'next'.
978
+ cf. <20190305191805.13561-1-alban.gruin@gmail.com> (v8)
979
+
980
981
* ps/stash-in-c (2019-03-07) 29 commits
982
(merged to 'next' on 2019-03-11 at f568e3be72)
@@ -730,7 +1009,7 @@ of the repositories listed at
1009
+ strbuf.c: add `strbuf_join_argv()`
1010
+ sha1-name.c: add `get_oidf()` which acts like `get_oid()`
1011
+ Merge branch 'sd/stash-wo-user-name'
733
- (this branch is used by js/stash-in-c-pathspec-fix and tb/stas-in-c-unused-param-fix.)
1012
+ (this branch is used by js/stash-in-c-pathspec-fix, tb/stash-in-c-unused-param-fix and tg/stash-in-c-show-default-to-p-fix.)
1013
1014
Originally merged to 'next' on 2019-03-07
1015