What's cooking (2018/10 #03)
Junio C Hamano committed
Oct 17, 2018 at 08:14 UTC
c78223606e0cccb0c4c342f5ddd690d843a1b941
1 file changed
+464
-499
whats-cooking.txt
+464
-499
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2018, #02; Sat, 13)
4
-X-master-at: 5a0cc8aca797dbd7d2be3b67458ff880ed45cddf
5
-X-next-at: 152ad8e3369ac77026886a2910e3a407c281df35
3
+Subject: What's cooking in git.git (Oct 2018, #03; Wed, 17)
4
+X-master-at: a4b8ab5363a32f283a61ef3a962853556d136c0e
5
+X-next-at: 3377e82b59874c0e626c00f29bf7526a27f29d65
6
7
-What's cooking in git.git (Oct 2018, #02; Sat, 13)
7
+What's cooking in git.git (Oct 2018, #03; Wed, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,17 +12,390 @@ 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
-Quite a lot of topics have been merged to 'next'. Let's see how
16
-well they fare.
15
+Note that "cf. <msg-id>" are not meant as "clear all of these and
16
+you are home free". They are primarily to prevent me from merging
17
+topics that are not ready to 'next' by mistake and remind me where
18
+to go back to read the last state of the discussion in the archive.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
22
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
+--------------------------------------------------
26
+[Graduated to "master"]
27
+
28
+* ab/commit-graph-progress (2018-09-20) 3 commits
29
+ (merged to 'next' on 2018-09-24 at 76f2f5c1e3)
30
+ + gc: fix regression in 7b0f229222 impacting --quiet
31
+ + commit-graph verify: add progress output
32
+ + commit-graph write: add progress output
33
+ (this branch is used by ds/commit-graph-leakfix.)
34
+
35
+ (Originally merged to 'next' on 2018-09-20 at 24ca94b1d4)
36
+
37
+ Generation of (experimental) commit-graph files have so far been
38
+ fairly silent, even though it takes noticeable amount of time in a
39
+ meaningfully large repository. The users will now see progress
40
+ output.
41
+
42
+
43
+* ds/commit-graph-with-grafts (2018-08-21) 8 commits
44
+ (merged to 'next' on 2018-10-09 at 851a457102)
45
+ + commit-graph: close_commit_graph before shallow walk
46
+ + commit-graph: not compatible with uninitialized repo
47
+ + commit-graph: not compatible with grafts
48
+ + commit-graph: not compatible with replace objects
49
+ + test-repository: properly init repo
50
+ + commit-graph: update design document
51
+ + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
52
+ + refs.c: migrate internal ref iteration to pass thru repository argument
53
+
54
+ The recently introduced commit-graph auxiliary data is incompatible
55
+ with mechanisms such as replace & grafts that "breaks" immutable
56
+ nature of the object reference relationship. Disable optimizations
57
+ based on its use (and updating existing commit-graph) when these
58
+ incompatible features are in use in the repository.
59
+
60
+
61
+* ds/reachable-final-cleanup (2018-09-25) 1 commit
62
+ (merged to 'next' on 2018-10-12 at 32c6d5f55a)
63
+ + commit-reach: cleanups in can_all_from_reach...
64
+
65
+ Code already in 'master' is further cleaned-up by this patch.
66
+
67
+
68
+* dz/credential-doc-url-matching-rules (2018-09-27) 1 commit
69
+ (merged to 'next' on 2018-10-12 at 4547952530)
70
+ + doc: clarify gitcredentials path component matching
71
+
72
+ Doc update.
73
+
74
+
75
+* en/merge-cleanup (2018-09-20) 4 commits
76
+ (merged to 'next' on 2018-10-09 at f3a00b506f)
77
+ + merge-recursive: rename merge_file_1() and merge_content()
78
+ + merge-recursive: remove final remaining caller of merge_file_one()
79
+ + merge-recursive: avoid wrapper function when unnecessary and wasteful
80
+ + merge-recursive: set paths correctly when three-way merging content
81
+ (this branch is used by en/merge-cleanup-more.)
82
+
83
+ Code clean-up.
84
+
85
+
86
+* en/status-multiple-renames-to-the-same-target-fix (2018-09-27) 1 commit
87
+ (merged to 'next' on 2018-10-12 at 4976fc61a0)
88
+ + commit: fix erroneous BUG, 'multiple renames on the same target? how?'
89
+
90
+ The code in "git status" sometimes hit an assertion failure. This
91
+ was caused by a structure that was reused without cleaning the data
92
+ used for the first run, which has been corrected.
93
+
94
+
95
+* fe/doc-updates (2018-09-21) 3 commits
96
+ (merged to 'next' on 2018-10-10 at 2eea3a88bc)
97
+ + git-describe.1: clarify that "human readable" is also git-readable
98
+ + git-column.1: clarify initial description, provide examples
99
+ + git-archimport.1: specify what kind of Arch we're talking about
100
+
101
+ Doc updates.
102
+
103
+
104
+* jk/check-everything-connected-is-long-gone (2018-09-25) 1 commit
105
+ (merged to 'next' on 2018-10-12 at 4ce30c9a30)
106
+ + receive-pack: update comment with check_everything_connected
107
+
108
+ Comment fix.
109
+
110
+
111
+* jk/delta-islands-with-bitmap-reuse-delta-fix (2018-09-19) 1 commit
112
+ (merged to 'next' on 2018-10-09 at 10e58be2af)
113
+ + pack-objects: handle island check for "external" delta base
114
+
115
+ Fix interactions between two recent topics.
116
+
117
+
118
+* jk/oideq-hasheq-cleanup (2018-10-04) 1 commit
119
+ (merged to 'next' on 2018-10-12 at 7c9b5681da)
120
+ + more oideq/hasheq conversions
121
+
122
+ Code clean-up.
123
+
124
+
125
+* jn/gc-auto (2018-07-17) 1 commit
126
+ (merged to 'next' on 2018-10-10 at 9f0f1f770e)
127
+ + gc: do not return error for prior errors in daemonized mode
128
+ (this branch uses jn/gc-auto-prep.)
129
+
130
+ "gc --auto" ended up calling exit(-1) upon error, which has been
131
+ corrected to use exit(1). Also the error reporting behaviour when
132
+ daemonized has been updated to exit with zero status when stopping
133
+ due to a previously discovered error (which implies there is no
134
+ point running gc to improve the situation); we used to exit with
135
+ failure in such a case.
136
+
137
+
138
+* jn/gc-auto-prep (2018-07-17) 2 commits
139
+ (merged to 'next' on 2018-10-10 at 4ab6a62f62)
140
+ + gc: exit with status 128 on failure
141
+ + gc: improve handling of errors reading gc.log
142
+ (this branch is used by jn/gc-auto.)
143
+
144
+ Code clean-up.
145
+
146
+
147
+* jn/mailmap-update (2018-09-25) 1 commit
148
+ (merged to 'next' on 2018-10-10 at fa2b394bd5)
149
+ + mailmap: consistently normalize brian m. carlson's name
150
+
151
+ The mailmap file update.
152
+
153
+
154
+* js/mingw-wants-vista-or-above (2018-10-04) 3 commits
155
+ (merged to 'next' on 2018-10-12 at 3a174c3d43)
156
+ + mingw: bump the minimum Windows version to Vista
157
+ + mingw: set _WIN32_WINNT explicitly for Git for Windows
158
+ + compat/poll: prepare for targeting Windows Vista
159
+
160
+ The minimum version of Windows supported by Windows port fo Git is
161
+ now set to Vista.
162
+
163
+
164
+* ma/commit-graph-docs (2018-09-27) 4 commits
165
+ (merged to 'next' on 2018-10-12 at eafaf79b5a)
166
+ + Doc: refer to the "commit-graph file" with dash
167
+ + git-commit-graph.txt: refer to "*commit*-graph file"
168
+ + git-commit-graph.txt: typeset more in monospace
169
+ + git-commit-graph.txt: fix bullet lists
170
+
171
+ Doc update.
172
+
173
+
174
+* ma/config-doc-update (2018-09-20) 2 commits
175
+ (merged to 'next' on 2018-10-09 at 312a873a2a)
176
+ + git-config.txt: fix 'see: above' note
177
+ + Doc: use `--type=bool` instead of `--bool`
178
+
179
+ Doc update.
180
+
181
+
182
+* ma/mailing-list-address-in-git-help (2018-09-29) 1 commit
183
+ (merged to 'next' on 2018-10-12 at 4c3737d234)
184
+ + git doc: direct bug reporters to mailing list archive
185
+
186
+ Doc update.
187
+
188
+
189
+* ma/t1400-undebug-test (2018-09-28) 1 commit
190
+ (merged to 'next' on 2018-10-12 at d736f83435)
191
+ + t1400: drop debug `echo` to actually execute `test`
192
+
193
+ Test fix.
194
+
195
+
196
+* md/test-cleanup (2018-10-07) 7 commits
197
+ (merged to 'next' on 2018-10-10 at 7e0bf1b573)
198
+ + tests: order arguments to git-rev-list properly
199
+ + t9109: don't swallow Git errors upstream of pipes
200
+ + tests: don't swallow Git errors upstream of pipes
201
+ + t/*: fix ordering of expected/observed arguments
202
+ + tests: standardize pipe placement
203
+ + Documentation: add shell guidelines
204
+ + t/README: reformat Do, Don't, Keep in mind lists
205
+
206
+ Various test scripts have been updated for style and also correct
207
+ handling of exit status of various commands.
208
+
209
+
210
+* mw/doc-typofixes (2018-10-07) 3 commits
211
+ (merged to 'next' on 2018-10-12 at 97297b8ce9)
212
+ + docs: typo: s/isimilar/similar/
213
+ + docs: graph: remove unnecessary `graph_update()' call
214
+ + docs: typo: s/go/to/
215
+
216
+ Typofixes.
217
+
218
+
219
+* nd/packobjectshook-doc-fix (2018-09-29) 1 commit
220
+ (merged to 'next' on 2018-10-12 at 85d75f5219)
221
+ + config.txt: correct the note about uploadpack.packObjectsHook
222
+
223
+ Doc update.
224
+
225
+
226
+* rj/header-check (2018-09-20) 8 commits
227
+ (merged to 'next' on 2018-10-09 at 7fa9c68ef0)
228
+ + delta-islands.h: add missing forward declarations (hdr-check)
229
+ + midx.h: add missing forward declarations (hdr-check)
230
+ + refs/refs-internal.h: add missing declarations (hdr-check)
231
+ + refs/packed-backend.h: add missing declaration (hdr-check)
232
+ + refs/ref-cache.h: add missing declarations (hdr-check)
233
+ + ewah/ewok_rlw.h: add missing include (hdr-check)
234
+ + json-writer.h: add missing include (hdr-check)
235
+ + Makefile: add a hdr-check target
236
+
237
+ Header files clean-up.
238
+
239
+
240
+* rs/sequencer-oidset-insert-avoids-dups (2018-10-03) 1 commit
241
+ (merged to 'next' on 2018-10-12 at b294394711)
242
+ + sequencer: use return value of oidset_insert()
243
+
244
+ Code clean-up.
245
+
246
+
247
+* rt/rebase-typofix (2018-09-28) 1 commit
248
+ (merged to 'next' on 2018-10-12 at 58691d20df)
249
+ + git-rebase.sh: fix typos in error messages
250
+
251
+ Typofix.
252
+
253
+
254
+* sf/complete-stash-list (2018-10-07) 1 commit
255
+ (merged to 'next' on 2018-10-12 at ff0e9a0805)
256
+ + git-completion.bash: add completion for stash list
257
+
258
+ The completion script (in contrib/) learned to complete a handful of
259
+ options "git stash list" command takes.
260
+
261
+
262
+* tg/t5551-with-curl-7.61.1 (2018-09-24) 2 commits
263
+ (merged to 'next' on 2018-10-10 at 5ada84ed7a)
264
+ + t5551: compare sorted cookies files
265
+ + t5551: move setup code inside test_expect blocks
266
+
267
+ Test update.
268
+ Supersedes tz/t5551-with-curl-7.61.1 topic
269
+
270
+
271
+* tq/refs-internal-comment-fix (2018-09-17) 1 commit
272
+ (merged to 'next' on 2018-10-09 at 422313bbd0)
273
+ + refs: docstring typo
274
+
275
+ Fix for typo in a sample code in comment.
276
+
277
+
278
+* ts/alias-of-alias (2018-09-17) 3 commits
279
+ (merged to 'next' on 2018-10-09 at ac19b4730b)
280
+ + t0014: introduce an alias testing suite
281
+ + alias: show the call history when an alias is looping
282
+ + alias: add support for aliases of an alias
283
+
284
+ An alias that expands to another alias has so far been forbidden,
285
+ but now it is allowed to create such an alias.
286
+
287
--------------------------------------------------
288
[New Topics]
289
290
+* en/merge-cleanup-more (2018-10-16) 4 commits
291
+ - merge-recursive: avoid showing conflicts with merge branch before HEAD
292
+ - merge-recursive: improve auto-merging messages with path collisions
293
+ - merge-recursive: increase marker length with depth of recursion
294
+ - t6036: add testcase where virtual merge base contains nested conflicts
295
+
296
+ Further clean-up of merge-recursive machinery.
297
+
298
+
299
+* ld/p4-unshelve (2018-10-16) 3 commits
300
+ - git-p4: fully support unshelving changelists
301
+ - git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
302
+ - git-p4: do not fail in verbose mode for missing 'fileSize' key
303
+
304
+ "git p4 unshelve" improvements.
305
+
306
+ Will merge to 'next'.
307
+
308
+
309
+* mg/gpg-parse-tighten (2018-10-15) 1 commit
310
+ - gpg-interface.c: detect and reject multiple signatures on commits
311
+
312
+ Detect and reject a signature block that has more than one GPG
313
+ signature.
314
+
315
+ Expecting another round of polishing, which is promising.
316
+ cf. <1539636266.1014.6.camel@gentoo.org>
317
+
318
+
319
+* bc/sha-256 (2018-10-16) 14 commits
320
+ - SQUASH???
321
+ - commit-graph: specify OID version for SHA-256
322
+ - hash: add an SHA-256 implementation using OpenSSL
323
+ - sha256: add an SHA-256 implementation using libgcrypt
324
+ - Add a base implementation of SHA-256 support
325
+ - commit-graph: convert to using the_hash_algo
326
+ - t/helper: add a test helper to compute hash speed
327
+ - sha1-file: add a constant for hash block size
328
+ - t: make the sha1 test-tool helper generic
329
+ - t: add basic tests for our SHA-1 implementation
330
+ - cache: make hashcmp and hasheq work with larger hashes
331
+ - hex: introduce functions to print arbitrary hashes
332
+ - sha1-file: provide functions to look up hash algorithms
333
+ - sha1-file: rename algorithm to "sha1"
334
+
335
+ Add sha-256 hash and plug it through the code to allow building Git
336
+ with the "NewHash".
337
+
338
+
339
+* ds/mingw-default-ident (2018-10-16) 3 commits
340
+ - mingw: use domain information for default email
341
+ - getpwuid(mingw): provide a better default for the user name
342
+ - getpwuid(mingw): initialize the structure only once
343
+
344
+ The logic to select the default user name and e-mail on Windows has
345
+ been improved.
346
+
347
+ Will merge to 'next'.
348
+
349
+
350
+* ds/mingw-http-ssl (2018-10-16) 3 commits
351
+ - http: when using Secure Channel, ignore sslCAInfo by default
352
+ - http: add support for disabling SSL revocation checks in cURL
353
+ - http: add support for selecting SSL backends at runtime
354
+
355
+ On Windows with recent enough cURL library, the configuration
356
+ variable http.sslBackend can be used to choose between OpenSSL and
357
+ Secure Channel at runtime as the SSL backend while talking over
358
+ the HTTPS protocol.
359
+
360
+ Almost there.
361
+ cf. <CAPig+cQFb3S0Lm+huUZDN4aw9rWwinh0iZp12ss1zVKpJ=2MdA@mail.gmail.com>
362
+
363
+
364
+* js/vsts-ci (2018-10-16) 13 commits
365
+ - travis: fix skipping tagged releases
366
+ - README: add a build badge (status of the Azure Pipelines build)
367
+ - tests: record more stderr with --write-junit-xml in case of failure
368
+ - tests: include detailed trace logs with --write-junit-xml upon failure
369
+ - git-p4: use `test_atexit` to kill the daemon
370
+ - git-daemon: use `test_atexit` in the tests
371
+ - tests: introduce `test_atexit`
372
+ - ci: add a build definition for Azure DevOps
373
+ - ci/lib.sh: add support for Azure Pipelines
374
+ - tests: optionally write results as JUnit-style .xml
375
+ - test-date: add a subcommand to measure times in shell scripts
376
+ - ci/lib.sh: encapsulate Travis-specific things
377
+ - ci: rename the library of common functions
378
+
379
+ Prepare to run test suite on Azure DevOps.
380
+
381
+ On hold, monitoring the discussion.
382
+ cf. <nycvar.QRO.7.76.6.1810151657080.4546@tvgsbejvaqbjf.bet>
383
+
384
+--------------------------------------------------
385
+[Stalled]
386
+
387
+* lt/date-human (2018-07-09) 1 commit
388
+ - Add 'human' date format
389
+
390
+ A new date format "--date=human" that morphs its output depending
391
+ on how far the time is from the current time has been introduced.
392
+ "--date=auto" can be used to use this new format when the output is
393
+ goint to the pager or to the terminal and otherwise the default
394
+ format.
395
+
396
+--------------------------------------------------
397
+[Cooking]
398
+
399
* ab/gc-doc-update (2018-10-11) 1 commit
400
- gc doc: mention the commit-graph in the intro
401
@@ -31,32 +404,35 @@ of the repositories listed at
404
ancillary files like commit-graph as a part of repository
405
optimization.
406
34
- Waiting for reactions.
35
- cf. <20181010193818.20399-1-avarab@gmail.com>
36
- The author seems to feel that this might be controversial.
407
+ Will merge to 'next'.
408
409
39
-* du/branch-show-current (2018-10-12) 2 commits
410
+* du/branch-show-current (2018-10-16) 2 commits
411
- SQUASH???
412
- branch: introduce --show-current display option
413
414
"git branch" learned a new subcommand "--show-current".
415
416
+ Waiting for ack(s) on SQUASH??? fixup.
417
+ cf. <xmqqk1mizb1c.fsf@gitster-ct.c.googlers.com>
418
+
419
420
* du/rev-parse-is-plumbing (2018-10-11) 1 commit
47
- - doc: move git-rev-parse from porcelain to plumbing
421
+ (merged to 'next' on 2018-10-16 at 50aca759e2)
422
+ + doc: move git-rev-parse from porcelain to plumbing
423
424
Doc update.
425
51
- Will merge to 'next'.
426
+ Will merge to 'master'.
427
428
429
* mm/doc-no-dashed-git (2018-10-11) 1 commit
55
- - doc: fix a typo and clarify a sentence
430
+ (merged to 'next' on 2018-10-16 at c26bcd740b)
431
+ + doc: fix a typo and clarify a sentence
432
433
Doc update.
434
59
- Will merge to 'next'.
435
+ Will merge to 'master'.
436
437
438
* ot/ref-filter-plug-leaks (2018-10-11) 3 commits
@@ -69,7 +445,7 @@ of the repositories listed at
445
Seems to break t6300 standalone and when merged to 'pu'.
446
447
72
-* rv/send-email-cc-misc-by (2018-10-11) 3 commits
448
+* rv/send-email-cc-misc-by (2018-10-16) 3 commits
449
- send-email: also pick up cc addresses from -by trailers
450
- send-email: only consider lines containing @ or <> for automatic Cc'ing
451
- Documentation/git-send-email.txt: style fixes
@@ -82,53 +458,46 @@ of the repositories listed at
458
This is a backward-incompatible change that may surprise existing
459
users.
460
461
+ Will merge to 'next'.
462
+
463
464
* du/cherry-is-plumbing (2018-10-12) 1 commit
465
- doc: move git-cherry to plumbing
466
467
Doc update to mark "git cherry" as a plumbing command.
468
469
+ Will merge to 'next'.
470
+
471
472
* du/get-tar-commit-id-is-plumbing (2018-10-12) 1 commit
93
- - doc: move git-get-tar-commit-id to plumbing
473
+ (merged to 'next' on 2018-10-16 at 23e7f018cd)
474
+ + doc: move git-get-tar-commit-id to plumbing
475
476
Doc update to mark "git get-tar-commit-id" as a plumbing command.
477
97
- Will merge to 'next'.
478
+ Will merge to 'master'.
479
480
481
* lm/range-diff-submodule-fix (2018-10-12) 1 commit
101
- - range-diff: allow to diff files regardless submodule
482
+ (merged to 'next' on 2018-10-16 at 3e50d7a73b)
483
+ + range-diff: allow to diff files regardless submodule
484
485
"git range-diff" did not work well when the compared ranges had
486
changes in submodules and the "--submodule=log" was used.
487
106
- Will merge to 'next'.
488
+ Will merge to 'master'.
489
490
491
* sb/diff-emit-line-ws-markup-cleanup (2018-10-12) 1 commit
110
- - diff.c: pass sign_index to emit_line_ws_markup
492
+ (merged to 'next' on 2018-10-16 at a68a6f0003)
493
+ + diff.c: pass sign_index to emit_line_ws_markup
494
495
Code clean-up.
496
114
- Will merge to 'next'.
115
-
116
---------------------------------------------------
117
-[Stalled]
118
-
119
-* lt/date-human (2018-07-09) 1 commit
120
- - Add 'human' date format
121
-
122
- A new date format "--date=human" that morphs its output depending
123
- on how far the time is from the current time has been introduced.
124
- "--date=auto" can be used to use this new format when the output is
125
- goint to the pager or to the terminal and otherwise the default
126
- format.
497
+ Will merge to 'master'.
498
128
---------------------------------------------------
129
-[Cooking]
499
131
-* mk/use-size-t-in-zlib (2018-10-12) 1 commit
500
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
501
- zlib.c: use size_t for size
502
503
The wrapper to call into zlib followed our long tradition to use
@@ -136,35 +505,6 @@ of the repositories listed at
505
updated to use "size_t".
506
507
139
-* ds/reachable-final-cleanup (2018-09-25) 1 commit
140
- (merged to 'next' on 2018-10-12 at 32c6d5f55a)
141
- + commit-reach: cleanups in can_all_from_reach...
142
-
143
- Code already in 'master' is further cleaned-up by this patch.
144
-
145
- Will merge to 'master'.
146
-
147
-
148
-* dz/credential-doc-url-matching-rules (2018-09-27) 1 commit
149
- (merged to 'next' on 2018-10-12 at 4547952530)
150
- + doc: clarify gitcredentials path component matching
151
-
152
- Doc update.
153
-
154
- Will merge to 'master'.
155
-
156
-
157
-* en/status-multiple-renames-to-the-same-target-fix (2018-09-27) 1 commit
158
- (merged to 'next' on 2018-10-12 at 4976fc61a0)
159
- + commit: fix erroneous BUG, 'multiple renames on the same target? how?'
160
-
161
- The code in "git status" sometimes hit an assertion failure. This
162
- was caused by a structure that was reused without cleaning the data
163
- used for the first run, which has been corrected.
164
-
165
- Will merge to 'master'.
166
-
167
-
508
* jc/how-to-document-api (2018-09-29) 1 commit
509
(merged to 'next' on 2018-10-12 at 7c9bd82285)
510
+ CodingGuidelines: document the API in *.h files
@@ -191,36 +531,6 @@ of the repositories listed at
531
of string-list nearby that should be converted at the same time.
532
533
194
-* jk/check-everything-connected-is-long-gone (2018-09-25) 1 commit
195
- (merged to 'next' on 2018-10-12 at 4ce30c9a30)
196
- + receive-pack: update comment with check_everything_connected
197
-
198
- Comment fix.
199
-
200
- Will merge to 'master'.
201
-
202
-
203
-* jk/oideq-hasheq-cleanup (2018-10-04) 1 commit
204
- (merged to 'next' on 2018-10-12 at 7c9b5681da)
205
- + more oideq/hasheq conversions
206
-
207
- Code clean-up.
208
-
209
- Will merge to 'master'.
210
-
211
-
212
-* js/mingw-wants-vista-or-above (2018-10-04) 3 commits
213
- (merged to 'next' on 2018-10-12 at 3a174c3d43)
214
- + mingw: bump the minimum Windows version to Vista
215
- + mingw: set _WIN32_WINNT explicitly for Git for Windows
216
- + compat/poll: prepare for targeting Windows Vista
217
-
218
- The minimum version of Windows supported by Windows port fo Git is
219
- now set to Vista.
220
-
221
- Will merge to 'master'.
222
-
223
-
534
* js/rebase-i-break (2018-10-12) 2 commits
535
- rebase -i: introduce the 'break' command
536
- rebase -i: clarify what happens on a failed `exec`
@@ -245,7 +555,9 @@ of the repositories listed at
555
version 2 of the protocol is defined to allow going over http(s) as
556
well as Git native transport.
557
248
- Will merge to 'master'.
558
+ Will hold.
559
+ cf. <20181016212008.GA249669@google.com>
560
+ Breaks interoperability.
561
562
563
* jt/non-blob-lazy-fetch (2018-10-04) 2 commits
@@ -263,42 +575,13 @@ of the repositories listed at
575
Will merge to 'master'.
576
577
266
-* ma/commit-graph-docs (2018-09-27) 4 commits
267
- (merged to 'next' on 2018-10-12 at eafaf79b5a)
268
- + Doc: refer to the "commit-graph file" with dash
269
- + git-commit-graph.txt: refer to "*commit*-graph file"
270
- + git-commit-graph.txt: typeset more in monospace
271
- + git-commit-graph.txt: fix bullet lists
272
-
273
- Doc update.
274
-
275
- Will merge to 'master'.
276
-
277
-
278
-* ma/mailing-list-address-in-git-help (2018-09-29) 1 commit
279
- (merged to 'next' on 2018-10-12 at 4c3737d234)
280
- + git doc: direct bug reporters to mailing list archive
281
-
282
- Doc update.
283
-
284
- Will merge to 'master'.
285
-
286
-
287
-* ma/t1400-undebug-test (2018-09-28) 1 commit
288
- (merged to 'next' on 2018-10-12 at d736f83435)
289
- + t1400: drop debug `echo` to actually execute `test`
290
-
291
- Test fix.
292
-
293
- Will merge to 'master'.
294
-
295
-
578
* ma/t7005-bash-workaround (2018-09-28) 1 commit
297
- - t7005-editor: quote filename to fix whitespace-issue
579
+ (merged to 'next' on 2018-10-16 at 543e1e6574)
580
+ + t7005-editor: quote filename to fix whitespace-issue
581
582
Test fix.
583
301
- Will merge to 'next'.
584
+ Will merge to 'master'.
585
586
587
* nd/help-commands-verbose-by-default (2018-10-03) 1 commit
@@ -315,15 +598,6 @@ of the repositories listed at
598
Will merge to 'master'.
599
600
318
-* nd/packobjectshook-doc-fix (2018-09-29) 1 commit
319
- (merged to 'next' on 2018-10-12 at 85d75f5219)
320
- + config.txt: correct the note about uploadpack.packObjectsHook
321
-
322
- Doc update.
323
-
324
- Will merge to 'master'.
325
-
326
-
601
* pw/diff-color-moved-ws-fix (2018-10-04) 5 commits
602
(merged to 'next' on 2018-10-12 at 73badc83fe)
603
+ diff --color-moved: fix a memory leak
@@ -354,30 +628,12 @@ of the repositories listed at
628
+ oidset: uninline oidset_init()
629
+ oidset: use khash
630
+ khash: factor out kh_release_*
357
- + fetch-pack: load tip_oids eagerly iff needed
358
- + fetch-pack: factor out is_unmatched_ref()
359
-
360
- The oidset API was built on top of the oidmap API which in turn is
361
- on the hashmap API. Replace the implementation to build on top of
362
- the khash API and gain performance.
363
-
364
- Will merge to 'master'.
365
-
366
-
367
-* rs/sequencer-oidset-insert-avoids-dups (2018-10-03) 1 commit
368
- (merged to 'next' on 2018-10-12 at b294394711)
369
- + sequencer: use return value of oidset_insert()
370
-
371
- Code clean-up.
372
-
373
- Will merge to 'master'.
374
-
375
-
376
-* rt/rebase-typofix (2018-09-28) 1 commit
377
- (merged to 'next' on 2018-10-12 at 58691d20df)
378
- + git-rebase.sh: fix typos in error messages
631
+ + fetch-pack: load tip_oids eagerly iff needed
632
+ + fetch-pack: factor out is_unmatched_ref()
633
380
- Typofix.
634
+ The oidset API was built on top of the oidmap API which in turn is
635
+ on the hashmap API. Replace the implementation to build on top of
636
+ the khash API and gain performance.
637
638
Will merge to 'master'.
639
@@ -407,23 +663,25 @@ of the repositories listed at
663
664
Code clean-up to serve as a BCP example.
665
410
- What's the status of this one after the discussion thread stopped here?
411
- cf. <CAGZ79kbV6QjsFKcD2uG_P9j1AvzSNQSi-_jXGQ9w0YU9fjhEGg@mail.gmail.com>
666
+ Will merge to 'next'.
667
+ Further clean-up patches may need to follow soon before this
668
+ change escapes to 'master'.
669
670
671
* sg/split-index-racefix (2018-10-12) 7 commits
415
- - split-index: BUG() when cache entry refers to non-existing shared entry
416
- - split-index: smudge and add racily clean cache entries to split index
417
- - split-index: don't compare cached data of entries already marked for split index
418
- - split-index: count the number of deleted entries
419
- - t1700-split-index: date back files to avoid racy situations
420
- - split-index: add tests to demonstrate the racy split index problem
421
- - t1700-split-index: document why FSMONITOR is disabled in this test script
672
+ (merged to 'next' on 2018-10-16 at c1d6563c51)
673
+ + split-index: BUG() when cache entry refers to non-existing shared entry
674
+ + split-index: smudge and add racily clean cache entries to split index
675
+ + split-index: don't compare cached data of entries already marked for split index
676
+ + split-index: count the number of deleted entries
677
+ + t1700-split-index: date back files to avoid racy situations
678
+ + split-index: add tests to demonstrate the racy split index problem
679
+ + t1700-split-index: document why FSMONITOR is disabled in this test script
680
681
The codepath to support the experimental split-index mode had
682
remaining "racily clean" issues fixed.
683
426
- Will merge to 'next'.
684
+ Will merge to 'master'.
685
686
687
* sm/show-superproject-while-conflicted (2018-09-28) 1 commit
@@ -465,16 +723,17 @@ of the repositories listed at
723
724
725
* bc/editorconfig (2018-10-09) 2 commits
468
- - editorconfig: indicate settings should be kept in sync
469
- - editorconfig: provide editor settings for Git developers
726
+ (merged to 'next' on 2018-10-16 at 81461ae0fd)
727
+ + editorconfig: indicate settings should be kept in sync
728
+ + editorconfig: provide editor settings for Git developers
729
730
To help developers, an EditorConfig file that attempts to follow
731
the project convention has been added.
732
474
- Will merge to 'next'.
733
+ Will merge to 'master'.
734
735
477
-* bc/hash-transition-part-15 (2018-10-09) 14 commits
736
+* bc/hash-transition-part-15 (2018-10-15) 15 commits
737
- rerere: convert to use the_hash_algo
738
- submodule: make zero-oid comparison hash function agnostic
739
- apply: rename new_sha1_prefix and old_sha1_prefix
@@ -487,13 +746,16 @@ of the repositories listed at
746
- pack-revindex: express constants in terms of the_hash_algo
747
- builtin/fetch-pack: remove constants with parse_oid_hex
748
- builtin/mktree: remove hard-coded constant
490
- - builtin/repack: replace hard-coded constant
749
+ - builtin/repack: replace hard-coded constants
750
- pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
751
+ - object_id.cocci: match only expressions of type 'struct object_id'
752
753
More codepaths are moving away from hardcoded hash sizes.
754
755
496
-* ch/subtree-build (2018-10-10) 1 commit
756
+* ch/subtree-build (2018-10-16) 2 commits
757
+ (merged to 'next' on 2018-10-16 at 919599cc37)
758
+ + subtree: make install targets depend on build targets
759
(merged to 'next' on 2018-10-12 at 4ed9ff6300)
760
+ subtree: add build targets 'man' and 'html'
761
@@ -507,7 +769,6 @@ of the repositories listed at
769
+ commit-graph: reduce initial oid allocation
770
+ builtin/commit-graph.c: UNLEAK variables
771
+ commit-graph: clean up leaked memory during write
510
- (this branch uses ab/commit-graph-progress.)
772
773
Code clean-up.
774
@@ -525,13 +786,15 @@ of the repositories listed at
786
cf. <8b5dbe3d-b382-bf48-b524-d9e8a074ac4d@gmail.com>
787
788
528
-* js/fuzzer (2018-10-10) 2 commits
529
- - fuzz: add fuzz testing for packfile indices
530
- - fuzz: add basic fuzz testing target
789
+* js/fuzzer (2018-10-15) 2 commits
790
+ - fuzz: add fuzz testing for packfile indices.
791
+ - fuzz: add basic fuzz testing target.
792
793
An experiment to fuzz test a few areas, hopefully we can gain more
794
coverage to various areas.
795
796
+ Will merge to 'next'.
797
+
798
799
* jt/avoid-ls-refs (2018-10-07) 4 commits
800
(merged to 'next' on 2018-10-12 at 5775aabbc1)
@@ -562,17 +825,6 @@ of the repositories listed at
825
Will merge to 'master'.
826
827
565
-* mw/doc-typofixes (2018-10-07) 3 commits
566
- (merged to 'next' on 2018-10-12 at 97297b8ce9)
567
- + docs: typo: s/isimilar/similar/
568
- + docs: graph: remove unnecessary `graph_update()' call
569
- + docs: typo: s/go/to/
570
-
571
- Typofixes.
572
-
573
- Will merge to 'master'.
574
-
575
-
828
* nd/per-worktree-ref-iteration (2018-10-07) 9 commits
829
. SQUASH???
830
. reflog expire: cover reflog from all worktrees
@@ -584,21 +836,25 @@ of the repositories listed at
836
. Add a place for (not) sharing stuff between worktrees
837
. refs.c: indent with tabs, not spaces
838
839
+ Expecting a reroll.
840
+ cf. <CACsJy8DNHCxz1cL+6rFxnWvQQz3T7_j8+=5u8=CxjraRzM89mw@mail.gmail.com>
841
Ejected for now, as it seems to break t2025 when in 'pu'.
842
843
844
* np/log-graph-octopus-fix (2018-10-12) 1 commit
591
- - log: fix coloring of certain octopus merge shapes
845
+ (merged to 'next' on 2018-10-16 at aa00813683)
846
+ + log: fix coloring of certain octopus merge shapes
847
848
"git log --graph" showing an octopus merge sometimes miscounted the
849
number of display columns it is consuming to show the merge and its
850
parent commits, which has been corrected.
851
597
- Will merge to 'next'.
852
+ Will merge to 'master'.
853
854
855
* rs/subtree-fixes (2018-10-12) 5 commits
601
- - subtree: performance improvement for finding unexpected parent commits
856
+ (merged to 'next' on 2018-10-16 at be23c9343c)
857
+ + subtree: performance improvement for finding unexpected parent commits
858
(merged to 'next' on 2018-10-12 at 2b47258e04)
859
+ subtree: improve decision on merges kept in split
860
+ subtree: use commits before rejoins for splits
@@ -611,16 +867,6 @@ of the repositories listed at
867
Unless somebody objects, that is.
868
869
614
-* sf/complete-stash-list (2018-10-07) 1 commit
615
- (merged to 'next' on 2018-10-12 at ff0e9a0805)
616
- + git-completion.bash: add completion for stash list
617
-
618
- The completion script (in contrib/) lerned to complete a handful of
619
- options "git stash list" command takes.
620
-
621
- Will merge to 'master'.
622
-
623
-
870
* tb/filter-alternate-refs (2018-10-09) 4 commits
871
(merged to 'next' on 2018-10-12 at 21c14722f1)
872
+ transport.c: introduce core.alternateRefsPrefixes
@@ -641,33 +887,6 @@ of the repositories listed at
887
Will merge to 'master'.
888
889
644
-* fe/doc-updates (2018-09-21) 3 commits
645
- (merged to 'next' on 2018-10-10 at 2eea3a88bc)
646
- + git-describe.1: clarify that "human readable" is also git-readable
647
- + git-column.1: clarify initial description, provide examples
648
- + git-archimport.1: specify what kind of Arch we're talking about
649
-
650
- Doc updates.
651
-
652
- Will merge to 'master'.
653
-
654
-
655
-* md/test-cleanup (2018-10-07) 7 commits
656
- (merged to 'next' on 2018-10-10 at 7e0bf1b573)
657
- + tests: order arguments to git-rev-list properly
658
- + t9109: don't swallow Git errors upstream of pipes
659
- + tests: don't swallow Git errors upstream of pipes
660
- + t/*: fix ordering of expected/observed arguments
661
- + tests: standardize pipe placement
662
- + Documentation: add shell guidelines
663
- + t/README: reformat Do, Don't, Keep in mind lists
664
-
665
- Various test scripts have been updated for style and also correct
666
- handling of exit status of various commands.
667
-
668
- Will merge to 'master'.
669
-
670
-
890
* nd/complete-fetch-multiple-args (2018-09-21) 1 commit
891
(merged to 'next' on 2018-10-10 at f78e14123c)
892
+ completion: support "git fetch --multiple"
@@ -690,28 +909,6 @@ of the repositories listed at
909
Will merge to 'master'.
910
911
693
-* tg/t5551-with-curl-7.61.1 (2018-09-24) 2 commits
694
- (merged to 'next' on 2018-10-10 at 5ada84ed7a)
695
- + t5551: compare sorted cookies files
696
- + t5551: move setup code inside test_expect blocks
697
-
698
- Test update.
699
-
700
- Will merge to 'master'.
701
- Supersedes tz/t5551-with-curl-7.61.1 topic
702
-
703
-
704
-* jn/gc-auto-prep (2018-07-17) 2 commits
705
- (merged to 'next' on 2018-10-10 at 4ab6a62f62)
706
- + gc: exit with status 128 on failure
707
- + gc: improve handling of errors reading gc.log
708
- (this branch is used by jn/gc-auto.)
709
-
710
- Code clean-up.
711
-
712
- Will merge to 'master'.
713
-
714
-
912
* nd/status-refresh-progress (2018-09-17) 1 commit
913
(merged to 'next' on 2018-10-12 at 9240c05add)
914
+ status: show progress bar if refreshing the index takes too long
@@ -756,27 +953,6 @@ of the repositories listed at
953
Will merge to 'master'.
954
955
759
-* tq/refs-internal-comment-fix (2018-09-17) 1 commit
760
- (merged to 'next' on 2018-10-09 at 422313bbd0)
761
- + refs: docstring typo
762
-
763
- Fix for typo in a sample code in comment.
764
-
765
- Will merge to 'master'.
766
-
767
-
768
-* ts/alias-of-alias (2018-09-17) 3 commits
769
- (merged to 'next' on 2018-10-09 at ac19b4730b)
770
- + t0014: introduce an alias testing suite
771
- + alias: show the call history when an alias is looping
772
- + alias: add support for aliases of an alias
773
-
774
- An alias that expands to another alias has so far been forbidden,
775
- but now it is allowed to create such an alias.
776
-
777
- Will merge to 'master'.
778
-
779
-
956
* ds/reachable-topo-order (2018-09-21) 7 commits
957
- revision.c: refactor basic topo-order logic
958
- revision.h: add whitespace in flag definitions
@@ -789,63 +965,8 @@ of the repositories listed at
965
The revision walker machinery learned to take advantage of the
966
commit generation numbers stored in the commit-graph file.
967
792
- What's the status of this topic?
793
-
794
-
795
-* en/merge-cleanup (2018-09-20) 4 commits
796
- (merged to 'next' on 2018-10-09 at f3a00b506f)
797
- + merge-recursive: rename merge_file_1() and merge_content()
798
- + merge-recursive: remove final remaining caller of merge_file_one()
799
- + merge-recursive: avoid wrapper function when unnecessary and wasteful
800
- + merge-recursive: set paths correctly when three-way merging content
801
-
802
- Code clean-up.
803
-
804
- Will merge to 'master'.
805
-
806
-
807
-* jk/delta-islands-with-bitmap-reuse-delta-fix (2018-09-19) 1 commit
808
- (merged to 'next' on 2018-10-09 at 10e58be2af)
809
- + pack-objects: handle island check for "external" delta base
810
-
811
- Fix interactions between two recent topics.
812
-
813
- Will merge to 'master'.
814
-
815
-
816
-* jn/mailmap-update (2018-09-25) 1 commit
817
- (merged to 'next' on 2018-10-10 at fa2b394bd5)
818
- + mailmap: consistently normalize brian m. carlson's name
819
-
820
- The mailmap file update.
821
-
822
- Will merge to 'master'.
823
-
824
-
825
-* ma/config-doc-update (2018-09-20) 2 commits
826
- (merged to 'next' on 2018-10-09 at 312a873a2a)
827
- + git-config.txt: fix 'see: above' note
828
- + Doc: use `--type=bool` instead of `--bool`
829
-
830
- Doc update.
831
-
832
- Will merge to 'master'.
833
-
834
-
835
-* rj/header-check (2018-09-20) 8 commits
836
- (merged to 'next' on 2018-10-09 at 7fa9c68ef0)
837
- + delta-islands.h: add missing forward declarations (hdr-check)
838
- + midx.h: add missing forward declarations (hdr-check)
839
- + refs/refs-internal.h: add missing declarations (hdr-check)
840
- + refs/packed-backend.h: add missing declaration (hdr-check)
841
- + refs/ref-cache.h: add missing declarations (hdr-check)
842
- + ewah/ewok_rlw.h: add missing include (hdr-check)
843
- + json-writer.h: add missing include (hdr-check)
844
- + Makefile: add a hdr-check target
845
-
846
- Header files clean-up.
847
-
848
- Will merge to 'master'.
968
+ Expecting a reroll.
969
+ cf. <1c0eb7d3-7f31-9377-d42f-4ac2f36ac26a@gmail.com>
970
971
972
* bp/read-cache-parallel (2018-10-11) 7 commits
@@ -865,13 +986,14 @@ of the repositories listed at
986
987
988
* ds/coverage-diff (2018-10-10) 1 commit
868
- - contrib: add coverage-diff script
989
+ (merged to 'next' on 2018-10-16 at c12b7279d9)
990
+ + contrib: add coverage-diff script
991
992
The result of coverage test can be combined with "git blame" to
993
check the test coverage of code introduced recently with a new
994
'coverage-diff' tool (in contrib/).
995
874
- Will merge to 'next'.
996
+ Will merge to 'master'.
997
998
999
* sb/submodule-recursive-fetch-gets-the-tip (2018-10-11) 9 commits
@@ -906,23 +1028,6 @@ of the repositories listed at
1028
Will merge to 'master'.
1029
1030
909
-* ab/commit-graph-progress (2018-09-20) 3 commits
910
- (merged to 'next' on 2018-09-24 at 76f2f5c1e3)
911
- + gc: fix regression in 7b0f229222 impacting --quiet
912
- + commit-graph verify: add progress output
913
- + commit-graph write: add progress output
914
- (this branch is used by ds/commit-graph-leakfix.)
915
-
916
- (Originally merged to 'next' on 2018-09-20 at 24ca94b1d4)
917
-
918
- Generation of (expermental) commit-graph files have so far been
919
- fairly silent, even though it takes noticeable amount of time in a
920
- meaningfully large repository. The users will now see progress
921
- output.
922
-
923
- Will merge to 'master'.
924
-
925
-
1031
* ss/wt-status-committable (2018-10-03) 5 commits
1032
(merged to 'next' on 2018-10-10 at ea30d8819d)
1033
+ roll wt_status_state into wt_status and populate in the collect phase
@@ -979,7 +1084,9 @@ of the repositories listed at
1084
cf. <20181010205645.e1529eff9099805029b1d6ef@ao2.it>
1085
1086
982
-* md/filter-trees (2018-10-07) 8 commits
1087
+* md/filter-trees (2018-10-15) 9 commits
1088
+ (merged to 'next' on 2018-10-16 at 64d351d342)
1089
+ + filter-trees: code clean-up of tests
1090
(merged to 'next' on 2018-10-12 at c66e49d4ca)
1091
+ list-objects-filter: implement filter tree:0
1092
+ list-objects-filter-options: do not over-strbuf_init
@@ -1079,7 +1186,7 @@ of the repositories listed at
1186
Will merge to 'next'.
1187
1188
1082
-* ps/stash-in-c (2018-08-31) 20 commits
1189
+* ps/stash-in-c (2018-10-15) 21 commits
1190
- stash: replace all `write-tree` child processes with API calls
1191
- stash: optimize `get_untracked_files()` and `check_changes()`
1192
- stash: convert `stash--helper.c` into `stash.c`
@@ -1088,23 +1195,24 @@ of the repositories listed at
1195
- stash: convert push to builtin
1196
- stash: convert create to builtin
1197
- stash: convert store to builtin
1091
- - stash: mention options in `show` synopsis
1198
- stash: convert show to builtin
1199
- stash: convert list to builtin
1200
- stash: convert pop to builtin
1201
- stash: convert branch to builtin
1202
- stash: convert drop and clear to builtin
1203
- stash: convert apply to builtin
1204
+ - stash: mention options in `show` synopsis
1205
- stash: add tests for `git stash show` config
1206
- stash: rename test cases to be more descriptive
1100
- - stash: update test cases conform to coding guidelines
1207
+ - t3903: modernize style
1208
- stash: improve option parsing test coverage
1209
+ - strbuf.c: add `strbuf_join_argv()`
1210
- sha1-name.c: add `get_oidf()` which acts like `get_oid()`
1211
1212
"git stash" rewritten in C.
1213
1106
- Expecting a reroll.
1107
- cf. <20181010141841.GA17445@hank.intra.tgummerer.com>
1214
+ Almost there.
1215
+ cf. <20181015221040.GD4883@hank.intra.tgummerer.com>
1216
1217
1218
* pw/add-p-select (2018-07-26) 4 commits
@@ -1125,43 +1233,6 @@ of the repositories listed at
1233
end-user complaints, but let's see.
1234
1235
1128
-* ds/commit-graph-with-grafts (2018-08-21) 8 commits
1129
- (merged to 'next' on 2018-10-09 at 851a457102)
1130
- + commit-graph: close_commit_graph before shallow walk
1131
- + commit-graph: not compatible with uninitialized repo
1132
- + commit-graph: not compatible with grafts
1133
- + commit-graph: not compatible with replace objects
1134
- + test-repository: properly init repo
1135
- + commit-graph: update design document
1136
- + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
1137
- + refs.c: migrate internal ref iteration to pass thru repository argument
1138
-
1139
- The recently introduced commit-graph auxiliary data is incompatible
1140
- with mechanisms such as replace & grafts that "breaks" immutable
1141
- nature of the object reference relationship. Disable optimizations
1142
- based on its use (and updating existing commit-graph) when these
1143
- incompatible features are in use in the repository.
1144
-
1145
- Will merge to 'master'.
1146
-
1147
-
1148
-* jn/gc-auto (2018-07-17) 1 commit
1149
- (merged to 'next' on 2018-10-10 at 9f0f1f770e)
1150
- + gc: do not return error for prior errors in daemonized mode
1151
- (this branch uses jn/gc-auto-prep.)
1152
-
1153
- "gc --auto" ended up calling exit(-1) upon error, which has been
1154
- corrected to use exit(1). Also the error reporting behaviour when
1155
- daemonized has been updated to exit with zero status when stopping
1156
- due to a previously discovered error (which implies there is no
1157
- point running gc to improve the situation); we used to exit with
1158
- failure in such a case.
1159
-
1160
- Will merge to 'master'.
1161
- cf. <20180917182639.GB140909@aiede.svl.corp.google.com>
1162
- cf. <20181009234502.oxzfwirjcew2sxrm@dcvr>
1163
-
1164
-
1236
* ag/rebase-i-in-c (2018-10-09) 20 commits
1237
- rebase -i: move rebase--helper modes to rebase--interactive
1238
- rebase -i: remove git-rebase--interactive.sh
@@ -1199,109 +1270,3 @@ of the repositories listed at
1270
Rewrite of the "rebase" machinery in C.
1271
1272
Will merge to 'next' together with pk/rebase-i-in-c-6-final.
1202
-
1203
---------------------------------------------------
1204
-[Discarded]
1205
-
1206
-* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits
1207
- . submodule.c: warn about missing submodule git directories
1208
- . t2013: add test for missing but active submodule
1209
-
1210
- Discarded for a cleaned-up rewrite.
1211
- cf. <CAGZ79kYJGMOtroLhPwOdhWewXf3X_b0QOgiUb65pyJ7xJ-whQw@mail.gmail.com>
1212
-
1213
-
1214
-* sb/grep-submodule-cleanup (2018-10-10) 1 commit
1215
- . builtin/grep.c: remove superfluous submodule code
1216
-
1217
- Code clean-up.
1218
-
1219
- Discarded, expecting a future reroll.
1220
- cf. <CAGZ79kYJGMOtroLhPwOdhWewXf3X_b0QOgiUb65pyJ7xJ-whQw@mail.gmail.com>
1221
- cf. <CAGZ79kbZ35OEh=2JiZuOHgG-P3a3PeSP5hgrXX-tQh9feOQsjQ@mail.gmail.com>
1222
-
1223
-
1224
-* jk/drop-ancient-curl (2017-08-09) 5 commits
1225
- . http: #error on too-old curl
1226
- . curl: remove ifdef'd code never used with curl >=7.19.4
1227
- . http: drop support for curl < 7.19.4
1228
- . http: drop support for curl < 7.16.0
1229
- . http: drop support for curl < 7.11.1
1230
-
1231
- Some code in http.c that has bitrot is being removed.
1232
-
1233
-
1234
-* ds/format-commit-graph-docs (2018-08-21) 2 commits
1235
- . commit-graph.txt: improve formatting for asciidoc
1236
- . Docs: Add commit-graph tech docs to Makefile
1237
-
1238
- Design docs for the commit-graph machinery is now made into HTML as
1239
- well as text.
1240
-
1241
-
1242
-* bw/submodule-name-to-dir (2018-08-10) 2 commits
1243
- . submodule: munge paths to submodule git directories
1244
- . submodule: create helper to build paths to submodule gitdirs
1245
-
1246
- In modern repository layout, the real body of a cloned submodule
1247
- repository is held in .git/modules/ of the superproject, indexed by
1248
- the submodule name. URLencode the submodule name before computing
1249
- the name of the directory to make sure they form a flat namespace.
1250
-
1251
- Discarded, expecting further work on the topic.
1252
- cf. <CAGZ79kYnbjaPoWdda0SM_-_X77mVyYC7JO61OV8nm2yj3Q1OvQ@mail.gmail.com>
1253
-
1254
-
1255
-* ng/status-i-short-for-ignored (2018-08-09) 1 commit
1256
- . status: -i shorthand for --ignored command line option
1257
-
1258
- "git status --ignored" gained a shorthand "git status -i".
1259
-
1260
- Discarded after hearing no strong support.
1261
-
1262
-
1263
-* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits
1264
- . commit: fix exit code when doing a dry run
1265
- . wt-status: teach wt_status_collect about merges in progress
1266
- . wt-status: rename commitable to committable
1267
- . t7501: add coverage for flags which imply dry runs
1268
-
1269
- "git commit --dry-run" gave a correct exit status even during a
1270
- conflict resolution toward a merge, but it did not with the
1271
- "--short" option, which has been corrected.
1272
-
1273
- Seems to break 7512, 3404 and 7060 in 'pu'.
1274
-
1275
-
1276
-* ma/wrapped-info (2018-05-28) 2 commits
1277
- . usage: prefix all lines in `vreportf()`, not just the first
1278
- . usage: extract `prefix_suffix_lines()` from `advise()`
1279
-
1280
- An attempt to help making multi-line messages fed to warning(),
1281
- error(), and friends more easily translatable.
1282
-
1283
- Will discard and wait for a cleaned-up rewrite.
1284
- cf. <20180529213957.GF7964@sigill.intra.peff.net>
1285
-
1286
-
1287
-* hn/bisect-first-parent (2018-04-21) 1 commit
1288
- . bisect: create 'bisect_flags' parameter in find_bisection()
1289
- (this branch is used by tb/bisect-first-parent.)
1290
-
1291
- Preliminary code update to allow passing more flags down the
1292
- bisection codepath in the future.
1293
-
1294
-
1295
-* pb/bisect-helper-2 (2018-07-23) 8 commits
1296
- . t6030: make various test to pass GETTEXT_POISON tests
1297
- . bisect--helper: `bisect_start` shell function partially in C
1298
- . bisect--helper: `get_terms` & `bisect_terms` shell function in C
1299
- . bisect--helper: `bisect_next_check` shell function in C
1300
- . bisect--helper: `check_and_set_terms` shell function in C
1301
- . wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
1302
- . bisect--helper: `bisect_write` shell function in C
1303
- . bisect--helper: `bisect_reset` shell function in C
1304
-
1305
- cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
1306
- ... there is no update to address any of the review comments
1307
- in the thread above.