What's cooking (2019/01 #05)
Junio C Hamano committed
Jan 29, 2019 at 14:00 UTC
6312e4baf72f0707cfd5f0cd8d9f7f9cf5246827
1 file changed
+429
-409
whats-cooking.txt
+429
-409
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2019, #04; Mon, 28)
4
-X-master-at: 16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef
5
-X-next-at: aa96b0ce6b0fa4fa4cc6870f1a3aff3878967bfa
3
+Subject: What's cooking in git.git (Jan 2019, #05; Tue, 29)
4
+X-master-at: b5101f929789889c2e536d915698f58d5c5c6b7a
5
+X-next-at: fbb209baf1b5c34e4ec52fb4a5a73b00cfbecec1
6
7
-What's cooking in git.git (Jan 2019, #04; Mon, 28)
7
+What's cooking in git.git (Jan 2019, #05; Tue, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,6 +20,290 @@ of the repositories listed at
20
--------------------------------------------------
21
[New Topics]
22
23
+* ds/commit-graph-format-v2 (2019-01-29) 8 commits
24
+ - SQUASH : misnamed variables and style fix
25
+ - commit-graph: test verifying a corrupt v2 header
26
+ - commit-graph: implement file format version 2
27
+ - commit-graph: add --version=<n> option
28
+ - commit-graph: create new version flags
29
+ - commit-graph: collapse parameters into flags
30
+ - commit-graph: return with errors during write
31
+ - Merge branch 'bc/sha-256' into ds/commit-graph-format-v2
32
+ (this branch uses ab/commit-graph-write-optim and ab/commit-graph-write-progress.)
33
+
34
+ Introduce version 2 of the commit-graph format to correct
35
+ deficiency in the initial version.
36
+
37
+
38
+* ds/coverage-prove (2019-01-29) 1 commit
39
+ - Makefile: add coverage-prove target
40
+
41
+ A new target "coverage-prove" to run the coverage test under
42
+ "prove" has been added.
43
+
44
+ Will merge to 'next'.
45
+
46
+--------------------------------------------------
47
+[Graduated to "master"]
48
+
49
+* md/list-objects-filter-by-depth (2019-01-15) 4 commits
50
+ + tree:<depth>: skip some trees even when collecting omits
51
+ + list-objects-filter: teach tree:# how to handle >0
52
+ + Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
53
+ + Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth
54
+ (this branch is used by js/filter-options-should-use-plain-int; uses sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.)
55
+
56
+ The objects-filter machinery learned "tree:<depth>" to filter
57
+ objects up to a given depth; earlier it only supported depth=0,
58
+ i.e. usable to create a commit-only lazy clone.
59
+
60
+ Will merge to 'next'.
61
+
62
+
63
+* bc/sha-256 (2018-11-14) 12 commits
64
+ (merged to 'next' on 2019-01-18 at 3f161d31bb)
65
+ + hash: add an SHA-256 implementation using OpenSSL
66
+ + sha256: add an SHA-256 implementation using libgcrypt
67
+ + Add a base implementation of SHA-256 support
68
+ + commit-graph: convert to using the_hash_algo
69
+ + t/helper: add a test helper to compute hash speed
70
+ + sha1-file: add a constant for hash block size
71
+ + t: make the sha1 test-tool helper generic
72
+ + t: add basic tests for our SHA-1 implementation
73
+ + cache: make hashcmp and hasheq work with larger hashes
74
+ + hex: introduce functions to print arbitrary hashes
75
+ + sha1-file: provide functions to look up hash algorithms
76
+ + sha1-file: rename algorithm to "sha1"
77
+ (this branch is used by ds/commit-graph-format-v2.)
78
+
79
+ Add sha-256 hash and plug it through the code to allow building Git
80
+ with the "NewHash".
81
+
82
+
83
+* bc/tree-walk-oid (2019-01-15) 5 commits
84
+ (merged to 'next' on 2019-01-18 at 60c38b9e4a)
85
+ + cache: make oidcpy always copy GIT_MAX_RAWSZ bytes
86
+ + tree-walk: store object_id in a separate member
87
+ + match-trees: use hashcpy to splice trees
88
+ + match-trees: compute buffer offset correctly when splicing
89
+ + tree-walk: copy object ID before use
90
+
91
+ The code to walk tree objects has been taught that we may be
92
+ working with object names that are not computed with SHA-1.
93
+
94
+
95
+* cc/fetch-error-message-fix (2019-01-14) 1 commit
96
+ (merged to 'next' on 2019-01-14 at 81078f86c0)
97
+ + fetch: fix extensions.partialclone name in error message
98
+
99
+ Error message fix.
100
+
101
+
102
+* cc/partial-clone-doc-typofix (2019-01-14) 1 commit
103
+ (merged to 'next' on 2019-01-14 at 0395de767e)
104
+ + partial-clone: add missing 'is' in doc
105
+
106
+ Doc fix.
107
+
108
+
109
+* it/log-format-source (2019-01-11) 1 commit
110
+ (merged to 'next' on 2019-01-18 at d660044e93)
111
+ + log: add %S option (like --source) to log --format
112
+
113
+ Custom userformat "log --format" learned %S atom that stands for
114
+ the tip the traversal reached the commit from, i.e. --source.
115
+
116
+
117
+* ja/doc-build-l10n (2019-01-07) 1 commit
118
+ (merged to 'next' on 2019-01-18 at 5dbe5ad3d7)
119
+ + Documentation/Makefile add optional targets for l10n
120
+
121
+ Prepare Documentation/Makefile so that manpage localization can
122
+ reuse it by overriding and tweaking the list of build products.
123
+
124
+
125
+* jk/proto-v2-hidden-refs-fix (2019-01-10) 1 commit
126
+ (merged to 'next' on 2019-01-18 at 875dbbc71f)
127
+ + upload-pack: support hidden refs with protocol v2
128
+
129
+ The v2 upload-pack protocol implementation failed to honor
130
+ hidden-ref configuration, which has been corrected.
131
+ An earlier attempt reverted out of 'next'.
132
+
133
+
134
+* jk/remote-insteadof-cleanup (2019-01-11) 1 commit
135
+ (merged to 'next' on 2019-01-18 at 112c93eef3)
136
+ + remote: check config validity before creating rewrite struct
137
+
138
+ Code clean-up.
139
+
140
+
141
+* jk/save-getenv-result (2019-01-11) 6 commits
142
+ (merged to 'next' on 2019-01-18 at 429c77402a)
143
+ + builtin_diff(): read $GIT_DIFF_OPTS closer to use
144
+ + merge-recursive: copy $GITHEAD strings
145
+ + init: make a copy of $GIT_DIR string
146
+ + config: make a copy of $GIT_CONFIG string
147
+ + commit: copy saved getenv() result
148
+ + get_super_prefix(): copy getenv() result
149
+
150
+ There were many places the code relied on the string returned from
151
+ getenv() to be non-volatile, which is not true, that have been
152
+ corrected.
153
+
154
+
155
+* js/add-e-clear-patch-before-stating (2019-01-15) 1 commit
156
+ (merged to 'next' on 2019-01-18 at 9ea7fc4b49)
157
+ + add --edit: truncate the patch file
158
+
159
+ "git add -e" got confused when the change it wants to let the user
160
+ edit is smaller than the previous change that was left over in a
161
+ temporary file.
162
+
163
+
164
+* js/rebase-i-redo-exec (2018-12-11) 3 commits
165
+ (merged to 'next' on 2019-01-18 at 71be3fedb7)
166
+ + rebase: introduce a shortcut for --reschedule-failed-exec
167
+ + rebase: add a config option to default to --reschedule-failed-exec
168
+ + rebase: introduce --reschedule-failed-exec
169
+
170
+ "git rebase -i" learned to re-execute a command given with 'exec'
171
+ to run after it failed the last time.
172
+
173
+
174
+* jt/fetch-pack-v2 (2019-01-10) 1 commit
175
+ (merged to 'next' on 2019-01-18 at 75ceb55ff8)
176
+ + fetch-pack: support protocol version 2
177
+
178
+ "git fetch-pack" now can talk the version 2 protocol.
179
+
180
+
181
+* jt/upload-pack-deepen-relative-proto-v2 (2019-01-10) 2 commits
182
+ (merged to 'next' on 2019-01-18 at 1483ad21db)
183
+ + upload-pack: teach deepen-relative in protocol v2
184
+ + fetch-pack: do not take shallow lock unnecessarily
185
+
186
+ "git fetch --deepen=<more>" has been corrected to work over v2
187
+ protocol.
188
+
189
+
190
+* kg/external-diff-save-env (2019-01-11) 1 commit
191
+ (merged to 'next' on 2019-01-14 at 8281bbd48b)
192
+ + diff: ensure correct lifetime of external_diff_cmd
193
+
194
+ The code to drive GIT_EXTERNAL_DIFF command relied on the string
195
+ returned from getenv() to be non-volatile, which is not true, that
196
+ has been corrected.
197
+
198
+
199
+* ms/http-no-more-failonerror (2019-01-10) 5 commits
200
+ (merged to 'next' on 2019-01-18 at 8938d70b6d)
201
+ + test: test GIT_CURL_VERBOSE=1 shows an error
202
+ + remote-curl: unset CURLOPT_FAILONERROR
203
+ + remote-curl: define struct for CURLOPT_WRITEFUNCTION
204
+ + http: enable keep_error for HTTP requests
205
+ + http: support file handles for HTTP_KEEP_ERROR
206
+
207
+ Debugging help for http transport.
208
+
209
+
210
+* os/rebase-runs-post-checkout-hook (2019-01-02) 2 commits
211
+ (merged to 'next' on 2019-01-18 at a03d536318)
212
+ + rebase: run post-checkout hook on checkout
213
+ + t5403: simplify by using a single repository
214
+
215
+ "git rebase" internally runs "checkout" to switch between branches,
216
+ and the command used to call the post-checkout hook, but the
217
+ reimplementation stopped doing so, which is getting fixed.
218
+
219
+
220
+* pw/diff-color-moved-ws-fix (2019-01-10) 9 commits
221
+ (merged to 'next' on 2019-01-18 at e19713c82f)
222
+ + diff --color-moved-ws: handle blank lines
223
+ + diff --color-moved-ws: modify allow-indentation-change
224
+ + diff --color-moved-ws: optimize allow-indentation-change
225
+ + diff --color-moved=zebra: be stricter with color alternation
226
+ + diff --color-moved-ws: fix false positives
227
+ + diff --color-moved-ws: demonstrate false positives
228
+ + diff: allow --no-color-moved-ws
229
+ + Use "whitespace" consistently
230
+ + diff: document --no-color-moved
231
+
232
+ "git diff --color-moved-ws" updates.
233
+
234
+
235
+* sb/submodule-recursive-fetch-gets-the-tip (2018-12-09) 9 commits
236
+ (merged to 'next' on 2019-01-18 at 79a2809fbc)
237
+ + fetch: ensure submodule objects fetched
238
+ + submodule.c: fetch in submodules git directory instead of in worktree
239
+ + submodule: migrate get_next_submodule to use repository structs
240
+ + repository: repo_submodule_init to take a submodule struct
241
+ + submodule: store OIDs in changed_submodule_names
242
+ + submodule.c: tighten scope of changed_submodule_names struct
243
+ + submodule.c: sort changed_submodule_names before searching it
244
+ + submodule.c: fix indentation
245
+ + sha1-array: provide oid_array_filter
246
+
247
+ "git fetch --recurse-submodules" may not fetch the necessary commit
248
+ that is bound to the superproject, which is getting corrected.
249
+
250
+--------------------------------------------------
251
+[Cooking]
252
+
253
+* js/filter-options-should-use-plain-int (2019-01-15) 1 commit
254
+ (merged to 'next' on 2019-01-18 at 6714547e6d)
255
+ + filter-options: expand scaled numbers
256
+ (this branch uses md/list-objects-filter-by-depth and sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.)
257
+
258
+ Update the protocol message specification to allow only the limited
259
+ use of scaled quantities. This is ensure potential compatibility
260
+ issues will not go out of hand.
261
+
262
+ Will merge to 'master'.
263
+
264
+
265
+* jt/get-reference-with-commit-graph (2018-12-28) 1 commit
266
+ (merged to 'next' on 2019-01-18 at bfc4eb9411)
267
+ + revision: use commit graph in get_reference()
268
+ (this branch uses sb/more-repo-in-api; is tangled with js/filter-options-should-use-plain-int and md/list-objects-filter-by-depth.)
269
+
270
+ Micro-optimize the code that prepares commit objects to be walked
271
+ by "git rev-list" when the commit-graph is available.
272
+
273
+ Will merge to 'master'.
274
+
275
+
276
+* sb/more-repo-in-api (2018-12-28) 23 commits
277
+ + t/helper/test-repository: celebrate independence from the_repository
278
+ + path.h: make REPO_GIT_PATH_FUNC repository agnostic
279
+ + commit: prepare free_commit_buffer and release_commit_memory for any repo
280
+ + commit-graph: convert remaining functions to handle any repo
281
+ + submodule: don't add submodule as odb for push
282
+ + submodule: use submodule repos for object lookup
283
+ + pretty: prepare format_commit_message to handle arbitrary repositories
284
+ + commit: prepare logmsg_reencode to handle arbitrary repositories
285
+ + commit: prepare repo_unuse_commit_buffer to handle any repo
286
+ + commit: prepare get_commit_buffer to handle any repo
287
+ + commit-reach: prepare in_merge_bases[_many] to handle any repo
288
+ + commit-reach: prepare get_merge_bases to handle any repo
289
+ + commit-reach.c: allow get_merge_bases_many_0 to handle any repo
290
+ + commit-reach.c: allow remove_redundant to handle any repo
291
+ + commit-reach.c: allow merge_bases_many to handle any repo
292
+ + commit-reach.c: allow paint_down_to_common to handle any repo
293
+ + commit: allow parse_commit* to handle any repo
294
+ + object: parse_object to honor its repository argument
295
+ + object-store: prepare has_{sha1, object}_file to handle any repo
296
+ + object-store: prepare read_object_file to deal with any repo
297
+ + object-store: allow read_object_file_extended to read from any repo
298
+ + packfile: allow has_packed_and_bad to handle arbitrary repositories
299
+ + sha1_file: allow read_object to read objects in arbitrary repositories
300
+ (this branch is used by js/filter-options-should-use-plain-int, jt/get-reference-with-commit-graph and md/list-objects-filter-by-depth.)
301
+
302
+ The in-core repository instances are passed through more codepaths.
303
+
304
+ Will merge to 'master'.
305
+
306
+
307
* br/commit-tree-fully-spelled-gpg-sign-option (2019-01-22) 2 commits
308
- commit-tree: add missing --gpg-sign flag
309
- t7510: invoke git as part of &&-chain
@@ -40,31 +324,34 @@ of the repositories listed at
324
325
326
* jk/attr-macro-fix (2019-01-22) 1 commit
43
- - attr: do not mark queried macros as unset
327
+ (merged to 'next' on 2019-01-29 at 740df172e1)
328
+ + attr: do not mark queried macros as unset
329
330
Asking "git check-attr" about a macro (e.g. "binary") on a specific
331
path did not work correctly, even though "git check-attr -a" listed
332
such a macro correctly. This has been corrected.
333
49
- Will merge to 'next'.
334
+ Will merge to 'master'.
335
336
337
* js/test-git-installed (2019-01-22) 1 commit
53
- - tests: explicitly use `test-tool.exe` on Windows
338
+ (merged to 'next' on 2019-01-29 at bab6eabb20)
339
+ + tests: explicitly use `test-tool.exe` on Windows
340
341
Test fix for Windows.
342
57
- Will merge to 'next'.
343
+ Will merge to 'master'.
344
345
346
* ph/pack-objects-mutex-fix (2019-01-28) 2 commits
61
- - pack-objects: merge read_lock and lock in packing_data struct
62
- - pack-objects: move read mutex to packing_data struct
347
+ (merged to 'next' on 2019-01-29 at 7c886f6c33)
348
+ + pack-objects: merge read_lock and lock in packing_data struct
349
+ + pack-objects: move read mutex to packing_data struct
350
351
"git pack-objects" incorrectly used uninitialized mutex, which has
352
been corrected.
353
67
- Will merge to 'next'.
354
+ Will merge to 'master'.
355
356
357
* sb/submodule-abort-update-upon-config-failure (2019-01-18) 1 commit
@@ -91,28 +378,30 @@ of the repositories listed at
378
UTF-16 with BOM in little endian byte order, which cannot be directly
379
generated by using iconv.
380
94
- Will merge to 'next'.
381
+ Hold.
382
+ cf. <20190129072228.dcyyjpcgqk7c44j4@tb-raspi4>
383
384
385
* ja/doc-style-fix (2019-01-23) 1 commit
98
- - doc: tidy asciidoc style
386
+ (merged to 'next' on 2019-01-29 at 5b520a6fd3)
387
+ + doc: tidy asciidoc style
388
389
Doc typo/stylo fixes.
390
102
- Will merge to 'next'.
391
+ Will merge to 'master'.
392
393
394
* az/instaweb-py3-http-server (2019-01-28) 1 commit
106
- - git-instaweb: add Python builtin http.server support
395
+ (merged to 'next' on 2019-01-29 at 82f06b6774)
396
+ + git-instaweb: add Python builtin http.server support
397
398
"git instaweb" learned to drive http.server that comes with
399
"batteries included" Python installation (both Python2 & 3).
400
111
- Will merge to 'next'.
401
+ Will merge to 'master'.
402
403
114
-* jh/trace2 (2019-01-27) 15 commits
115
- - trace2: fix hdr-check warnings
404
+* jh/trace2 (2019-01-28) 14 commits
405
- trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
406
- trace2:data: add subverb for rebase
407
- trace2:data: add subverb to reset command
@@ -128,23 +417,25 @@ of the repositories listed at
417
- trace2: create new combined trace facility
418
- trace2: Documentation/technical/api-trace2.txt
419
131
- Expecting a reroll.
132
- cf. <e1bd52e3-1ac5-b08c-d1f6-a7fa63ebf0cf@jeffhostetler.com>
420
+ A more structured way to obtain execution trace has been added.
421
+
422
+ Ready?
423
424
425
* jk/diff-cc-stat-fixes (2019-01-24) 6 commits
136
- - combine-diff: treat --dirstat like --stat
137
- - combine-diff: treat --summary like --stat
138
- - combine-diff: treat --shortstat like --stat
139
- - combine-diff: factor out stat-format mask
140
- - diff: clear emitted_symbols flag after use
141
- - t4006: resurrect commented-out tests
426
+ (merged to 'next' on 2019-01-29 at 8bd04f1749)
427
+ + combine-diff: treat --dirstat like --stat
428
+ + combine-diff: treat --summary like --stat
429
+ + combine-diff: treat --shortstat like --stat
430
+ + combine-diff: factor out stat-format mask
431
+ + diff: clear emitted_symbols flag after use
432
+ + t4006: resurrect commented-out tests
433
434
"git diff --color-moved --cc --stat -p" did not work well due to
435
funny interaction between a bug in color-moved and the rest, which
436
has been fixed.
437
147
- Will merge to 'next'.
438
+ Will merge to 'master'.
439
440
441
* jk/unused-parameter-cleanup (2019-01-24) 8 commits
@@ -159,48 +450,53 @@ of the repositories listed at
450
451
Code cleanup.
452
453
+ Will merge to 'next'.
454
+
455
456
* nd/fetch-compact-update (2019-01-27) 1 commit
164
- - fetch: prefer suffix substitution in compact fetch.output
457
+ (merged to 'next' on 2019-01-29 at b78e8841b0)
458
+ + fetch: prefer suffix substitution in compact fetch.output
459
460
"git fetch" output cleanup.
461
168
- Will merge to 'next'.
462
+ Will merge to 'master'.
463
464
465
* sg/object-as-type-commit-graph-fix (2019-01-27) 1 commit
172
- - object_as_type: initialize commit-graph-related fields of 'struct commit'
466
+ (merged to 'next' on 2019-01-29 at cc714a044a)
467
+ + object_as_type: initialize commit-graph-related fields of 'struct commit'
468
469
The commit-graph facility did not work when in-core objects that
470
are promoted from unknown type to commit (e.g. a commit that is
471
accessed via a tag that refers to it) were involved, which has been
472
corrected.
473
179
- Will merge to 'next'.
474
+ Will merge to 'master'.
475
476
477
* sg/strbuf-addbuf-cocci (2019-01-27) 1 commit
183
- - strbuf.cocci: suggest strbuf_addbuf() to add one strbuf to an other
478
+ (merged to 'next' on 2019-01-29 at a9f7279d38)
479
+ + strbuf.cocci: suggest strbuf_addbuf() to add one strbuf to an other
480
481
Cocci rule update.
482
187
- Will merge to 'next'.
483
+ Will merge to 'master'.
484
485
486
* sx/evolve (2019-01-27) 8 commits
191
- - evolve: add the 'git change list' command
192
- - evolve: implement the 'git change' command
193
- - evolve: add support for writing metacommits
194
- - evolve: add the change-table structure
195
- - evolve: add support for parsing metacommits
196
- - ref-filter: add the metas namespace to ref-filter
197
- - sha1-array: implement oid_array_readonly_contains()
198
- - technical doc: add a design doc for the evolve command
487
+ . evolve: add the 'git change list' command
488
+ . evolve: implement the 'git change' command
489
+ . evolve: add support for writing metacommits
490
+ . evolve: add the change-table structure
491
+ . evolve: add support for parsing metacommits
492
+ . ref-filter: add the metas namespace to ref-filter
493
+ . sha1-array: implement oid_array_readonly_contains()
494
+ . technical doc: add a design doc for the evolve command
495
200
- The beginning of "hg evolve" mimickery.
496
+ The beginning of "hg evolve" mimicry.
497
498
203
-* jk/autocrlf-overrides-eol-doc (2019-01-28) 2 commits
499
+* jk/autocrlf-overrides-eol-doc (2019-01-29) 2 commits
500
- docs/config: clarify "text property" in core.eol
501
- doc/gitattributes: clarify "autocrlf overrides eol"
502
@@ -210,17 +506,18 @@ of the repositories listed at
506
507
508
* pw/no-editor-in-rebase-i-implicit (2019-01-28) 1 commit
213
- - implicit interactive rebase: don't run sequence editor
509
+ (merged to 'next' on 2019-01-29 at 9d06993725)
510
+ + implicit interactive rebase: don't run sequence editor
511
512
When GIT_SEQUENCE_EDITOR is set, the command was incorrectly
513
started when modes of "git rebase" that implicitly uses the
514
machinery for the interactive rebase are run, which has been
515
corrected.
516
220
- Will merge to 'next'.
517
+ Will merge to 'master'.
518
519
223
-* pw/rebase-x-sanity-check (2019-01-28) 1 commit
520
+* pw/rebase-x-sanity-check (2019-01-29) 1 commit
521
- rebase -x: sanity check command
522
523
"git rebase -x $cmd" did not reject multi-line command, even though
@@ -229,95 +526,101 @@ of the repositories listed at
526
527
Will merge to 'next'.
528
232
---------------------------------------------------
233
-[Cooking]
529
530
* ab/commit-graph-write-optim (2019-01-22) 1 commit
236
- - commit-graph write: use pack order when finding commits
531
+ (merged to 'next' on 2019-01-29 at 17c894dfec)
532
+ + commit-graph write: use pack order when finding commits
533
(this branch is used by ab/commit-graph-write-progress and ds/commit-graph-format-v2.)
534
535
The codepath to write out commit-graph has been optimized by
536
following the usual pattern of visiting objects in in-pack order.
537
242
- Will merge to 'next'.
538
+ Will merge to 'master'.
539
540
541
* ab/commit-graph-write-progress (2019-01-23) 9 commits
246
- - commit-graph write: emit a percentage for all progress
247
- - commit-graph write: add itermediate progress
248
- - commit-graph write: remove empty line for readability
249
- - commit-graph write: add more descriptive progress output
250
- - commit-graph write: show progress for object search
251
- - commit-graph write: more descriptive "writing out" output
252
- - commit-graph write: add "Writing out" progress output
253
- - commit-graph: don't call write_graph_chunk_extra_edges() unnecessarily
254
- - commit-graph: rename "large edges" to "extra edges"
542
+ (merged to 'next' on 2019-01-29 at e086b1cba6)
543
+ + commit-graph write: emit a percentage for all progress
544
+ + commit-graph write: add itermediate progress
545
+ + commit-graph write: remove empty line for readability
546
+ + commit-graph write: add more descriptive progress output
547
+ + commit-graph write: show progress for object search
548
+ + commit-graph write: more descriptive "writing out" output
549
+ + commit-graph write: add "Writing out" progress output
550
+ + commit-graph: don't call write_graph_chunk_extra_edges() unnecessarily
551
+ + commit-graph: rename "large edges" to "extra edges"
552
(this branch is used by ds/commit-graph-format-v2; uses ab/commit-graph-write-optim.)
553
554
The codepath to show progress meter while writing out commit-graph
555
file has been improved.
556
260
- Will merge to 'next'.
557
+ Will merge to 'master'.
558
559
560
* cc/test-ref-store-typofix (2019-01-17) 1 commit
264
- - helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo
561
+ (merged to 'next' on 2019-01-29 at 0cd264f864)
562
+ + helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo
563
266
- An obvious typo in an assersion error message has been fixed.
564
+ An obvious typo in an assertion error message has been fixed.
565
268
- Will merge to 'next'.
566
+ Will merge to 'master'.
567
568
569
* jk/add-ignore-errors-bit-assignment-fix (2019-01-17) 1 commit
272
- - add: use separate ADD_CACHE_RENORMALIZE flag
570
+ (merged to 'next' on 2019-01-29 at a4ac7ccd4f)
571
+ + add: use separate ADD_CACHE_RENORMALIZE flag
572
573
"git add --ignore-errors" did not work as advertised and instead
574
worked as an unintended synonym for "git add --renormalize", which
575
has been fixed.
576
278
- Will merge to 'next'.
577
+ Will merge to 'master'.
578
579
580
* js/mingw-unc-path-w-backslashes (2019-01-18) 2 commits
282
- - mingw: special-case arguments to `sh`
283
- - mingw (t5580): document bug when cloning from backslashed UNC paths
581
+ (merged to 'next' on 2019-01-29 at 3adc177c1e)
582
+ + mingw: special-case arguments to `sh`
583
+ + mingw (t5580): document bug when cloning from backslashed UNC paths
584
585
In Git for Windows, "git clone \\server\share\path" etc. that uses
586
UNC paths from command line had bad interaction with its shell
587
emulation.
588
289
- Will merge to 'next'.
589
+ Will merge to 'master'.
590
591
592
* js/t6042-timing-fix (2019-01-17) 1 commit
293
- - t6042: work around speed optimization on Windows
593
+ (merged to 'next' on 2019-01-29 at 9543c96249)
594
+ + t6042: work around speed optimization on Windows
595
596
Test update.
597
297
- Will merge to 'next'.
598
+ Will merge to 'master'.
599
600
601
* jt/namespaced-ls-refs-fix (2019-01-18) 1 commit
301
- - ls-refs: filter refs using namespace-stripped name
602
+ (merged to 'next' on 2019-01-29 at 049530f499)
603
+ + ls-refs: filter refs using namespace-stripped name
604
605
Fix namespace support in protocol v2.
606
305
- Will merge to 'next'.
607
+ Will merge to 'master'.
608
609
610
* bp/checkout-new-branch-optim (2019-01-23) 2 commits
309
- - checkout: fix regression in checkout -b on intitial checkout
310
- - checkout: add test demonstrating regression with checkout -b on initial commit
611
+ (merged to 'next' on 2019-01-29 at 89d690634d)
612
+ + checkout: fix regression in checkout -b on intitial checkout
613
+ + checkout: add test demonstrating regression with checkout -b on initial commit
614
615
"git checkout -b <new> [HEAD]" to create a new branch from the
616
current commit and check it out ought to be a no-op in the index
617
and the working tree in normal cases, but there are corner cases
315
- that does require updates to the index and the working tree.
316
- Running it immediately after "git clone --no-checkout" is one of
317
- these cases that an earlier optimization kicked in incorrectly,
318
- which has been fixed.
618
+ that do require updates to the index and the working tree. Running
619
+ it immediately after "git clone --no-checkout" is one of these
620
+ cases that an earlier optimization kicked in incorrectly, which has
621
+ been fixed.
622
320
- Will merge to 'next'.
623
+ Will merge to 'master'.
624
625
626
* br/blame-ignore (2019-01-18) 3 commits
@@ -328,15 +631,18 @@ of the repositories listed at
631
"git blame" learned to "ignore" commits in the history, whose
632
effects (as well as their presence) get ignored.
633
634
+ Is this ready for 'next'?
635
+
636
637
* js/abspath-part-inside-repo (2019-01-18) 1 commit
333
- - abspath_part_inside_repo: respect core.ignoreCase
638
+ (merged to 'next' on 2019-01-29 at ac642158ec)
639
+ + abspath_part_inside_repo: respect core.ignoreCase
640
335
- On a case-insensntive filesystem, we failed to compare the part of
641
+ On a case-insensitive filesystem, we failed to compare the part of
642
the path that is above the worktree directory in an absolute
643
pathname, which has been corrected.
644
339
- Will merge to 'next'.
645
+ Will merge to 'master'.
646
647
648
* nd/diff-parseopt (2019-01-27) 14 commits
@@ -360,6 +666,9 @@ of the repositories listed at
666
handcrafted option parser. This is being rewritten to use the
667
parse-options API.
668
669
+ Will merge to 'next'.
670
+ Looking good.
671
+
672
673
* sc/pack-redundant (2019-01-14) 5 commits
674
- pack-redundant: consistent sort method
@@ -369,59 +678,9 @@ of the repositories listed at
678
- t5323: test cases for git-pack-redundant
679
680
Update the implementation of pack-redundant for performance in a
372
- repository with many packfiles.
373
-
374
- Comments?
375
-
376
-
377
-* pw/diff-color-moved-ws-fix (2019-01-10) 9 commits
378
- (merged to 'next' on 2019-01-18 at e19713c82f)
379
- + diff --color-moved-ws: handle blank lines
380
- + diff --color-moved-ws: modify allow-indentation-change
381
- + diff --color-moved-ws: optimize allow-indentation-change
382
- + diff --color-moved=zebra: be stricter with color alternation
383
- + diff --color-moved-ws: fix false positives
384
- + diff --color-moved-ws: demonstrate false positives
385
- + diff: allow --no-color-moved-ws
386
- + Use "whitespace" consistently
387
- + diff: document --no-color-moved
388
-
389
- "git diff --color-moved-ws" updates.
390
-
391
- Will merge to 'master'.
392
-
393
-
394
-* it/log-format-source (2019-01-11) 1 commit
395
- (merged to 'next' on 2019-01-18 at d660044e93)
396
- + log: add %S option (like --source) to log --format
397
-
398
- Custom userformat "log --format" learned %S atom that stands for
399
- the tip the traversal reached the commit from, i.e. --source.
400
-
401
- Will merge to 'master'.
402
-
403
-
404
-* js/filter-options-should-use-plain-int (2019-01-15) 1 commit
405
- (merged to 'next' on 2019-01-18 at 6714547e6d)
406
- + filter-options: expand scaled numbers
407
- (this branch uses md/list-objects-filter-by-depth and sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.)
408
-
409
- Update the protocol message specification to allow only the limited
410
- use of scaled quantities. This is ensure potential compatibility
411
- issues will not go out of hand.
412
-
413
- Will merge to 'master'.
414
-
415
-
416
-* jt/upload-pack-deepen-relative-proto-v2 (2019-01-10) 2 commits
417
- (merged to 'next' on 2019-01-18 at 1483ad21db)
418
- + upload-pack: teach deepen-relative in protocol v2
419
- + fetch-pack: do not take shallow lock unnecessarily
420
-
421
- "git fetch --deepen=<more>" has been corrected to work over v2
422
- protocol.
681
+ repository with many packfiles.
682
424
- Will merge to 'master'.
683
+ Comments?
684
685
686
* nd/config-move-to (2019-01-14) 7 commits
@@ -449,90 +708,39 @@ of the repositories listed at
708
709
710
* sg/obstack-cast-function-type-fix (2019-01-17) 1 commit
452
- - compat/obstack: fix -Wcast-function-type warnings
711
+ (merged to 'next' on 2019-01-29 at 568cafa7f4)
712
+ + compat/obstack: fix -Wcast-function-type warnings
713
714
The compat/obstack code had casts that -Wcast-function-type
715
compilation option found questionable.
716
457
- Will merge to 'next'.
458
-
459
-
460
-* cc/fetch-error-message-fix (2019-01-14) 1 commit
461
- (merged to 'next' on 2019-01-14 at 81078f86c0)
462
- + fetch: fix extensions.partialclone name in error message
463
-
464
- Error message fix.
465
-
466
- Will merge to 'master'.
467
-
468
-
469
-* cc/parial-clone-doc-typofix (2019-01-14) 1 commit
470
- (merged to 'next' on 2019-01-14 at 0395de767e)
471
- + partial-clone: add missing 'is' in doc
472
-
473
- Doc fix.
474
-
475
- Will merge to 'master'.
476
-
477
-
478
-* jk/remote-insteadof-cleanup (2019-01-11) 1 commit
479
- (merged to 'next' on 2019-01-18 at 112c93eef3)
480
- + remote: check config validity before creating rewrite struct
481
-
482
- Code clean-up.
483
-
484
- Will merge to 'master'.
485
-
486
-
487
-* jk/save-getenv-result (2019-01-11) 6 commits
488
- (merged to 'next' on 2019-01-18 at 429c77402a)
489
- + builtin_diff(): read $GIT_DIFF_OPTS closer to use
490
- + merge-recursive: copy $GITHEAD strings
491
- + init: make a copy of $GIT_DIR string
492
- + config: make a copy of $GIT_CONFIG string
493
- + commit: copy saved getenv() result
494
- + get_super_prefix(): copy getenv() result
495
-
496
- There were many places the code relied on the string returned from
497
- getenv() to be non-volatile, which is not true, that have been
498
- corrected.
499
-
717
Will merge to 'master'.
718
719
720
* jt/fetch-v2-sideband (2019-01-17) 5 commits
504
- - tests: define GIT_TEST_SIDEBAND_ALL
505
- - {fetch,upload}-pack: sideband v2 fetch response
506
- - sideband: reverse its dependency on pkt-line
507
- - pkt-line: introduce struct packet_writer
508
- - Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband
721
+ (merged to 'next' on 2019-01-29 at c8c6f11f77)
722
+ + tests: define GIT_TEST_SIDEBAND_ALL
723
+ + {fetch,upload}-pack: sideband v2 fetch response
724
+ + sideband: reverse its dependency on pkt-line
725
+ + pkt-line: introduce struct packet_writer
726
+ + Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband
727
(this branch uses ms/packet-err-check.)
728
729
"git fetch" and "git upload-pack" learned to send all exchange over
730
the sideband channel while talking the v2 protocol.
731
514
- Will merge to 'next'.
515
-
516
-
517
-* kg/external-diff-save-env (2019-01-11) 1 commit
518
- (merged to 'next' on 2019-01-14 at 8281bbd48b)
519
- + diff: ensure correct lifetime of external_diff_cmd
520
-
521
- The code to drive GIT_EXTERNAL_DIFF command relied on the string
522
- returned from getenv() to be non-volatile, which is not true, that
523
- has been corrected.
524
-
732
Will merge to 'master'.
733
734
735
* ld/git-p4-shelve-update-fix (2019-01-18) 2 commits
529
- - git-p4: handle update of moved/copied files when updating a shelve
530
- - git-p4: add failing test for shelved CL update involving move/copy
736
+ (merged to 'next' on 2019-01-29 at 02e8752ec8)
737
+ + git-p4: handle update of moved/copied files when updating a shelve
738
+ + git-p4: add failing test for shelved CL update involving move/copy
739
740
"git p4" failed to update a shelved change when there were moved
741
files, which has been corrected.
742
535
- Will merge to 'next'.
743
+ Will merge to 'master'.
744
745
746
* ma/clear-repository-format (2019-01-23) 2 commits
@@ -561,42 +769,7 @@ of the repositories listed at
769
The assumption to work on the single "in-core index" instance has
770
been reduced from the library-ish part of the codebase.
771
564
- This obviously has fallouts with a few topics in flight, but
565
- otherwise it seemed to be in good enough shape.
566
-
567
-
568
-* bc/tree-walk-oid (2019-01-15) 5 commits
569
- (merged to 'next' on 2019-01-18 at 60c38b9e4a)
570
- + cache: make oidcpy always copy GIT_MAX_RAWSZ bytes
571
- + tree-walk: store object_id in a separate member
572
- + match-trees: use hashcpy to splice trees
573
- + match-trees: compute buffer offset correctly when splicing
574
- + tree-walk: copy object ID before use
575
-
576
- The code to walk tree objects has been taught that we may be
577
- working with object names that are not computed with SHA-1.
578
-
579
- Will merge to 'master'.
580
-
581
-
582
-* js/add-e-clear-patch-before-stating (2019-01-15) 1 commit
583
- (merged to 'next' on 2019-01-18 at 9ea7fc4b49)
584
- + add --edit: truncate the patch file
585
-
586
- "git add -e" got confused when the change it wants to let the user
587
- edit is smaller than the previous change that was left over in a
588
- temporary file.
589
-
590
- Will merge to 'master'.
591
-
592
-
593
-* jt/fetch-pack-v2 (2019-01-10) 1 commit
594
- (merged to 'next' on 2019-01-18 at 75ceb55ff8)
595
- + fetch-pack: support protocol version 2
596
-
597
- "git fetch-pack" now can talk the version 2 protocol.
598
-
599
- Will merge to 'master'.
772
+ Will merge to 'next'.
773
774
775
* jp/author-committer-config (2019-01-02) 2 commits
@@ -609,6 +782,7 @@ of the repositories listed at
782
783
Expecting a reroll.
784
cf. <xmqq1s5uk6qh.fsf@gitster-ct.c.googlers.com>
785
+ cf. <20190128233022.GA29068@whubbs1.gaikai.biz>
786
787
788
* js/rebase-am (2019-01-18) 4 commits
@@ -621,13 +795,12 @@ of the repositories listed at
795
backend, the built-in version of "git rebase" learned to drive the
796
"am" backend directly.
797
624
- Waiting for a review response.
625
- Looked almost ready.
798
+ Will merge to 'next'.
799
800
801
* ms/packet-err-check (2019-01-02) 2 commits
629
- - pack-protocol.txt: accept error packets in any context
630
- - Use packet_reader instead of packet_read_line
802
+ + pack-protocol.txt: accept error packets in any context
803
+ + Use packet_reader instead of packet_read_line
804
(this branch is used by jt/fetch-v2-sideband.)
805
806
Error checking of data sent over the pack-protocol has been
@@ -636,31 +809,6 @@ of the repositories listed at
809
Will merge to 'next'.
810
811
639
-* os/rebase-runs-post-checkout-hook (2019-01-02) 2 commits
640
- (merged to 'next' on 2019-01-18 at a03d536318)
641
- + rebase: run post-checkout hook on checkout
642
- + t5403: simplify by using a single repository
643
-
644
- "git rebase" internally runs "checkout" to switch between branches,
645
- and the command used to call the post-checkout hook, but the
646
- reimplementation stopped doing so, which is getting fixed.
647
-
648
- Will merge to 'master'.
649
-
650
-
651
-* ms/http-no-more-failonerror (2019-01-10) 5 commits
652
- (merged to 'next' on 2019-01-18 at 8938d70b6d)
653
- + test: test GIT_CURL_VERBOSE=1 shows an error
654
- + remote-curl: unset CURLOPT_FAILONERROR
655
- + remote-curl: define struct for CURLOPT_WRITEFUNCTION
656
- + http: enable keep_error for HTTP requests
657
- + http: support file handles for HTTP_KEEP_ERROR
658
-
659
- Debugging help for http transport.
660
-
661
- Will merge to 'master'.
662
-
663
-
812
* tt/bisect-in-c (2019-01-02) 7 commits
813
- bisect--helper: `bisect_start` shell function partially in C
814
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
@@ -672,17 +820,7 @@ of the repositories listed at
820
821
More code in "git bisect" has been rewritten in C.
822
675
- Comments?
676
-
677
-
678
-* ja/doc-build-l10n (2019-01-07) 1 commit
679
- (merged to 'next' on 2019-01-18 at 5dbe5ad3d7)
680
- + Documentation/Makefile add optional targets for l10n
681
-
682
- Prepare Documentation/Makefile so that manpage localization can
683
- reuse it by overriding and tweaking the list of build products.
684
-
685
- Will merge to 'master'.
823
+ Will merge to 'next'.
824
825
826
* jk/loose-object-cache-oid (2019-01-08) 11 commits
@@ -703,7 +841,7 @@ of the repositories listed at
841
Will merge to 'next'.
842
843
706
-* lt/date-human (2019-01-22) 5 commits
844
+* lt/date-human (2019-01-29) 5 commits
845
- Add `human` date format tests.
846
- Add `human` format to test-tool
847
- Add 'human' date format documentation
@@ -713,7 +851,7 @@ of the repositories listed at
851
A new date format "--date=human" that morphs its output depending
852
on how far the time is from the current time has been introduced.
853
"--date=auto" can be used to use this new format when the output is
716
- goint to the pager or to the terminal and otherwise the default
854
+ going to the pager or to the terminal and otherwise the default
855
format.
856
857
Will merge to 'next'.
@@ -752,32 +890,6 @@ of the repositories listed at
890
Will merge to 'next'.
891
892
755
-* js/rebase-i-redo-exec (2018-12-11) 3 commits
756
- (merged to 'next' on 2019-01-18 at 71be3fedb7)
757
- + rebase: introduce a shortcut for --reschedule-failed-exec
758
- + rebase: add a config option to default to --reschedule-failed-exec
759
- + rebase: introduce --reschedule-failed-exec
760
-
761
- "git rebase -i" learned to re-execute a command given with 'exec'
762
- to run after it failed the last time.
763
-
764
- Will merge to 'master'.
765
-
766
-
767
-* md/list-objects-filter-by-depth (2019-01-15) 4 commits
768
- + tree:<depth>: skip some trees even when collecting omits
769
- + list-objects-filter: teach tree:# how to handle >0
770
- + Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
771
- + Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth
772
- (this branch is used by js/filter-options-should-use-plain-int; uses sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.)
773
-
774
- The objects-filter machinery learned "tree:<depth>" to filter
775
- objects up to a given depth; earlier it only supported depth=0,
776
- i.e. usable to create a commit-only lazy clone.
777
-
778
- Will merge to 'next'.
779
-
780
-
893
* tg/checkout-no-overlay (2019-01-08) 8 commits
894
(merged to 'next' on 2019-01-18 at 1e2a79ba5c)
895
+ checkout: introduce checkout.overlayMode config
@@ -797,36 +909,15 @@ of the repositories listed at
909
Will merge to 'master'.
910
911
800
-* jk/proto-v2-hidden-refs-fix (2019-01-10) 1 commit
801
- (merged to 'next' on 2019-01-18 at 875dbbc71f)
802
- + upload-pack: support hidden refs with protocol v2
803
-
804
- The v2 upload-pack protocol implementation failed to honor
805
- hidden-ref configuration, which has been corrected.
806
-
807
- Will merge to 'master'.
808
- An earlier attempt reverted out of 'next'.
809
-
810
-
912
* js/commit-graph-chunk-table-fix (2019-01-15) 3 commits
812
- - Makefile: correct example fuzz build
813
- - commit-graph: fix buffer read-overflow
814
- - commit-graph, fuzz: add fuzzer for commit-graph
913
+ (merged to 'next' on 2019-01-29 at 65ea01d4f2)
914
+ + Makefile: correct example fuzz build
915
+ + commit-graph: fix buffer read-overflow
916
+ + commit-graph, fuzz: add fuzzer for commit-graph
917
918
The codepath to read from the commit-graph file attempted to read
919
past the end of it when the file's table-of-contents was corrupt.
920
819
- Will merge to 'next'.
820
-
821
-
822
-* jt/get-reference-with-commit-graph (2018-12-28) 1 commit
823
- (merged to 'next' on 2019-01-18 at bfc4eb9411)
824
- + revision: use commit graph in get_reference()
825
- (this branch uses sb/more-repo-in-api; is tangled with js/filter-options-should-use-plain-int and md/list-objects-filter-by-depth.)
826
-
827
- Micro-optimize the code that prepares commit objects to be walked
828
- by "git rev-list" when the commit-graph is available.
829
-
921
Will merge to 'master'.
922
923
@@ -843,8 +934,10 @@ of the repositories listed at
934
out just like the list of updated paths and other information to
935
help the user explain the merge better.
936
937
+ Comments?
938
+
939
847
-* aw/pretty-trailers (2018-12-09) 7 commits
940
+* aw/pretty-trailers (2019-01-29) 7 commits
941
- pretty: add support for separator option in %(trailers)
942
- strbuf: separate callback for strbuf_expand:ing literals
943
- pretty: add support for "valueonly" option in %(trailers)
@@ -857,7 +950,7 @@ of the repositories listed at
950
optionally pick trailers selectively by keyword, show only values,
951
etc.
952
860
- How's the doneness of this one?
953
+ Comments?
954
955
956
* jn/unknown-index-extensions (2018-11-21) 2 commits
@@ -883,8 +976,7 @@ of the repositories listed at
976
"git rebase --merge" as been reimplemented by reusing the internal
977
machinery used for "git rebase -i".
978
886
- On hold.
887
- cf. <CABPp-BFckuONYcGGkCY3BuPypRULmhsk_OFHyYA2E4jM66BfeQ@mail.gmail.com>
979
+ Will merge to 'next'.
980
981
982
* dl/remote-save-to-push (2018-12-11) 1 commit
@@ -905,6 +997,8 @@ of the repositories listed at
997
listing the protocol versions it is willing to talk, and the other
998
side choosing from one of them.
999
1000
+ Is this ready for 'next'?
1001
+
1002
1003
* js/smart-http-detect-remote-error (2019-01-07) 3 commits
1004
- remote-curl: die on server-side errors
@@ -930,64 +1024,11 @@ of the repositories listed at
1024
The second one is of dubious value. Needs sign-off.
1025
1026
933
-* sb/more-repo-in-api (2018-12-28) 23 commits
934
- + t/helper/test-repository: celebrate independence from the_repository
935
- + path.h: make REPO_GIT_PATH_FUNC repository agnostic
936
- + commit: prepare free_commit_buffer and release_commit_memory for any repo
937
- + commit-graph: convert remaining functions to handle any repo
938
- + submodule: don't add submodule as odb for push
939
- + submodule: use submodule repos for object lookup
940
- + pretty: prepare format_commit_message to handle arbitrary repositories
941
- + commit: prepare logmsg_reencode to handle arbitrary repositories
942
- + commit: prepare repo_unuse_commit_buffer to handle any repo
943
- + commit: prepare get_commit_buffer to handle any repo
944
- + commit-reach: prepare in_merge_bases[_many] to handle any repo
945
- + commit-reach: prepare get_merge_bases to handle any repo
946
- + commit-reach.c: allow get_merge_bases_many_0 to handle any repo
947
- + commit-reach.c: allow remove_redundant to handle any repo
948
- + commit-reach.c: allow merge_bases_many to handle any repo
949
- + commit-reach.c: allow paint_down_to_common to handle any repo
950
- + commit: allow parse_commit* to handle any repo
951
- + object: parse_object to honor its repository argument
952
- + object-store: prepare has_{sha1, object}_file to handle any repo
953
- + object-store: prepare read_object_file to deal with any repo
954
- + object-store: allow read_object_file_extended to read from any repo
955
- + packfile: allow has_packed_and_bad to handle arbitrary repositories
956
- + sha1_file: allow read_object to read objects in arbitrary repositories
957
- (this branch is used by js/filter-options-should-use-plain-int, jt/get-reference-with-commit-graph and md/list-objects-filter-by-depth.)
958
-
959
- The in-core repository instances are passed through more codepaths.
960
-
961
- Will merge to 'next'.
962
-
963
-
964
-* bc/sha-256 (2018-11-14) 12 commits
965
- (merged to 'next' on 2019-01-18 at 3f161d31bb)
966
- + hash: add an SHA-256 implementation using OpenSSL
967
- + sha256: add an SHA-256 implementation using libgcrypt
968
- + Add a base implementation of SHA-256 support
969
- + commit-graph: convert to using the_hash_algo
970
- + t/helper: add a test helper to compute hash speed
971
- + sha1-file: add a constant for hash block size
972
- + t: make the sha1 test-tool helper generic
973
- + t: add basic tests for our SHA-1 implementation
974
- + cache: make hashcmp and hasheq work with larger hashes
975
- + hex: introduce functions to print arbitrary hashes
976
- + sha1-file: provide functions to look up hash algorithms
977
- + sha1-file: rename algorithm to "sha1"
978
- (this branch is used by ds/commit-graph-format-v2.)
979
-
980
- Add sha-256 hash and plug it through the code to allow building Git
981
- with the "NewHash".
982
-
983
- Will merge to 'master'.
984
-
985
-
986
-* js/vsts-ci (2019-01-28) 21 commits
1027
+* js/vsts-ci (2019-01-29) 21 commits
1028
- ci: parallelize testing on Windows
1029
- ci: speed up Windows phase
1030
- tests: optionally skip bin-wrappers/
990
- - t0061: fix with --with-dashes and RUNTIME_PREFIX
1031
+ - t0061: workaround issues with --with-dashes and RUNTIME_PREFIX
1032
- tests: add t/helper/ to the PATH with --with-dashes
1033
- mingw: try to work around issues with the test cleanup
1034
- tests: include detailed trace logs with --write-junit-xml upon failure
@@ -1027,10 +1068,8 @@ of the repositories listed at
1068
updated to use "size_t".
1069
1070
1030
-* ag/sequencer-reduce-rewriting-todo (2019-01-14) 18 commits
1031
- - rebase-interactive.h: fix hdr-check warnings
1032
- - sequencer: mark file local symbols as static
1033
- - rebase-interactive: move transform_todo_file() to rebase--interactive.c
1071
+* ag/sequencer-reduce-rewriting-todo (2019-01-29) 16 commits
1072
+ - rebase--interactive: move transform_todo_file() to rebase--interactive.c
1073
- sequencer: use edit_todo_list() in complete_action()
1074
- rebase-interactive: rewrite edit_todo_list() to handle the initial edit
1075
- rebase-interactive: append_todo_help() changes
@@ -1054,26 +1093,7 @@ of the repositories listed at
1093
around in-core to avoid rewriting the same file over and over
1094
unnecessarily.
1095
1057
- May need a further update, including squashing the tip commit to a
1058
- releavant place.
1059
-
1060
-
1061
-* sb/submodule-recursive-fetch-gets-the-tip (2018-12-09) 9 commits
1062
- (merged to 'next' on 2019-01-18 at 79a2809fbc)
1063
- + fetch: ensure submodule objects fetched
1064
- + submodule.c: fetch in submodules git directory instead of in worktree
1065
- + submodule: migrate get_next_submodule to use repository structs
1066
- + repository: repo_submodule_init to take a submodule struct
1067
- + submodule: store OIDs in changed_submodule_names
1068
- + submodule.c: tighten scope of changed_submodule_names struct
1069
- + submodule.c: sort changed_submodule_names before searching it
1070
- + submodule.c: fix indentation
1071
- + sha1-array: provide oid_array_filter
1072
-
1073
- "git fetch --recurse-submodules" may not fetch the necessary commit
1074
- that is bound to the superproject, which is getting corrected.
1075
-
1076
- Will merge to 'master'.
1096
+ Comments?
1097
1098
1099
* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit