What's cooking (2019/04 #02)
Junio C Hamano committed
Apr 10, 2019 at 03:05 UTC
1bfd48bd5d7a4d56241127db78be2dcae88cd48b
1 file changed
+613
-506
whats-cooking.txt
+613
-506
@@ -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, #01; Thu, 4)
4
-X-master-at: 041f5ea1cf987a4068ef5f39ba0a09be85952064
5
-X-next-at: f8f6787159eebeb0fe8766e114123185ee1893ea
3
+Subject: What's cooking in git.git (Apr 2019, #02; Wed, 10)
4
+X-master-at: e35b8cb8e212e3557efc565157ceb5cbaaf0d87f
5
+X-next-at: 511ec345e18b91bfc070cff61e34b433cb3e5a41
6
7
-What's cooking in git.git (Apr 2019, #01; Thu, 4)
7
+What's cooking in git.git (Apr 2019, #02; Wed, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,10 @@ 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
+Sorry for keeping a rather huge backlog for the past few weeks. As
16
+the result, tonight's pushout is a rather large one, merging 30+
17
+topics to 'next' and a dozen or so to 'master'.
18
+
19
You can find the changes described here in the integration branches
20
of the repositories listed at
21
@@ -20,156 +24,436 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
23
-* ab/makefile-help-devs-more (2019-02-24) 6 commits
24
- (merged to 'next' on 2019-03-11 at 898f5f44bc)
25
- + Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
26
- + Makefile: move the setting of *FLAGS closer to "include"
27
- + Makefile: Move *_LIBS assignment into its own section
28
- + Makefile: add/remove comments at top and tweak whitespace
29
- + Makefile: move "strip" assignment down from flags
30
- + Makefile: remove an out-of-date comment
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
30
32
- Originally merged to 'next' on 2019-03-07
31
+ Test cleanup.
32
34
- CFLAGS now can be tweaked when invoking Make while using
35
- DEVELOPER=YesPlease; this did not work well before.
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
38
38
-* br/commit-tree-parseopt (2019-03-08) 1 commit
39
- (merged to 'next' on 2019-03-11 at e1228ef04f)
40
- + commit-tree: utilize parse-options api
39
+ Doc update.
40
42
- Originally merged to 'next' on 2019-03-08
41
44
- The command line parser of "git commit-tree" has been rewritten to
45
- use the parse-options API.
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
45
46
+ Doc update.
47
48
-* jk/bisect-final-output (2019-03-01) 3 commits
49
- (merged to 'next' on 2019-03-11 at dea599eb04)
50
- + bisect: make diff-tree output prettier
51
- + bisect: fix internal diff-tree config loading
52
- + bisect: use string arguments to feed internal diff-tree
48
54
- Originally merged to 'next' on 2019-03-07
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
52
56
- The final report from "git bisect" used to show the suspected
57
- culprit using a raw "diff-tree", with which there is no output for
58
- a merge commit. This has been updated to use a more modern and
59
- human readable output that still is concise enough.
53
+ Doc update.
54
55
62
-* jk/config-type-color-ends-with-lf (2019-03-07) 1 commit
63
- (merged to 'next' on 2019-03-11 at 810b269d1a)
64
- + config: document --type=color output is a complete line
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
59
66
- Originally merged to 'next' on 2019-03-07
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.
66
68
- "git config --type=color ..." is meant to replace "git config --get-color"
69
- but there is a slight difference that wasn't documented, which is
70
- now fixed.
67
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"
72
73
-* jk/fsck-doc (2019-03-05) 2 commits
74
- (merged to 'next' on 2019-03-11 at 5cd610f73e)
75
- + fsck: always compute USED flags for unreachable objects
76
- + doc/fsck: clarify --connectivity-only behavior
73
+ "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
74
+ output as it should. This has been corrected.
75
78
- Originally merged to 'next' on 2019-03-07
76
80
- "git fsck --connectivity-only" omits computation necessary to sift
81
- the objects that are not reachable from any of the refs into
82
- unreachable and dangling. This is now enabled when dangling
83
- objects are requested (which is done by default, but can be
84
- overridden with the "--no-dangling" option).
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
80
81
+ Suggest GitGitGadget instead of submitGit as a way to submit
82
+ patches based on GitHub PR to us.
83
87
-* jk/no-sigpipe-during-network-transport (2019-03-05) 2 commits
88
- (merged to 'next' on 2019-03-11 at 25900acd0d)
89
- + fetch: ignore SIGPIPE during network operation
90
- + fetch: avoid calling write_or_die()
84
92
- Originally merged to 'next' on 2019-03-07
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
88
94
- On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
95
- the upload-pack that runs on the other end that hangs up after
96
- detecting an error could cause "git fetch" to die with a signal,
97
- which led to a flakey test. "git fetch" now ignores SIGPIPE during
98
- the network portion of its operation (this is not a problem as we
99
- check the return status from our write(2)s).
89
+ Build update for SHA-1 with collision detection.
90
91
102
-* jk/virtual-objects-do-exist (2019-03-05) 1 commit
103
- (merged to 'next' on 2019-03-11 at 748c79a1f0)
104
- + rev-list: allow cached objects in existence check
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
95
106
- Originally merged to 'next' on 2019-03-07
96
+ "git rebase --rebase-merges" replaces its old "--preserve-merges"
97
+ option; the latter is now marked as deprecated.
98
108
- A recent update broke "is this object available to us?" check for
109
- well-known objects like an empty tree (which should yield "yes",
110
- even when there is no on-disk object for an empty tree), which has
111
- been corrected.
99
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
103
114
-* js/rebase-orig-head-fix (2019-03-04) 4 commits
115
- (merged to 'next' on 2019-03-11 at 4b1b19d391)
116
- + built-in rebase: set ORIG_HEAD just once, before the rebase
117
- + built-in rebase: demonstrate that ORIG_HEAD is not set correctly
118
- + built-in rebase: use the correct reflog when switching branches
119
- + built-in rebase: no need to check out `onto` twice
104
+ Error message update.
105
+ cf. <20190313175738.252961-1-jonathantanmy@google.com> (v2)
106
121
- Originally merged to 'next' on 2019-03-07
107
123
- "git rebase" that was reimplemented in C did not set ORIG_HEAD
124
- correctly, which has been corrected.
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
111
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.
115
127
-* js/stress-test-ui-tweak (2019-03-04) 2 commits
128
- (merged to 'next' on 2019-03-11 at 223afded1c)
129
- + tests: introduce --stress-jobs=<N>
130
- + tests: let --stress-limit=<N> imply --stress
116
132
- Originally merged to 'next' on 2019-03-07
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()
122
134
- Dev support.
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.
126
127
137
-* ma/clear-repository-format (2019-03-01) 2 commits
138
- (merged to 'next' on 2019-03-11 at f3db1c278f)
139
- + setup: fix memory leaks with `struct repository_format`
140
- + setup: free old value before setting `work_tree`
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`
133
142
- Originally merged to 'next' on 2019-03-07
134
+ A GSoC micro.
135
+ cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)
136
+
137
+--------------------------------------------------
138
+[New Topics]
139
+
140
+* bs/sendemail-tighten-anything-by (2019-04-04) 1 commit
141
+ - send-email: don't cc *-by lines with '-' prefix
142
+
143
+ The recently added feature to add addresses that are on
144
+ anything-by: trailers in 'git send-email' was found to be way too
145
+ eager and considered nonsense strings as if they can be legitimate
146
+ beginning of *-by: trailer. This has been tightened.
147
+
148
+ Will merge to 'next'.
149
+
150
+
151
+* 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)
154
+
155
+ "git mergetool" learned to offer Sublime Merge (smerge) as one of
156
+ its backends.
157
+
158
+ Will merge to 'next'.
159
+
160
+
161
+* 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
164
+
165
+ Code clean-up.
166
+
167
+ Will merge to 'next'.
168
+
169
+
170
+* dl/warn-tagging-a-tag (2019-04-09) 2 commits
171
+ - tag: advise on nested tags
172
+ - tag: fix formatting
173
+
174
+ "git tag" learned to give an advice suggesting it might be a
175
+ mistake when creating an annotated or signed tag that points at
176
+ another tag.
177
+
178
+ Will merge to 'next'.
179
+
180
+
181
+* jc/format-patch-delay-message-id (2019-04-05) 1 commit
182
+ - format-patch: move message-id and related headers to the end
183
+
184
+ The location "git format-patch --thread" adds the Message-Id:
185
+ header in the series of header fields has been moved down, which
186
+ may help working around a suspected bug in GMail MSA, reported at
187
+ <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
188
+
189
+ Waiting for feedback to see if it truly helps.
190
+ Needs tests.
191
+
192
+
193
+* jk/revision-rewritten-parents-in-prio-queue (2019-04-04) 1 commit
194
+ - revision: use a prio_queue to hold rewritten parents
195
+
196
+ Performance fix for "rev-list --parents -- pathspec".
197
+
198
+ Will merge to 'next'.
199
+
200
+
201
+* tb/unexpected (2019-04-05) 7 commits
202
+ - rev-list: detect broken root trees
203
+ - rev-list: let traversal die when --missing is not in use
204
+ - get_commit_tree(): return NULL for broken tree
205
+ - list-objects.c: handle unexpected non-tree entries
206
+ - list-objects.c: handle unexpected non-blob entries
207
+ - t: introduce tests for unexpected object types
208
+ - t: move 'hex2oct' into test-lib-functions.sh
209
+
210
+ Code tightening against a "wrong" object appearing where an object
211
+ of a different type is expected, instead of blindly assuming that
212
+ the connection between objects are correctly made.
213
+
214
+ Waiting for a reroll.
215
+ cf. <20190406053308.GC37216@Taylors-MBP.hsd1.wa.comcast.net>
216
+
217
+
218
+* en/merge-directory-renames (2019-04-08) 15 commits
219
+ - merge-recursive: switch directory rename detection default
220
+ - merge-recursive: give callers of handle_content_merge() access to contents
221
+ - merge-recursive: track information associated with directory renames
222
+ - t6043: fix copied test description to match its purpose
223
+ - merge-recursive: switch from (oid,mode) pairs to a diff_filespec
224
+ - merge-recursive: cleanup handle_rename_* function signatures
225
+ - merge-recursive: track branch where rename occurred in rename struct
226
+ - merge-recursive: remove ren[12]_other fields from rename_conflict_info
227
+ - merge-recursive: shrink rename_conflict_info
228
+ - merge-recursive: move some struct declarations together
229
+ - merge-recursive: use 'ci' for rename_conflict_info variable name
230
+ - merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'
231
+ - merge-recursive: rename diff_filespec 'one' to 'o'
232
+ - merge-recursive: rename merge_options argument from 'o' to 'opt'
233
+ - Use 'unsigned short' for mode, like diff_filespec does
234
+
235
+ "git merge-recursive" backend recently learned a new heuristics to
236
+ infer file movement based on how other files in the same directory
237
+ moved. As this is inherently less robust heuristics than the one
238
+ based on the content similarity of the file itself (rather than
239
+ based on what its neighbours are doing), it sometimes gives an
240
+ outcome unexpected by the end users. This has been toned down to
241
+ leave the renamed paths in higher/conflicted stages in the index so
242
+ that the user can examine and confirm the result.
243
+
244
+ Will merge to 'next'.
245
+
246
+
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
262
+
263
+ Code clean-up around a much-less-important-than-it-used-to-be
264
+ update_server_info() funtion.
265
+
266
+ Will merge to 'next' after squashing the SQUASH?? in.
267
+
268
+
269
+* js/rev-list-exclude-promisor-objects (2019-04-09) 1 commit
270
+ - rev-list: exclude promisor objects at walk time
271
+
272
+ "git rev-list --exclude-promisor-objects" learned not to bother
273
+ enumerating all promisor objects, and instead filter these objects
274
+ at walk time for performance.
275
+
276
+ Getting there.
277
+ cf. <xmqqo95f43dq.fsf@gitster-ct.c.googlers.com>
278
+
279
+
280
+* jt/clone-server-option (2019-04-09) 1 commit
281
+ - clone: send server options when using protocol v2
282
+
283
+ "git clone" learned a new --server-option option when talking over
284
+ the protocol version 2.
285
+
286
+ Getting there.
287
+ cf. <xmqqk1g342xi.fsf@gitster-ct.c.googlers.com>
288
+ cf. <20190406115728.GB219876@google.com>
289
+
290
+
291
+* po/describe-not-necessarily-7 (2019-04-08) 1 commit
292
+ - describe doc: remove '7-char' abbreviation reference
293
+
294
+ Docfix.
295
+
296
+ Will merge to 'next'.
297
+
298
+
299
+* po/rerere-doc-fmt (2019-04-08) 1 commit
300
+ - rerere doc: quote `rerere.enabled`
301
+
302
+ Docfix.
303
+
304
+ Will merge to 'next'.
305
+
306
+
307
+* sg/blame-in-bare-start-at-head (2019-04-08) 1 commit
308
+ - blame: default to HEAD in a bare repo when no start commit is given
309
+
310
+ "git blame -- path" in a non-bare repository starts blaming from
311
+ the working tree, and the same command in a bare repository errors
312
+ out because there is no working tree by definition. The command
313
+ has been taught to instead start blaming from the commit at HEAD,
314
+ which is more useful.
315
+
316
+ Will merge to 'next'.
317
+
318
+
319
+* tg/ls-files-debug-format-fix (2019-04-08) 1 commit
320
+ - ls-files: use correct format string
321
+
322
+ Debugging code fix.
323
+
324
+ Will merge to 'next'.
325
+
326
+
327
+* tz/doc-apostrophe-no-longer-needed (2019-04-08) 1 commit
328
+ - Documentation/git-show-branch: drop last use of {apostrophe}
329
+
330
+ Doc formatting fix.
331
+
332
+ Will merge to 'next'.
333
+
334
+
335
+* tz/git-svn-doc-markup-fix (2019-04-08) 1 commit
336
+ - Documentation/git-svn: improve asciidoctor compatibility
337
+
338
+ Doc formatting fix.
339
+
340
+ Needs a better description.
341
+ cf. <CAN0heSpL_pQMtDaEdDgcsC_Sso45owHjRttrdp7cQdYOb7i9BA@mail.gmail.com>
342
+
343
+
344
+* js/t3301-unbreak-notes-test (2019-04-09) 1 commit
345
+ - t3301: fix false negative
346
+
347
+ Test fix.
348
+
349
+ Will merge to 'next'.
350
144
- The setup code has been cleaned up to avoid leaks around the
145
- repository_format structure.
351
352
+* ss/msvc-path-utils-fix (2019-04-09) 1 commit
353
+ - MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path()
354
148
-* sx/evolve (2019-02-15) 8 commits
149
- . evolve: add the git change list command
150
- . evolve: implement the git change command
151
- . evolve: add support for writing metacommits
152
- . evolve: add the change-table structure
153
- . evolve: add support for parsing metacommits
154
- . ref-filter: add the metas namespace to ref-filter
155
- . sha1-array: implement oid_array_readonly_contains
156
- . technical doc: add a design doc for the evolve command
355
+ An earlier update for MinGW and Cygwin accidentally broke MSVC build,
356
+ which has been fixed.
357
158
- The beginning of "hg evolve" mimicry.
358
+ May want to clarify the log message?
359
+ cf. <af640e82-ca1a-9c96-da47-62aaea1cc18e@web.de>
360
361
--------------------------------------------------
161
-[New Topics]
362
+[Stalled]
363
163
-* ms/worktree-add-atomic-mkdir (2019-03-12) 1 commit
164
- (merged to 'next' on 2019-03-20 at ded442ed02)
165
- + worktree: fix worktree add race
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
167
- "git worktree add" used to do a "find an available name with stat
168
- and then mkdir", which is race-prone. This has been fixed by using
169
- mkdir and reacting to EEXIST in a loop.
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
171
- Will merge to 'master'.
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]
457
458
* tb/stash-in-c-unused-param-fix (2019-03-11) 1 commit
459
(merged to 'next' on 2019-03-20 at 5ccac5f80d)
@@ -182,19 +466,11 @@ of the repositories listed at
466
467
468
* dl/subtree-limit-to-one-rev (2019-03-12) 1 commit
185
- - contrib/subtree: ensure only one rev is provided
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
189
- Will merge to 'next'.
190
-
191
-
192
-* ar/t4150-remove-cruft (2019-03-13) 1 commit
193
- (merged to 'next' on 2019-03-20 at a0106a8d5c)
194
- + t4150: remove unused variable
195
-
196
- Test cleanup.
197
-
474
Will merge to 'master'.
475
476
@@ -207,7 +483,9 @@ of the repositories listed at
483
Will merge to 'next'.
484
485
210
-* cc/multi-promisor (2019-04-02) 11 commits
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
489
- remote: add promisor and partial clone config to the doc
490
- partial-clone: add multiple remotes in the doc
491
- t0410: test fetching from many promisor remotes
@@ -220,36 +498,10 @@ of the repositories listed at
498
- Add initial support for many promisor remotes
499
- fetch-object: make functions return an error code
500
223
- Breaks 'pu'.
224
-
225
-
226
-* jk/promote-ggg (2019-03-13) 1 commit
227
- (merged to 'next' on 2019-03-20 at 3db7d2566d)
228
- + point pull requesters to GitGitGadget
229
-
230
- Suggest GitGitGadget instead of submitGit as a way to submit
231
- patches based on GitHub PR to us.
232
-
233
- Will merge to 'master'.
234
-
235
-
236
-* jk/sha1dc (2019-03-13) 1 commit
237
- (merged to 'next' on 2019-03-20 at 969280e8e5)
238
- + Makefile: fix unaligned loads in sha1dc with UBSan
239
-
240
- Build update for SHA-1 with collision detection.
241
-
242
- Will merge to 'master'.
243
-
244
-
245
-* jt/submodule-fetch-errmsg (2019-03-14) 1 commit
246
- (merged to 'next' on 2019-03-20 at a6b0efa76f)
247
- + submodule: explain first attempt failure clearly
248
-
249
- Error message update.
501
+ Expecting a reroll.
502
251
- Will merge to 'master'.
252
- cf. <20190313175738.252961-1-jonathantanmy@google.com> (v2)
503
+ An earlier breakage on 'pu' due to incorrect semantic conflict
504
+ resolution has been corrected.
505
506
507
* nd/switch-and-restore (2019-04-02) 39 commits
@@ -304,19 +556,21 @@ of the repositories listed at
556
557
558
* ab/doc-misc-typofixes (2019-03-18) 1 commit
307
- - doc: fix typos in man pages
559
+ (merged to 'next' on 2019-04-10 at 06d19acd7e)
560
+ + doc: fix typos in man pages
561
562
Typofixes.
563
311
- Will merge to 'next'.
564
+ Will merge to 'master'.
565
566
567
* ab/drop-scripted-rebase (2019-03-20) 1 commit
315
- - rebase: remove the rebase.useBuiltin setting
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
319
- Will merge to 'next'.
573
+ Will merge to 'master'.
574
575
576
* ab/gc-reflog (2019-04-01) 7 commits
@@ -330,7 +584,7 @@ of the repositories listed at
584
585
Fix various glitches in "git gc" around reflog handling.
586
333
- cf. <20190328161434.19200-1-avarab@gmail.com> (v4)
587
+ Will merge to 'next'.
588
589
590
* ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits
@@ -346,11 +600,12 @@ of the repositories listed at
600
601
602
* jk/perf-lib-tee (2019-03-18) 1 commit
349
- - perf-lib.sh: rely on test-lib.sh for --tee handling
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
353
- Will merge to 'next'.
608
+ Will merge to 'master'.
609
610
611
* js/check-docs-exe (2019-04-01) 5 commits
@@ -376,46 +631,50 @@ of the repositories listed at
631
632
633
* js/get-short-oid-drop-cache (2019-03-14) 4 commits
379
- - get_oid(): when an object was not found, try harder
380
- - sequencer: move stale comment into correct location
381
- - sequencer: improve error message when an OID could not be parsed
382
- - rebase -i: demonstrate obscure loose object cache bug
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
387
- Will merge to 'next'.
643
+ Will merge to 'master'.
644
645
646
* ma/doc-diff-doc-vs-doctor-comparison (2019-03-18) 4 commits
391
- - doc-diff: add `--cut-header-footer`
392
- - doc-diff: support diffing from/to AsciiDoc(tor)
393
- - doc-diff: let `render_tree()` take an explicit directory name
394
- - Doc: auto-detect changed build flags
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
399
- Will merge to 'next'.
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
404
- - fix pack protocol example client/server communication
661
+ (merged to 'next' on 2019-04-10 at 037673d71c)
662
+ + fix pack protocol example client/server communication
663
664
Docfix.
665
408
- Will merge to 'next'.
666
+ Will merge to 'master'.
667
668
669
* nd/checkout-f-while-conflicted-fix (2019-03-21) 1 commit
412
- - unpack-trees: fix oneway_merge accidentally carry over stage index
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
418
- Will merge to 'next'.
677
+ Will merge to 'master'.
678
679
680
* pw/cherry-pick-continue (2019-03-18) 3 commits
@@ -431,78 +690,85 @@ of the repositories listed at
690
691
692
* pw/rerere-autoupdate (2019-03-18) 2 commits
434
- - merge: tweak --rerere-autoupdate documentation
435
- - am/cherry-pick/rebase/revert: document --rerere-autoupdate
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
439
- Will merge to 'next'.
699
+ Will merge to 'master'.
700
701
702
* sg/test-atexit (2019-03-14) 11 commits
443
- - t9811-git-p4-label-import: fix pipeline negation
444
- - git p4 test: disable '-x' tracing in the p4d watchdog loop
445
- - git p4 test: simplify timeout handling
446
- - git p4 test: clean up the p4d cleanup functions
447
- - git p4 test: use 'test_atexit' to kill p4d and the watchdog process
448
- - t0301-credential-cache: use 'test_atexit' to stop the credentials helper
449
- - tests: use 'test_atexit' to stop httpd
450
- - git-daemon: use 'test_atexit` to stop 'git-daemon'
451
- - test-lib: introduce 'test_atexit'
452
- - t/lib-git-daemon: make sure to kill the 'git-daemon' process
453
- - test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'
703
+ (merged to 'next' on 2019-04-10 at 7839135291)
704
+ + t9811-git-p4-label-import: fix pipeline negation
705
+ + git p4 test: disable '-x' tracing in the p4d watchdog loop
706
+ + git p4 test: simplify timeout handling
707
+ + git p4 test: clean up the p4d cleanup functions
708
+ + git p4 test: use 'test_atexit' to kill p4d and the watchdog process
709
+ + 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
458
- Will merge to 'next'.
719
+ Will merge to 'master'.
720
721
722
* tb/trace2-va-list-fix (2019-03-20) 1 commit
462
- - trace2: NULL is not allowed for va_list
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
466
- Will merge to 'next'.
728
+ Will merge to 'master'.
729
730
731
* tg/glossary-overlay (2019-03-18) 1 commit
470
- - glossary: add definition for overlay
732
+ (merged to 'next' on 2019-04-10 at f5415c65cc)
733
+ + glossary: add definition for overlay
734
735
Doc update.
736
474
- Will merge to 'next'.
737
+ Will merge to 'master'.
738
739
740
* tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
478
- - stash: setup default diff output format if necessary
741
+ (merged to 'next' on 2019-04-10 at 9489a31a36)
742
+ + stash: setup default diff output format if necessary
743
(this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tb/stash-in-c-unused-param-fix.)
744
745
A regression fix.
746
483
- Will merge to 'next'.
747
+ Will merge to 'master'.
748
749
750
* tz/completion (2019-03-21) 4 commits
487
- - completion: use __git when calling --list-cmds
488
- - completion: fix multiple command removals
489
- - t9902: test multiple removals via completion.commands
490
- - git: read local config in --list-cmds
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
496
- Will merge to 'next'.
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
501
- - t4038-diff-combined: quote paths with whitespace
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
505
- Will merge to 'next'.
771
+ Will merge to 'master'.
772
773
774
* jc/format-patch-noclobber (2019-02-22) 1 commit
@@ -510,25 +776,25 @@ of the repositories listed at
776
(this branch uses jc/format-patch-error-check.)
777
778
513
-
779
* jk/unused-params-even-more (2019-03-21) 13 commits
515
- - parse_opt_ref_sorting: always use with NONEG flag
516
- - pretty: drop unused strbuf from parse_padding_placeholder()
517
- - pretty: drop unused "type" parameter in needs_rfc2047_encoding()
518
- - parse-options: drop unused ctx parameter from show_gitcomp()
519
- - fetch_pack(): drop unused parameters
520
- - report_path_error(): drop unused prefix parameter
521
- - unpack-trees: drop unused error_type parameters
522
- - unpack-trees: drop name_entry from traverse_by_cache_tree()
523
- - test-date: drop unused "now" parameter from parse_dates()
524
- - update-index: drop unused prefix_length parameter from do_reupdate()
525
- - log: drop unused "len" from show_tagger()
526
- - log: drop unused rev_info from early output
527
- - revision: drop some unused "revs" parameters
528
-
529
- Code cleanup
780
+ (merged to 'next' on 2019-04-10 at 12edf8872f)
781
+ + parse_opt_ref_sorting: always use with NONEG flag
782
+ + pretty: drop unused strbuf from parse_padding_placeholder()
783
+ + pretty: drop unused "type" parameter in needs_rfc2047_encoding()
784
+ + parse-options: drop unused ctx parameter from show_gitcomp()
785
+ + fetch_pack(): drop unused parameters
786
+ + report_path_error(): drop unused prefix parameter
787
+ + unpack-trees: drop unused error_type parameters
788
+ + unpack-trees: drop name_entry from traverse_by_cache_tree()
789
+ + test-date: drop unused "now" parameter from parse_dates()
790
+ + update-index: drop unused prefix_length parameter from do_reupdate()
791
+ + log: drop unused "len" from show_tagger()
792
+ + log: drop unused rev_info from early output
793
+ + revision: drop some unused "revs" parameters
794
531
- Will merge to 'next'.
795
+ Code cleanup.
796
+
797
+ Will merge to 'master'.
798
799
800
* ab/commit-graph-fixes (2019-04-01) 8 commits
@@ -547,8 +813,7 @@ of the repositories listed at
813
Will merge to 'next'.
814
815
550
-* ab/gc-docs (2019-04-01) 12 commits
551
- - SQAUSH??? fixup! gc docs: include the "gc.*" section from "config" in "gc"
816
+* ab/gc-docs (2019-04-08) 11 commits
817
- gc docs: remove incorrect reference to gc.auto=0
818
- gc docs: clarify that "gc" doesn't throw away referenced objects
819
- gc docs: note "gc --aggressive" in "fast-import"
@@ -561,6 +826,9 @@ of the repositories listed at
826
- gc docs: stop noting "repack" flags
827
- gc docs: modernize the advice for manually running "gc"
828
829
+ Update docs around "gc".
830
+
831
+ Will merge to 'next'.
832
833
834
* ab/test-lib-pass-trace2-env (2019-04-01) 1 commit
@@ -583,13 +851,16 @@ of the repositories listed at
851
852
"git p4" update.
853
854
+ Is this ready for 'next'?
855
+
856
857
* bb/unicode-12 (2019-03-22) 1 commit
588
- - unicode: update the width tables to Unicode 12
858
+ (merged to 'next' on 2019-04-10 at b0dfa1001e)
859
+ + unicode: update the width tables to Unicode 12
860
861
Unicode update.
862
592
- Will merge to 'next'.
863
+ Will merge to 'master'.
864
865
866
* bc/hash-transition-16 (2019-04-01) 35 commits
@@ -634,7 +905,6 @@ of the repositories listed at
905
Will merge to 'next'.
906
907
637
-
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
@@ -663,24 +933,13 @@ of the repositories listed at
933
Will merge to 'next'.
934
935
666
-* dl/forbid-tagging-a-tag (2019-04-03) 3 commits
667
- - SQUASH???
668
- - tag: prevent nested tags
669
- - tag: fix formatting
670
-
671
- "git tag $newtag $obj", when $obj is another tag, now aborts,
672
- requiring a new --allow-nested-tag option, even though an
673
- invocation with $obj that is a blob or a tree is silently allowed,
674
- which does not make much sense.
675
-
676
- Will discard.
677
-
678
-
679
-* dl/rebase-i-keep-base (2019-04-03) 4 commits
936
+* dl/rebase-i-keep-base (2019-04-08) 5 commits
937
- rebase: teach rebase --keep-base
938
- rebase: fast-forward --onto in more cases
939
- t3432: test rebase fast-forward behavior
940
- t3431: add rebase --fork-point tests
941
+ - tests (rebase): spell out the `--keep-empty` option
942
+ (this branch is tangled with js/spell-out-options-in-tests.)
943
944
"git rebase --keep-base <upstream>" tries to find the original base
945
of the topic being rebased and rebase on top of that same base, which
@@ -703,15 +962,16 @@ of the repositories listed at
962
963
964
* jh/midx-verify-too-many-packs (2019-03-22) 4 commits
706
- - midx: during verify group objects by packfile to speed verification
707
- - midx: add progress indicators in multi-pack-index verify
708
- - trace2:data: add trace2 data to midx
709
- - progress: add sparse mode to force 100% complete message
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
714
- Will merge to 'next'.
974
+ Will merge to 'master'.
975
976
977
* jh/trace2-sid-fix (2019-04-01) 7 commits
@@ -732,23 +992,25 @@ of the repositories listed at
992
993
994
* jk/http-walker-status-fix (2019-03-24) 3 commits
735
- - http: use normalize_curl_result() instead of manual conversion
736
- - http: normalize curl results for dumb loose and alternates fetches
737
- - http: factor out curl result code normalization
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
742
- Will merge to 'next'.
1003
+ Will merge to 'master'.
1004
1005
1006
* jk/refs-double-abort (2019-03-22) 2 commits
746
- - refs/files-backend: don't look at an aborted transaction
747
- - refs/files-backend: handle packed transaction prepare failure
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
751
- Will merge to 'next'.
1013
+ Will merge to 'master'.
1014
1015
1016
* js/spell-out-options-in-tests (2019-04-02) 8 commits
@@ -760,6 +1022,7 @@ of the repositories listed at
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
1025
+ (this branch is tangled with dl/rebase-i-keep-base.)
1026
1027
The tests have been updated not to rely on the abbreviated option
1028
names the parse-options API offers, to protect us from an
@@ -776,10 +1039,11 @@ of the repositories listed at
1039
The trace2 tracing facility learned to auto-generate a filename
1040
when told to log to a directory.
1041
779
- Will merge to 'next'.
1042
+ Ready for 'next'; giving the last chance to be intercepted.
1043
+ cf. <20190408211850.GJ60888@google.com>
1044
1045
782
-* jt/batch-fetch-blobs-in-diff (2019-04-01) 2 commits
1046
+* jt/batch-fetch-blobs-in-diff (2019-04-08) 2 commits
1047
- diff: batch fetching of missing blobs
1048
- sha1-file: support OBJECT_INFO_FOR_PREFETCH
1049
@@ -811,12 +1075,12 @@ of the repositories listed at
1075
1076
1077
* jt/t5551-protocol-v2-does-not-have-half-auth (2019-03-24) 1 commit
814
- - t5551: mark half-auth no-op fetch test as v0-only
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
818
- Will merge to 'next'.
819
-
1083
+ Will merge to 'master'.
1084
1085
1086
* km/empty-repo-is-still-a-repo (2019-04-03) 4 commits
@@ -833,7 +1097,7 @@ of the repositories listed at
1097
repository, which is not what the user wants. These problems are
1098
being addressed.
1099
836
- Getting there.
1100
+ Expecting a reroll.
1101
cf. <87bm1mbua4.fsf@kyleam.com>
1102
1103
@@ -853,11 +1117,12 @@ of the repositories listed at
1117
1118
1119
* nd/checkout-m-doc-update (2019-03-21) 1 commit
856
- - checkout.txt: note about losing staged changes with --merge
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
860
- Will merge to 'next'.
1125
+ Will merge to 'master'.
1126
1127
1128
* nd/commit-a-with-paths-msg-update (2019-03-22) 1 commit
@@ -870,32 +1135,33 @@ of the repositories listed at
1135
1136
1137
* nd/diff-parseopt-4 (2019-03-24) 20 commits
873
- - am: avoid diff_opt_parse()
874
- - diff --no-index: use parse_options() instead of diff_opt_parse()
875
- - range-diff: use parse_options() instead of diff_opt_parse()
876
- - diff.c: allow --no-color-moved-ws
877
- - diff-parseopt: convert --color-moved-ws
878
- - diff-parseopt: convert --[no-]color-moved
879
- - diff-parseopt: convert --inter-hunk-context
880
- - diff-parseopt: convert --no-prefix
881
- - diff-parseopt: convert --line-prefix
882
- - diff-parseopt: convert --[src|dst]-prefix
883
- - diff-parseopt: convert --[no-]abbrev
884
- - diff-parseopt: convert --diff-filter
885
- - diff-parseopt: convert --find-object
886
- - diff-parseopt: convert -O
887
- - diff-parseopt: convert --pickaxe-all|--pickaxe-regex
888
- - diff-parseopt: convert -S|-G
889
- - diff-parseopt: convert -l
890
- - diff-parseopt: convert -z
891
- - diff-parseopt: convert --ita-[in]visible-in-index
892
- - diff-parseopt: convert --ws-error-highlight
1138
+ (merged to 'next' on 2019-04-10 at 893b135f10)
1139
+ + am: avoid diff_opt_parse()
1140
+ + diff --no-index: use parse_options() instead of diff_opt_parse()
1141
+ + range-diff: use parse_options() instead of diff_opt_parse()
1142
+ + diff.c: allow --no-color-moved-ws
1143
+ + diff-parseopt: convert --color-moved-ws
1144
+ + diff-parseopt: convert --[no-]color-moved
1145
+ + diff-parseopt: convert --inter-hunk-context
1146
+ + diff-parseopt: convert --no-prefix
1147
+ + diff-parseopt: convert --line-prefix
1148
+ + diff-parseopt: convert --[src|dst]-prefix
1149
+ + diff-parseopt: convert --[no-]abbrev
1150
+ + diff-parseopt: convert --diff-filter
1151
+ + diff-parseopt: convert --find-object
1152
+ + diff-parseopt: convert -O
1153
+ + diff-parseopt: convert --pickaxe-all|--pickaxe-regex
1154
+ + diff-parseopt: convert -S|-G
1155
+ + diff-parseopt: convert -l
1156
+ + diff-parseopt: convert -z
1157
+ + diff-parseopt: convert --ita-[in]visible-in-index
1158
+ + diff-parseopt: convert --ws-error-highlight
1159
(this branch uses nd/diff-parseopt-3.)
1160
1161
Fourth batch to teach the diff machinery to use the parse-options
1162
API.
1163
898
- Will merge to 'next'.
1164
+ Will merge to 'master'.
1165
1166
1167
* nd/include-if-wildmatch (2019-04-01) 1 commit
@@ -914,12 +1180,12 @@ of the repositories listed at
1180
Will merge to 'next'.
1181
1182
917
-
918
-* nd/precious (2019-04-01) 1 commit
1183
+* nd/precious (2019-04-09) 1 commit
1184
- Introduce "precious" file concept
1185
1186
"git clean" learned to pay attention to the 'precious' attributes
922
- and keep untracked paths with the attribute instead of removing.
1187
+ and keep untracked paths with the attribute instead of removing
1188
+ when the "--keep-precious" is given.
1189
1190
Will merge to 'next'.
1191
@@ -932,7 +1198,7 @@ of the repositories listed at
1198
Will merge to 'next'.
1199
1200
935
-* nd/sha1-name-c-wo-the-repository (2019-04-02) 31 commits
1201
+* nd/sha1-name-c-wo-the-repository (2019-04-08) 33 commits
1202
- sha1-name.c: remove the_repo from get_oid_mb()
1203
- sha1-name.c: remove the_repo from other get_oid_*
1204
- sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name
@@ -964,6 +1230,14 @@ of the repositories listed at
1230
- refs.c: add refs_shorten_unambiguous_ref()
1231
- refs.c: add refs_ref_exists()
1232
- packfile.c: add repo_approximate_object_count()
1233
+ - builtin rebase: use oideq()
1234
+ - builtin rebase: use FREE_AND_NULL
1235
+
1236
+ Further code clean-up to allow the lowest level of name-to-object
1237
+ mapping layer to work with a passed-in repository other than the
1238
+ default one.
1239
+
1240
+ Will merge to 'next'.
1241
1242
1243
* pw/rebase-i-internal-rfc (2019-03-21) 12 commits
@@ -984,8 +1258,10 @@ of the repositories listed at
1258
The internal implementation of "git rebase -i" has been updated to
1259
avoid forking a separate "rebase--interactive" process.
1260
1261
+ Comments? Is this ready?
1262
988
-* sg/asciidoctor-in-ci (2019-04-01) 6 commits
1263
+
1264
+* 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'
@@ -1002,10 +1278,13 @@ of the repositories listed at
1278
* sg/index-pack-progress (2019-04-01) 1 commit
1279
- index-pack: show progress while checking objects
1280
1005
- size_t???
1281
+ A progress indicator has been added to the "index-pack" step, which
1282
+ often makes users wait for completion during "git clone".
1283
+
1284
+ Will merge to 'next'.
1285
1286
1008
-* sg/overlong-progress-fix (2019-04-02) 4 commits
1287
+* sg/overlong-progress-fix (2019-04-05) 4 commits
1288
- progress: break too long progress bar lines
1289
- progress: clear previous progress update dynamically
1290
- progress: assemble percentage and counters in a strbuf before printing
@@ -1018,11 +1297,12 @@ of the repositories listed at
1297
1298
1299
* sg/t5318-cleanup (2019-03-24) 1 commit
1021
- - t5318-commit-graph: remove unused variable
1300
+ (merged to 'next' on 2019-04-10 at 787b1b5073)
1301
+ + t5318-commit-graph: remove unused variable
1302
1303
Code cleanup.
1304
1025
- Will merge to 'next'.
1305
+ Will merge to 'master'.
1306
1307
1308
* tz/asciidoctor-fixes (2019-04-01) 2 commits
@@ -1033,139 +1313,16 @@ of the repositories listed at
1313
1314
Will merge to 'next'.
1315
1036
---------------------------------------------------
1037
-[Stalled]
1038
-
1039
-* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
1040
- - add -p: coalesce hunks before testing applicability
1041
-
1042
- Applicability check after a patch is edited in a "git add -i/p"
1043
- session has been improved.
1044
-
1045
- Will hold.
1046
- cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
1047
-
1048
-
1049
-* ds/midx-expire-repack (2019-01-27) 10 commits
1050
- - midx: add test that 'expire' respects .keep files
1051
- - multi-pack-index: test expire while adding packs
1052
- - midx: implement midx_repack()
1053
- - multi-pack-index: prepare 'repack' subcommand
1054
- - multi-pack-index: implement 'expire' subcommand
1055
- - midx: refactor permutation logic and pack sorting
1056
- - midx: simplify computation of pack name lengths
1057
- - multi-pack-index: prepare for 'expire' subcommand
1058
- - Docs: rearrange subcommands for multi-pack-index
1059
- - repack: refactor pack deletion for future use
1060
-
1061
- "git multi-pack-index expire/repack" are new subcommands that
1062
- consult midx file and are used to drop unused pack files and
1063
- coalesce small pack files that are still in use.
1064
-
1065
- Comments?
1066
-
1067
-
1068
-* js/protocol-advertise-multi (2018-12-28) 1 commit
1069
- - protocol: advertise multiple supported versions
1070
-
1071
- The transport layer has been updated so that the protocol version
1072
- used can be negotiated between the parties, by the initiator
1073
- listing the protocol versions it is willing to talk, and the other
1074
- side choosing from one of them.
1075
-
1076
- Expecting a reroll.
1077
- cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
1078
-
1079
-
1080
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
1081
- - zlib.c: use size_t for size
1082
-
1083
- The wrapper to call into zlib followed our long tradition to use
1084
- "unsigned long" for sizes of regions in memory, which have been
1085
- updated to use "size_t".
1086
-
1087
-
1088
-* dl/remote-save-to-push (2018-12-11) 1 commit
1089
- - remote: add --save-to-push option to git remote set-url
1090
-
1091
- "git remote set-url" learned a new option that moves existing value
1092
- of the URL field to pushURL field of the remote before replacing
1093
- the URL field with a new value.
1094
-
1095
- Anybody who wants to champion this topic?
1096
- I am personally not yet quite convinced if this is worth pursuing.
1097
-
1098
---------------------------------------------------
1099
-[Cooking]
1100
-
1101
-* nb/branch-show-other-worktrees-head (2019-03-18) 3 commits
1102
- - branch: add worktree info on verbose output
1103
- - branch: update output to include worktree info
1104
- - ref-filter: add worktreepath atom
1105
-
1106
- "git branch --list" learned to show branches that are checked out
1107
- in other worktrees connected to the same repository prefixed with
1108
- '+', similar to the way the currently checked out branch is shown
1109
- with '*' in front.
1110
-
1111
- Getting there...
1112
- cf. <20190316013807.38756-1-nbelakovski@gmail.com> (v9)
1113
- cf. <20190318121054.GC24175@szeder.dev>
1114
-
1115
-
1116
-* dl/ignore-docs (2019-03-08) 2 commits
1117
- (merged to 'next' on 2019-03-20 at f1f50c07ef)
1118
- + docs: move core.excludesFile from git-add to gitignore
1119
- + git-clean.txt: clarify ignore pattern files
1120
-
1121
- Doc update.
1122
-
1123
- Will merge to 'master'.
1124
-
1125
-
1126
-* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit
1127
- (merged to 'next' on 2019-03-20 at 92a24b29ed)
1128
- + convert: avoid malloc of original file size
1129
-
1130
- When the "clean" filter can reduce the size of a huge file in the
1131
- working tree down to a small "token" (a la Git LFS), there is no
1132
- point in allocating a huge scratch area upfront, but the buffer is
1133
- sized based on the original file size. The convert mechanism now
1134
- allocates very minimum and reallocates as it receives the output
1135
- from the clean filter process.
1136
-
1137
- Will merge to 'master'.
1138
-
1139
-
1140
-* jk/line-log-with-patch (2019-03-11) 2 commits
1141
- (merged to 'next' on 2019-03-20 at 21afea908c)
1142
- + line-log: detect unsupported formats
1143
- + line-log: suppress diff output with "-s"
1144
-
1145
- "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
1146
- output as it should. This has been corrected.
1147
-
1148
- Will merge to 'master'.
1149
-
1150
-
1151
-* js/rebase-deprecate-preserve-merges (2019-03-12) 1 commit
1152
- (merged to 'next' on 2019-03-20 at 32baac3acd)
1153
- + rebase: deprecate --preserve-merges
1154
-
1155
- "git rebase --rebase-merges" replaces its old "--preserve-merges"
1156
- option; the latter is now marked as deprecated.
1157
-
1158
- Will merge to 'master'.
1159
-
1316
1317
* js/init-db-update-for-mingw (2019-03-12) 1 commit
1162
- - mingw: respect core.hidedotfiles = false in git-init again
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
1168
- Will merge to 'next'.
1325
+ Will merge to 'master'.
1326
1327
1328
* js/stash-in-c-pathspec-fix (2019-03-12) 3 commits
@@ -1180,39 +1337,28 @@ of the repositories listed at
1337
Will cook in 'next'.
1338
1339
1183
-* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits
1184
- (merged to 'next' on 2019-03-20 at 5369a2e1f6)
1185
- + Make sure refs/rewritten/ is per-worktree
1186
- + files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
1187
- + files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
1188
-
1189
- "git rebase" uses the refs/rewritten/ hierarchy to store its
1190
- intermediate states, which inherently makes the hierarchy per
1191
- worktree, but it didn't quite work well.
1192
-
1193
- Will merge to 'master'.
1194
-
1195
-
1340
* js/remote-curl-i18n (2019-03-06) 1 commit
1197
- - remote-curl: mark all error messages for translation
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
1203
- Will merge to 'next'.
1348
+ Will merge to 'master'.
1349
1350
1351
* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
1207
- - Documentation: turn middle-of-line tabs into spaces
1208
- - git-svn.txt: drop escaping '\' that ends up being rendered
1209
- - git.txt: remove empty line before list continuation
1210
- - config/fsck.txt: avoid starting line with dash
1211
- - config/diff.txt: drop spurious backtick
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
1215
- Will merge to 'next'.
1361
+ Will merge to 'master'.
1362
1363
1364
* nd/diff-parseopt-3 (2019-03-07) 20 commits
@@ -1266,23 +1412,25 @@ of the repositories listed at
1412
1413
1414
* js/anonymize-remote-curl-diag (2019-03-05) 1 commit
1269
- - curl: anonymize URLs in error messages and warnings
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
1275
- Will merge to 'next'.
1422
+ Will merge to 'master'.
1423
1424
1425
* ma/asciidoctor-fixes (2019-03-11) 3 commits
1279
- - asciidoctor-extensions: fix spurious space after linkgit
1280
- - Documentation/Makefile: add missing dependency on asciidoctor-extensions
1281
- - Documentation/Makefile: add missing xsl dependencies for manpages
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
1285
- Will merge to 'next'.
1433
+ Will merge to 'master'.
1434
1435
1436
* nd/worktree-name-sanitization (2019-03-20) 2 commits
@@ -1295,36 +1443,6 @@ of the repositories listed at
1443
given to worktrees, to make sure these refs are well-formed.
1444
1445
1298
-* ra/t3600-test-path-funcs (2019-03-08) 3 commits
1299
- (merged to 'next' on 2019-03-20 at 404110d291)
1300
- + t3600: use helpers to replace test -d/f/e/s <path>
1301
- + t3600: modernize style
1302
- + test functions: add function `test_file_not_empty`
1303
-
1304
- A GSoC micro.
1305
-
1306
- Will merge to 'master'.
1307
- cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)
1308
-
1309
-
1310
-* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
1311
- (merged to 'next' on 2019-03-20 at 984b4586c7)
1312
- + git-reset.txt: clarify documentation
1313
-
1314
- Doc update.
1315
-
1316
- Will merge to 'master'.
1317
-
1318
-
1319
-* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
1320
- (merged to 'next' on 2019-03-20 at f3238df381)
1321
- + Doc: fix misleading asciidoc formating
1322
-
1323
- Doc update.
1324
-
1325
- Will merge to 'master'.
1326
-
1327
-
1446
* bp/post-index-change-hook (2019-02-15) 1 commit
1447
(merged to 'next' on 2019-03-11 at cb96d1d7c4)
1448
+ read-cache: add post-index-change hook
@@ -1339,29 +1457,15 @@ of the repositories listed at
1457
1458
1459
* jc/format-patch-error-check (2019-02-22) 2 commits
1342
- - format-patch: notice failure to open cover letter for writing
1343
- - builtin/log: downcase the beginning of error messages
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
1349
- Will merge to 'next'.
1350
-
1351
-
1352
-* jt/fetch-cdn-offload (2019-03-12) 9 commits
1353
- - SQUASH???
1354
- - upload-pack: send part of packfile response as uri
1355
- - fetch-pack: support more than one pack lockfile
1356
- - upload-pack: refactor reading of pack-objects out
1357
- - Documentation: add Packfile URIs design doc
1358
- - Documentation: order protocol v2 sections
1359
- - http-fetch: support fetching packfiles by URL
1360
- - http: improve documentation of http_pack_request
1361
- - http: use --stdin when getting dumb HTTP pack
1362
-
1363
- WIP for allowing a response to "git fetch" to instruct the bulk of
1364
- the pack contents to be instead taken from elsewhere (aka CDN).
1468
+ Will merge to 'master'.
1469
1470
1471
* dl/submodule-set-branch (2019-02-08) 3 commits
@@ -1401,18 +1505,20 @@ of the repositories listed at
1505
Needs update before merging to 'next'.
1506
1507
1404
-* br/blame-ignore (2019-02-13) 6 commits
1405
- - SQUASH???
1406
- - blame: add tests for ignoring revisions
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
1511
- blame: add the ability to ignore commits and their changes
1512
+ - blame: optionally track the line starts during fill_blame_origin()
1513
- blame: use a helper function in blame_chunk()
1514
- Move init_skiplist() outside of fsck
1515
1516
"git blame" learned to "ignore" commits in the history, whose
1517
effects (as well as their presence) get ignored.
1518
1415
- Needs update before merging to 'next'.
1519
+ Expecting a reroll.
1520
+ cf. <8736mtqy9n.fsf@fencepost.gnu.org>
1521
+ cf. <6752a735-2e7b-7d13-799f-a42e6995498c@google.com>
1522
1523
1524
* nd/config-move-to (2019-01-14) 7 commits
@@ -1461,24 +1567,25 @@ of the repositories listed at
1567
1568
1569
* ag/sequencer-reduce-rewriting-todo (2019-03-07) 18 commits
1464
- - rebase--interactive: move transform_todo_file()
1465
- - sequencer: use edit_todo_list() in complete_action()
1466
- - rebase-interactive: rewrite edit_todo_list() to handle the initial edit
1467
- - rebase-interactive: append_todo_help() changes
1468
- - rebase-interactive: use todo_list_write_to_file() in edit_todo_list()
1469
- - sequencer: refactor skip_unnecessary_picks() to work on a todo_list
1470
- - rebase--interactive: move rearrange_squash_in_todo_file()
1471
- - rebase--interactive: move sequencer_add_exec_commands()
1472
- - sequencer: change complete_action() to use the refactored functions
1473
- - sequencer: make sequencer_make_script() write its script to a strbuf
1474
- - sequencer: refactor rearrange_squash() to work on a todo_list
1475
- - sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
1476
- - sequencer: refactor check_todo_list() to work on a todo_list
1477
- - sequencer: introduce todo_list_write_to_file()
1478
- - sequencer: refactor transform_todos() to work on a todo_list
1479
- - sequencer: remove the 'arg' field from todo_item
1480
- - sequencer: make the todo_list structure public
1481
- - sequencer: changes in parse_insn_buffer()
1570
+ (merged to 'next' on 2019-04-10 at 7eab7c7800)
1571
+ + rebase--interactive: move transform_todo_file()
1572
+ + sequencer: use edit_todo_list() in complete_action()
1573
+ + rebase-interactive: rewrite edit_todo_list() to handle the initial edit
1574
+ + rebase-interactive: append_todo_help() changes
1575
+ + rebase-interactive: use todo_list_write_to_file() in edit_todo_list()
1576
+ + sequencer: refactor skip_unnecessary_picks() to work on a todo_list
1577
+ + rebase--interactive: move rearrange_squash_in_todo_file()
1578
+ + rebase--interactive: move sequencer_add_exec_commands()
1579
+ + sequencer: change complete_action() to use the refactored functions
1580
+ + sequencer: make sequencer_make_script() write its script to a strbuf
1581
+ + sequencer: refactor rearrange_squash() to work on a todo_list
1582
+ + sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
1583
+ + sequencer: refactor check_todo_list() to work on a todo_list
1584
+ + sequencer: introduce todo_list_write_to_file()
1585
+ + sequencer: refactor transform_todos() to work on a todo_list
1586
+ + sequencer: remove the 'arg' field from todo_item
1587
+ + sequencer: make the todo_list structure public
1588
+ + sequencer: changes in parse_insn_buffer()
1589
(this branch is used by pw/rebase-i-internal-rfc.)
1590
1591
The scripted version of "git rebase -i" wrote and rewrote the todo
@@ -1488,7 +1595,7 @@ of the repositories listed at
1595
around in-core to avoid rewriting the same file over and over
1596
unnecessarily.
1597
1491
- Will merge to 'next'.
1598
+ Will merge to 'master'.
1599
cf. <20190305191805.13561-1-alban.gruin@gmail.com> (v8)
1600
1601