What's cooking (2021/12 #03)
Junio C Hamano committed
Dec 10, 2021 at 15:39 UTC
0f3654c4b7173328a1ad42949f202eddddeeea38
1 file changed
+751
-668
whats-cooking.txt
+751
-668
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2021, #02; Tue, 7)
4
-X-master-at: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa
5
-X-next-at: 8cdad7bc9aee8e9403eb7f1ef605b37815892e18
3
+Subject: What's cooking in git.git (Dec 2021, #03; Fri, 10)
4
+X-master-at: e773545c7fe7eca21b134847f4fc2cbc9547fa14
5
+X-next-at: fae76fe5da3df25d752f2251b7ccda3f62813aa9
6
7
-What's cooking in git.git (Dec 2021, #02; Tue, 7)
7
+What's cooking in git.git (Dec 2021, #03; Fri, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,9 +46,540 @@ Release tarballs are available at:
46
47
https://www.kernel.org/pub/software/scm/git/
48
49
+--------------------------------------------------
50
+[Graduated to 'master']
51
+
52
+* ab/checkout-branch-info-leakfix (2021-11-18) 1 commit
53
+ (merged to 'next' on 2021-12-02 at 5922388782)
54
+ + checkout: fix "branch info" memory leaks
55
+
56
+ Leakfix.
57
+ source: <patch-v4-1.1-57bcd0cbc23-20211116T182604Z-avarab@gmail.com>
58
+
59
+
60
+* ab/generate-command-list (2021-11-05) 10 commits
61
+ (merged to 'next' on 2021-12-02 at 37a575b37f)
62
+ + generate-cmdlist.sh: don't parse command-list.txt thrice
63
+ + generate-cmdlist.sh: replace "grep' invocation with a shell version
64
+ + generate-cmdlist.sh: do not shell out to "sed"
65
+ + generate-cmdlist.sh: stop sorting category lines
66
+ + generate-cmdlist.sh: replace for loop by printf's auto-repeat feature
67
+ + generate-cmdlist.sh: run "grep | sort", not "sort | grep"
68
+ + generate-cmdlist.sh: don't call get_categories() from category_list()
69
+ + generate-cmdlist.sh: spawn fewer processes
70
+ + generate-cmdlist.sh: trivial whitespace change
71
+ + command-list.txt: sort with "LC_ALL=C sort"
72
+
73
+ Build optimization.
74
+ source: <cover-v3-00.10-00000000000-20211105T135058Z-avarab@gmail.com>
75
+
76
+
77
+* ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit
78
+ (merged to 'next' on 2021-12-02 at 1b49913760)
79
+ + pull: don't say that merge is "the default strategy"
80
+
81
+ The advice message given by "git pull" when the user hasn't made a
82
+ choice between merge and rebase still said that the merge is the
83
+ default, which no longer is the case. This has been corrected.
84
+ source: <20211118154317.639118-1-alexhenrie24@gmail.com>
85
+
86
+
87
+* bc/require-c99 (2021-12-01) 1 commit
88
+ (merged to 'next' on 2021-12-02 at 76aa8bc2d0)
89
+ + git-compat-util: add a test balloon for C99 support
90
+ (this branch is used by jk/limit-developers-to-gnu99.)
91
+
92
+ Weather balloon to break people with compilers that do not support
93
+ C99.
94
+ source: <20211201014050.38002-1-sandals@crustytoothpaste.net>
95
+
96
+
97
+* cb/add-p-single-key-fix (2021-11-28) 1 commit
98
+ (merged to 'next' on 2021-12-03 at 8d4f16e620)
99
+ + add -p: avoid use of undefined $key when ReadKey -> EOF
100
+
101
+ The single-key-input mode in "git add -p" had some code to handle
102
+ keys that generate a sequence of input via ReadKey(), which did not
103
+ handle end-of-file correctly, which has been fixed.
104
+ source: <20211128174903.5623-1-carenas@gmail.com>
105
+
106
+
107
+* cb/mingw-gmtime-r (2021-11-27) 1 commit
108
+ (merged to 'next' on 2021-12-03 at 785278d40e)
109
+ + mingw: avoid fallback for {local,gm}time_r()
110
+
111
+ Build fix on Windows.
112
+ source: <pull.1142.v2.git.git.1638008132992.gitgitgadget@gmail.com>
113
+
114
+
115
+* cw/protocol-v2-doc-fix (2021-11-11) 1 commit
116
+ (merged to 'next' on 2021-12-02 at 59f42a7cfc)
117
+ + protocol-v2.txt: align delim-pkt spec with usage
118
+
119
+ Doc update.
120
+ source: <20211111220048.1702896-1-calvinwan@google.com>
121
+
122
+
123
+* em/missing-pager (2021-11-24) 1 commit
124
+ (merged to 'next' on 2021-12-03 at 22ad721b52)
125
+ + pager: fix crash when pager program doesn't exist
126
+
127
+ When a non-existent program is given as the pager, we tried to
128
+ reuse an uninitialized child_process structure and crashed, which
129
+ has been fixed.
130
+ source: <20211125000239.2336-1-ematsumiya@suse.de>
131
+
132
+
133
+* en/rebase-x-fix (2021-11-29) 1 commit
134
+ (merged to 'next' on 2021-12-03 at a833829733)
135
+ + sequencer: avoid adding exec commands for non-commit creating commands
136
+
137
+ "git rebase -x" added an unnecessary 'exec' instructions before
138
+ 'noop', which has been corrected.
139
+ source: <pull.1149.git.git.1638244719381.gitgitgadget@gmail.com>
140
+
141
+
142
+* gc/remote-with-fewer-static-global-variables (2021-11-18) 5 commits
143
+ (merged to 'next' on 2021-12-02 at d7ea1696e5)
144
+ + remote: die if branch is not found in repository
145
+ + remote: remove the_repository->remote_state from static methods
146
+ + remote: use remote_state parameter internally
147
+ + remote: move static variables into per-repository struct
148
+ + t5516: add test case for pushing remote refspecs
149
+
150
+ Code clean-up to eventually allow information on remotes defined
151
+ for an arbitrary repository to be read.
152
+ source: <20211118005325.64971-1-chooglen@google.com>
153
+
154
+
155
+* hk/ci-checkwhitespace-commentfix (2021-11-19) 1 commit
156
+ (merged to 'next' on 2021-12-02 at 971178fe99)
157
+ + ci(check-whitespace): update stale file top comments
158
+
159
+ Comment fix.
160
+ source: <pull.1143.git.git.1637347813367.gitgitgadget@gmail.com>
161
+
162
+
163
+* hn/create-reflog-simplify (2021-11-22) 1 commit
164
+ (merged to 'next' on 2021-12-02 at 87ff49b776)
165
+ + refs: drop force_create argument of create_reflog API
166
+ (this branch is used by hn/reftable-coverity-fixes.)
167
+
168
+ A small simplification of API.
169
+ source: <pull.1144.git.git.1637590749342.gitgitgadget@gmail.com>
170
+
171
+
172
+* if/redact-packfile-uri (2021-11-11) 2 commits
173
+ (merged to 'next' on 2021-12-02 at 81213be9ac)
174
+ + http-fetch: redact url on die() message
175
+ + fetch-pack: redact packfile urls in traces
176
+
177
+ Redact the path part of packfile URI that appears in the trace output.
178
+ source: <pull.1052.v7.git.1636588289.gitgitgadget@gmail.com>
179
+
180
+
181
+* ja/doc-cleanup (2021-11-09) 10 commits
182
+ (merged to 'next' on 2021-12-02 at f72204942f)
183
+ + init doc: --shared=0xxx does not give umask but perm bits
184
+ + doc: git-init: clarify file modes in octal.
185
+ + doc: git-http-push: describe the refs as pattern pairs
186
+ + doc: uniformize <URL> placeholders' case
187
+ + doc: use three dots for indicating repetition instead of star
188
+ + doc: git-ls-files: express options as optional alternatives
189
+ + doc: use only hyphens as word separators in placeholders
190
+ + doc: express grammar placeholders between angle brackets
191
+ + doc: split placeholders as individual tokens
192
+ + doc: fix git credential synopsis
193
+
194
+ Doc update.
195
+ source: <20211106184858.11500-1-jn.avila@free.fr>
196
+
197
+
198
+* jc/fix-first-object-walk (2021-10-29) 2 commits
199
+ (merged to 'next' on 2021-12-02 at 43a5c1ec03)
200
+ + docs: add headers in MyFirstObjectWalk
201
+ + docs: fix places that break compilation in MyFirstObjectWalk
202
+
203
+ Doc update.
204
+ source: <pull.1063.v3.git.1635537163.gitgitgadget@gmail.com>
205
+
206
+
207
+* jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit
208
+ (merged to 'next' on 2021-12-02 at e2cc1ae46a)
209
+ + fetch-pack: ignore SIGPIPE when writing to index-pack
210
+
211
+ "git fetch", when received a bad packfile, can fail with SIGPIPE.
212
+ This wasn't wrong per-se, but we now detect the situation and fail
213
+ in a more predictable way.
214
+ source: <YZgQD3lrw4+i4EMd@coredump.intra.peff.net>
215
+
216
+
217
+* jk/jump-merge-with-pathspec (2021-11-09) 1 commit
218
+ (merged to 'next' on 2021-12-02 at fea901973d)
219
+ + git-jump: pass "merge" arguments to ls-files
220
+
221
+ The "merge" subcommand of "git jump" (in contrib/) silently ignored
222
+ pathspec and other parameters.
223
+ source: <YYqjY/zcBWyqY8/5@coredump.intra.peff.net>
224
+
225
+
226
+* jk/refs-g11-workaround (2021-11-19) 1 commit
227
+ (merged to 'next' on 2021-12-02 at 1025235670)
228
+ + refs: work around gcc-11 warning with REF_HAVE_NEW
229
+
230
+ Workaround for a false-alarm by gcc-11
231
+ source: <YZgW/pz6CbpaywDa@coredump.intra.peff.net>
232
+
233
+
234
+* jk/strbuf-addftime-seconds-since-epoch (2021-11-04) 1 commit
235
+ (merged to 'next' on 2021-12-02 at d0b158d899)
236
+ + strbuf_addftime(): handle "%s" manually
237
+
238
+ The "--date=format:<strftime>" gained a workaround for the lack of
239
+ system support for a non-local timezone to handle "%s" placeholder.
240
+ source: <YYEihoLbEGi44dDb@coredump.intra.peff.net>
241
+
242
+
243
+* jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit
244
+ (merged to 'next' on 2021-12-02 at 0ac4fd64aa)
245
+ + t5319: corrupt more bytes of the midx checksum
246
+
247
+ Test fix.
248
+ source: <YZQk6t1veegeAlYh@coredump.intra.peff.net>
249
+
250
+
251
+* jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits
252
+ (merged to 'next' on 2021-12-02 at eefd61931f)
253
+ + t7006: simplify exit-code checks for sigpipe tests
254
+ + t7006: clean up SIGPIPE handling in trace2 tests
255
+ + run-command: unify signal and regular logic for wait_or_whine()
256
+
257
+ The function to cull a child process and determine the exit status
258
+ had two separate code paths for normal callers and callers in a
259
+ signal handler, and the latter did not yield correct value when the
260
+ child has caught a signal. The handling of the exit status has
261
+ been unified for these two code paths. An existing test with
262
+ flakiness has also been corrected.
263
+ source: <YZrSALOrdhuunHwp@coredump.intra.peff.net>
264
+
265
+
266
+* jk/test-bitmap-fix (2021-11-05) 1 commit
267
+ (merged to 'next' on 2021-12-02 at c273d402fb)
268
+ + test_bitmap_hashes(): handle repository without bitmaps
269
+
270
+ Tighten code for testing pack-bitmap.
271
+ source: <YYTy6+DG5guzJIO7@coredump.intra.peff.net>
272
+
273
+
274
+* js/ci-no-directional-formatting (2021-11-04) 1 commit
275
+ (merged to 'next' on 2021-12-02 at bc756bc586)
276
+ + ci: disallow directional formatting
277
+
278
+ CI has been taught to catch some Unicode directional formatting
279
+ sequence that can be used in certain mischief.
280
+ source: <pull.1071.v3.git.1636031609982.gitgitgadget@gmail.com>
281
+
282
+
283
+* js/trace2-avoid-recursive-errors (2021-11-18) 1 commit
284
+ (merged to 'next' on 2021-12-02 at c5b1e5ddec)
285
+ + trace2: disable tr2_dst before warning on write errors
286
+
287
+ trace2 error code path fix.
288
+ source: <5a9e49e7f1540d762374382e1769edf112cf093f.1637272706.git.steadmon@google.com>
289
+
290
+
291
+* jt/midx-doc-fix (2021-11-22) 1 commit
292
+ (merged to 'next' on 2021-12-02 at eac9f263ae)
293
+ + Doc: no midx and partial clone relation
294
+
295
+ Docfix.
296
+ source: <20211122184114.3328662-1-jonathantanmy@google.com>
297
+
298
+
299
+* jt/pack-header-lshift-overflow (2021-11-11) 1 commit
300
+ (merged to 'next' on 2021-12-02 at 89c37479db)
301
+ + packfile: avoid overflowing shift during decode
302
+
303
+ The code to decode the length of packed object size has been
304
+ corrected.
305
+ source: <20211110234033.3144165-1-jonathantanmy@google.com>
306
+
307
+
308
+* mp/absorb-submodule-git-dir-upon-deinit (2021-11-19) 1 commit
309
+ (merged to 'next' on 2021-12-03 at afc462a692)
310
+ + submodule: absorb git dir instead of dying on deinit
311
+
312
+ "git submodule deinit" for a submodule whose .git metadata
313
+ directory is embedded in its working tree refused to work, until
314
+ the submodule gets converted to use the "absorbed" form where the
315
+ metadata directory is stored in superproject, and a gitfile at the
316
+ top-level of the working tree of the submodule points at it. The
317
+ command is taught to convert such submodules to the absorbed form
318
+ as needed.
319
+ source: <pull.1078.v7.git.git.1637319387717.gitgitgadget@gmail.com>
320
+
321
+
322
+* po/size-t-for-vs (2021-12-01) 3 commits
323
+ (merged to 'next' on 2021-12-02 at 489c5b0046)
324
+ + object-file.c: LLP64 compatibility, upcast unity for left shift
325
+ + diffcore-delta.c: LLP64 compatibility, upcast unity for left shift
326
+ + repack.c: LLP64 compatibility, upcast unity for left shift
327
+
328
+ On platforms where ulong is shorter than size_t, code paths that
329
+ shifted 1 or 1U to the left lacked the necessary cast to size_t,
330
+ which have been corrected.
331
+ source: <20211201002902.1042-4-philipoakley@iee.email>
332
+
333
+
334
+* rs/mergesort (2021-11-18) 1 commit
335
+ (merged to 'next' on 2021-12-02 at 0490b0ffbd)
336
+ + mergesort: avoid left shift overflow
337
+
338
+ Bitop fix for platforms whose "long" is 32-bit.
339
+ source: <5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de>
340
+
341
+
342
+* tl/midx-docfix (2021-11-18) 1 commit
343
+ (merged to 'next' on 2021-12-02 at 0fae3ebdef)
344
+ + midx: fix a formatting issue in "multi-pack-index.txt"
345
+
346
+ Doc mark-up fix.
347
+ source: <9b910a44f4143c94787110a688f2b17ba4eeb0fc.1637218943.git.dyroneteng@gmail.com>
348
+
349
+
350
+* tw/var-default-branch (2021-11-03) 1 commit
351
+ (merged to 'next' on 2021-12-02 at 944512852e)
352
+ + var: add GIT_DEFAULT_BRANCH variable
353
+
354
+ "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
355
+ the newly created branch if "git init" is run.
356
+ source: <20211103201702.117771-1-thomas@t-8ch.de>
357
+
358
+
359
+* vd/sparse-reset (2021-11-29) 8 commits
360
+ (merged to 'next' on 2021-12-02 at 47b1095f39)
361
+ + unpack-trees: improve performance of next_cache_entry
362
+ + reset: make --mixed sparse-aware
363
+ + reset: make sparse-aware (except --mixed)
364
+ + reset: integrate with sparse index
365
+ + reset: expand test coverage for sparse checkouts
366
+ + sparse-index: update command for expand/collapse test
367
+ + reset: preserve skip-worktree bit in mixed reset
368
+ + reset: rename is_missing to !is_in_reset_tree
369
+ (this branch is used by ds/fetch-pull-with-sparse-index and ld/sparse-diff-blame.)
370
+
371
+ Various operating modes of "git reset" have been made to work
372
+ better with the sparse index.
373
+ source: <pull.1048.v6.git.1638201164.gitgitgadget@gmail.com>
374
+
375
+
376
+* vd/sparse-sparsity-fix-on-read (2021-11-24) 4 commits
377
+ (merged to 'next' on 2021-12-02 at 1ec68669cb)
378
+ + sparse-index: update do_read_index to ensure correct sparsity
379
+ + sparse-index: add ensure_correct_sparsity function
380
+ + sparse-index: avoid unnecessary cache tree clearing
381
+ + test-read-cache.c: prepare_repo_settings after config init
382
+
383
+ Ensure that the sparseness of the in-core index matches the
384
+ index.sparse configuration specified by the repository immediately
385
+ after the on-disk index file is read.
386
+ source: <pull.1059.v5.git.1637626833.gitgitgadget@gmail.com>
387
+
388
+
389
+* yn/complete-date-format-options (2021-11-25) 1 commit
390
+ (merged to 'next' on 2021-12-03 at 4f37a904a1)
391
+ + completion: add human and auto: date format
392
+
393
+ The completion script (in contrib/) learns that the "--date"
394
+ option of commands from the "git log" family takes "human" and
395
+ "auto" as valid values.
396
+ source: <pull.1083.git.1637666875171.gitgitgadget@gmail.com>
397
+
398
--------------------------------------------------
399
[New Topics]
400
401
+* en/sparse-checkout-set (2021-12-08) 10 commits
402
+ - clone: avoid using deprecated `sparse-checkout init`
403
+ - Documentation: clarify/correct a few sparsity related statements
404
+ - git-sparse-checkout.txt: update to document init/set/reapply changes
405
+ - sparse-checkout: enable reapply to take --[no-]{cone,sparse-index}
406
+ - sparse-checkout: enable `set` to initialize sparse-checkout mode
407
+ - sparse-checkout: split out code for tweaking settings config
408
+ - sparse-checkout: disallow --no-stdin as an argument to set
409
+ - sparse-checkout: add sanity-checks on initial sparsity state
410
+ - sparse-checkout: break apart functions for sparse_checkout_(set|add)
411
+ - sparse-checkout: pass use_stdin as a parameter instead of as a global
412
+
413
+
414
+ The "init" and "set" subcommands in "git sparse-checkout" have been
415
+ unified for a better user experience and performance.
416
+
417
+ Need to check the reroll.
418
+ cf. <pull.1151.v3.git.git.1639108573.gitgitgadget@gmail.com>
419
+ source: <pull.1151.v2.git.git.1638908410.gitgitgadget@gmail.com>
420
+
421
+
422
+* hn/reftable-coverity-fixes (2021-12-08) 13 commits
423
+ - reftable: make reftable_record a tagged union
424
+ - reftable: handle null refnames in reftable_ref_record_equal
425
+ - reftable: drop stray printf in readwrite_test
426
+ - reftable: order unittests by complexity
427
+ - reftable: fix NULL derefs in error paths
428
+ - reftable: fix resource warning
429
+ - reftable: ignore remove() return value in stack_test.c
430
+ - reftable: check reftable_stack_auto_compact() return value
431
+ - reftable: fix resource leak blocksource.c
432
+ - reftable: fix resource leak in error path
433
+ - reftable: fix OOB stack write in print functions
434
+ - Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes
435
+ - Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
436
+ (this branch uses hn/reftable.)
437
+
438
+ Problems identified by Coverity in the reftable code have been
439
+ corrected.
440
+
441
+ source: <pull.1152.v2.git.git.1639000187.gitgitgadget@gmail.com>
442
+
443
+
444
+* jc/make-test-all (2021-12-08) 1 commit
445
+ - Makefile: add test-all target
446
+
447
+ "make test" target in subdirectories of contrib/ are now exercised
448
+ in CI tests.
449
+
450
+ source: <xmqqh7bi27o9.fsf@gitster.g>
451
+
452
+
453
+* jk/limit-developers-to-gnu99 (2021-12-08) 2 commits
454
+ - config.mak.dev: specify -std=gnu99 for gcc/clang
455
+ - Merge branch 'bc/require-c99' into jk/limit-developers-to-gnu99
456
+
457
+ Enable -std=gnu99 option in DEVELOPER builds.
458
+
459
+ Will merge to 'next'.
460
+ source: <YbEMnksMEuAz3Nt0@coredump.intra.peff.net>
461
+
462
+
463
+* tb/midx-bitmap-corruption-fix (2021-12-08) 2 commits
464
+ - midx.c: make changing the preferred pack safe
465
+ - t5326: demonstrate bitmap corruption after permutation
466
+
467
+ A bug that made multi-pack bitmap and the object order out-of-sync
468
+ (hence the .midx data gets corrupted) has been fixed.
469
+
470
+ Will merge to 'next'?
471
+ source: <cover.1638991570.git.me@ttaylorr.com>
472
+
473
+
474
+* es/test-chain-lint (2021-12-09) 19 commits
475
+ - t6000-t9999: detect and signal failure within loop
476
+ - t5000-t5999: detect and signal failure within loop
477
+ - t4000-t4999: detect and signal failure within loop
478
+ - t0000-t3999: detect and signal failure within loop
479
+ - tests: simplify by dropping unnecessary `for` loops
480
+ - tests: apply modern idiom for exiting loop upon failure
481
+ - tests: apply modern idiom for signaling test failure
482
+ - tests: fix broken &&-chains in `{...}` groups
483
+ - tests: fix broken &&-chains in `$(...)` command substitutions
484
+ - tests: fix broken &&-chains in compound statements
485
+ - tests: use test_write_lines() to generate line-oriented output
486
+ - tests: simplify construction of large blocks of text
487
+ - t9107: use shell parameter expansion to avoid breaking &&-chain
488
+ - t6300: make `%(raw:size) --shell` test more robust
489
+ - t5516: drop unnecessary subshell and command invocation
490
+ - t4202: clarify intent by creating expected content less cleverly
491
+ - t1020: avoid aborting entire test script when one test fails
492
+ - t1010: fix unnoticed failure on Windows
493
+ - t/lib-pager: use sane_unset() to avoid breaking &&-chain
494
+
495
+ Broken &&-chains in the test scripts have been corrected.
496
+
497
+ Will merge to 'next'?
498
+ source: <20211209051115.52629-1-sunshine@sunshineco.com>
499
+
500
+
501
+* jc/flex-array-definition (2021-12-08) 1 commit
502
+ - flex-array: simplify compiler-specific workaround
503
+
504
+ The conditions to choose different definitions of the FLEX_ARRAY
505
+ macro for vendor compilers has been simplified to make it easier to
506
+ maintain.
507
+
508
+ Will merge to 'next'?
509
+ source: <pull.1094.git.1638823724410.gitgitgadget@gmail.com>
510
+
511
+
512
+* jh/make-p4-python3-only (2021-12-09) 6 commits
513
+ - git-p4: Resolve RCS keywords in binary
514
+ - git-p4: Eliminate decode_stream and encode_stream
515
+ - git-p4: Decode byte strings before printing
516
+ - git-p4: Removed support for Python 2
517
+ - git-p4: Don't print shell commands as python lists
518
+ - git-p4: Always pass cmd arguments to subprocess as a python lists
519
+
520
+ Support for Python2 in "git p4" has been removed (not just
521
+ deprecated).
522
+
523
+ Need to check the reroll.
524
+ cf. <20211210153101.35433-1-jholdsworth@nvidia.com>
525
+ source: <20211209201029.136886-1-jholdsworth@nvidia.com>
526
+
527
+--------------------------------------------------
528
+[Stalled]
529
+
530
+* ar/submodule-update (2021-10-13) 9 commits
531
+ . submodule--helper: rename helper functions
532
+ . submodule--helper: remove unused helpers
533
+ . submodule: move core cmd_update() logic to C
534
+ . submodule--helper: run update using child process struct
535
+ . submodule--helper: allow setting superprefix for init_submodule()
536
+ . submodule--helper: refactor get_submodule_displaypath()
537
+ . submodule--helper: rename helpers for update-clone
538
+ . submodule--helper: get remote names from any repository
539
+ . submodule--helper: split up ensure_core_worktree()
540
+
541
+ Rewrite of "git submodule update" in C.
542
+
543
+ Expecting a reroll?
544
+ cf. <YWiXL+plA7GHfuVv@google.com>
545
+ source: <20211013051805.45662-10-raykar.ath@gmail.com>
546
+
547
+
548
+* ms/customizable-ident-expansion (2021-09-01) 1 commit
549
+ - keyword expansion: make "$Id$" string configurable
550
+
551
+ Instead of "$Id$", user-specified string (like $FreeBSD$) can be
552
+ used as an in-blob placeholder for keyword expansion.
553
+
554
+ Will discard.
555
+ Stalled for too long.
556
+ cf. <xmqqfsuosvrh.fsf@gitster.g>
557
+ cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
558
+ source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>
559
+
560
+--------------------------------------------------
561
+[Cooking]
562
+
563
+* pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits
564
+ - rebase -m: don't fork git checkout
565
+ - rebase --apply: set ORIG_HEAD correctly
566
+ - rebase --apply: fix reflog
567
+ - reset_head(): take struct rebase_head_opts
568
+ - rebase: cleanup reset_head() calls
569
+ - reset_head(): make default_reflog_action optional
570
+ - reset_head(): factor out ref updates
571
+ - create_autostash(): remove unneeded parameter
572
+ - reset_head(): remove action parameter
573
+ - rebase --apply: don't run post-checkout hook if there is an error
574
+ - rebase: do not remove untracked files on checkout
575
+ - rebase: pass correct arguments to post-checkout hook
576
+ - t5403: refactor rebase post-checkout hook tests
577
+ - rebase: factor out checkout for up to date branch
578
+
579
+ Fix "some issues" in a helper function reset_head().
580
+ source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>
581
+
582
+
583
* je/http-better-error-output (2021-12-03) 1 commit
584
. http-backend: give a hint that web browser access is not supported
585
@@ -66,60 +597,66 @@ Release tarballs are available at:
597
598
599
* es/doc-stdout-vs-stderr (2021-12-04) 1 commit
69
- - CodingGuidelines: document which output goes to stdout vs. stderr
600
+ (merged to 'next' on 2021-12-07 at d6487c1256)
601
+ + CodingGuidelines: document which output goes to stdout vs. stderr
602
603
Coding guideline document has been updated to clarify what goes to
604
standard error i nour system.
605
74
- Will merge to 'next'.
606
+ Will merge to 'master'.
607
source: <20211202223110.22062-1-sunshine@sunshineco.com>
608
609
610
* tb/pack-revindex-on-disk-cleanup (2021-12-04) 1 commit
79
- - packfile: make `close_pack_revindex()` static
611
+ (merged to 'next' on 2021-12-07 at 912c270b70)
612
+ + packfile: make `close_pack_revindex()` static
613
614
Code clean-up.
615
83
- Will merge to 'next'.
616
+ Will merge to 'master'.
617
source: <dad2b73c84f1c1575a6bce04a449ee1236680b10.1638658219.git.me@ttaylorr.com>
618
619
620
* ds/sparse-deep-pattern-checkout-fix (2021-12-06) 2 commits
88
- - unpack-trees: use traverse_path instead of name
89
- - t1092: add deeper changes during a checkout
621
+ (merged to 'next' on 2021-12-07 at 7b7f74216a)
622
+ + unpack-trees: use traverse_path instead of name
623
+ + t1092: add deeper changes during a checkout
624
625
The sparse-index/sparse-checkout feature had a bug in its use of
626
the matching code to determine which path is in or outside the
627
sparse checkout patterns.
628
95
- Will merge to 'next'.
629
+ Will merge to 'master'.
630
source: <pull.1092.v2.git.1638799837.gitgitgadget@gmail.com>
631
632
633
* en/name-rev-shorter-output (2021-12-04) 1 commit
100
- - name-rev: prefer shorter names over following merges
634
+ (merged to 'next' on 2021-12-10 at ae8ec3912f)
635
+ + name-rev: prefer shorter names over following merges
636
637
"git name-rev" has been tweaked to give output that is shorter and
638
easier to understand.
639
105
- Will merge to 'next'?
640
+ Will merge to 'master'.
641
source: <pull.1119.git.git.1636762454792.gitgitgadget@gmail.com>
642
643
644
* en/rebase-x-wo-git-dir-env (2021-12-04) 1 commit
110
- - sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'
645
+ (merged to 'next' on 2021-12-07 at 44f2663314)
646
+ + sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'
647
648
"git rebase -x" by mistake started exporting the GIT_DIR and
649
GIT_WORK_TREE environment variables when the command was rewritten
650
in C, which has been corrected.
651
116
- Will merge to 'next'.
652
+ Will merge to 'master'.
653
source: <pull.1134.v3.git.git.1638596219656.gitgitgadget@gmail.com>
654
655
656
* es/worktree-chatty-to-stderr (2021-12-04) 2 commits
121
- - git-worktree.txt: add missing `-v` to synopsis for `worktree list`
122
- - worktree: send "chatty" messages to stderr
657
+ (merged to 'next' on 2021-12-07 at 84ba7de37c)
658
+ + git-worktree.txt: add missing `-v` to synopsis for `worktree list`
659
+ + worktree: send "chatty" messages to stderr
660
661
"git worktree add" showed "Preparing worktree" message to the
662
standard output stream, but when it failed, the message from die()
@@ -128,7 +665,7 @@ Release tarballs are available at:
665
confusing output. It has been corrected by sending all the chatty
666
messages to the standard error stream.
667
131
- Will merge to 'next'.
668
+ Will merge to 'master'.
669
source: <20211203034420.47447-1-sunshine@sunshineco.com>
670
671
@@ -152,26 +689,28 @@ Release tarballs are available at:
689
690
691
* js/test-initial-branch-override-cleanup (2021-12-05) 1 commit
155
- - tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed
692
+ (merged to 'next' on 2021-12-07 at 0ab3e72b4f)
693
+ + tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed
694
695
Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
696
mechanism to force "git" to use 'master' as the default name for
697
the initial branch no longer need it; the use of the mechanism from
698
them have been removed.
699
162
- Will merge to 'next'.
700
+ Will merge to 'master'.
701
source: <pull.1089.git.1638524353230.gitgitgadget@gmail.com>
702
703
704
* ab/die-with-bug (2021-12-07) 4 commits
167
- - object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type()
168
- - pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)
169
- - strbuf.h: use BUG(...) not die("BUG: ...")
170
- - pack-objects: use BUG(...) not die("BUG: ...")
705
+ (merged to 'next' on 2021-12-08 at 9b7440fafd)
706
+ + object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type()
707
+ + pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)
708
+ + strbuf.h: use BUG(...) not die("BUG: ...")
709
+ + pack-objects: use BUG(...) not die("BUG: ...")
710
711
Code clean-up.
712
174
- Will merge to 'next'.
713
+ Will merge to 'master'.
714
source: <cover-v2-0.4-00000000000-20211207T110440Z-avarab@gmail.com>
715
716
@@ -215,78 +754,20 @@ Release tarballs are available at:
754
which has been corrected.
755
756
Will merge to 'next'.
218
- source: <patch-v5-1.1-69ab40d623b-20211207T215115Z-avarab@gmail.com>
219
-
220
-
221
-* ew/cbtree-remove-unused-and-broken-cb-unlink (2021-12-07) 1 commit
222
- - cbtree: remove broken and unused cb_unlink
223
-
224
- Code clean-up.
225
-
226
- Will merge to 'next'.
227
- source: <20211207183810.688481-1-e@80x24.org>
228
-
229
---------------------------------------------------
230
-[Stalled]
231
-
232
-* ar/submodule-update (2021-10-13) 9 commits
233
- . submodule--helper: rename helper functions
234
- . submodule--helper: remove unused helpers
235
- . submodule: move core cmd_update() logic to C
236
- . submodule--helper: run update using child process struct
237
- . submodule--helper: allow setting superprefix for init_submodule()
238
- . submodule--helper: refactor get_submodule_displaypath()
239
- . submodule--helper: rename helpers for update-clone
240
- . submodule--helper: get remote names from any repository
241
- . submodule--helper: split up ensure_core_worktree()
242
-
243
- Rewrite of "git submodule update" in C.
244
-
245
- Expecting a reroll?
246
- cf. <YWiXL+plA7GHfuVv@google.com>
247
- source: <20211013051805.45662-10-raykar.ath@gmail.com>
248
-
249
-
250
-* ms/customizable-ident-expansion (2021-09-01) 1 commit
251
- - keyword expansion: make "$Id$" string configurable
252
-
253
- Instead of "$Id$", user-specified string (like $FreeBSD$) can be
254
- used as an in-blob placeholder for keyword expansion.
255
-
256
- Will discard.
257
- Stalled for too long.
258
- cf. <xmqqfsuosvrh.fsf@gitster.g>
259
- cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
260
- source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>
757
+ source: <patch-v5-1.1-69ab40d623b-20211207T215115Z-avarab@gmail.com>
758
759
263
-* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
264
- - rebase -m: don't fork git checkout
265
- - rebase --apply: set ORIG_HEAD correctly
266
- - rebase --apply: fix reflog
267
- - reset_head(): take struct rebase_head_opts
268
- - rebase: cleanup reset_head() calls
269
- - reset_head(): make default_reflog_action optional
270
- - reset_head(): factor out ref updates
271
- - reset_head(): remove action parameter
272
- - reset_head(): don't run checkout hook if there is an error
273
- - reset_head(): fix checkout
274
- - rebase: factor out checkout for up to date branch
275
- - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head
760
+* ew/cbtree-remove-unused-and-broken-cb-unlink (2021-12-07) 1 commit
761
+ (merged to 'next' on 2021-12-07 at e37b4e16d0)
762
+ + cbtree: remove broken and unused cb_unlink
763
277
- Fix "some issues" in a helper function reset_head().
764
+ Code clean-up.
765
279
- Expecting a reroll.
280
- cf. <e1aadd47-533c-fd8b-4fae-f64a53c81ec9@gmail.com>
281
- This needs a lot better explanation, including what the issues are,
282
- which codepaths the helper is used in and to do what, and tests to
283
- protect the fixes.
284
- source: <pull.1049.git.1633082702.gitgitgadget@gmail.com>
766
+ Will merge to 'master'.
767
+ source: <20211207183810.688481-1-e@80x24.org>
768
286
---------------------------------------------------
287
-[Cooking]
769
289
-* ab/cat-file (2021-11-29) 10 commits
770
+* ab/cat-file (2021-12-08) 10 commits
771
- cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
772
- object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
773
- cat-file: correct and improve usage information
@@ -299,13 +780,7 @@ Release tarballs are available at:
780
- cat-file tests: test bad usage
781
782
Assorted updates to "git cat-file", especially "-h".
302
-
303
- Needs review.
304
- Even though this is at its third round, there wasn't any meaningful
305
- reviews other than typofixes in the earliest round, which may or
306
- may not be still relevant. The last round needs a serious review
307
- before becoming eligible for 'next'.
308
- source: <patch-v3-10.10-45a24f97c88-20211129T195357Z-avarab@gmail.com>
783
+ source: <cover-v4-00.10-00000000000-20211208T123151Z-avarab@gmail.com>
784
785
786
* ab/grep-patterntype (2021-12-04) 7 commits
@@ -323,18 +798,8 @@ Release tarballs are available at:
798
source: <cover-v4-0.7-00000000000-20211203T101348Z-avarab@gmail.com>
799
800
326
-* en/rebase-x-fix (2021-11-29) 1 commit
327
- (merged to 'next' on 2021-12-03 at a833829733)
328
- + sequencer: avoid adding exec commands for non-commit creating commands
329
-
330
- "git rebase -x" added an unnecessary 'exec' instructions before
331
- 'noop', which has been corrected.
332
-
333
- Will merge to 'master'.
334
- source: <pull.1149.git.git.1638244719381.gitgitgadget@gmail.com>
335
-
336
-
337
-* js/use-builtin-add-i (2021-12-01) 2 commits
801
+* js/use-builtin-add-i (2021-12-08) 3 commits
802
+ - fixup! add -i: default to the built-in implementation
803
- add -i: default to the built-in implementation
804
- t2016: require the PERL prereq only when necessary
805
@@ -403,15 +868,16 @@ Release tarballs are available at:
868
869
870
* jk/log-decorate-opts-with-implicit-decorate (2021-12-01) 2 commits
406
- - log: load decorations with --simplify-by-decoration
407
- - log: handle --decorate-refs with userformat "%d"
871
+ (merged to 'next' on 2021-12-10 at 80585b2755)
872
+ + log: load decorations with --simplify-by-decoration
873
+ + log: handle --decorate-refs with userformat "%d"
874
875
When "git log" implicitly enabled the "decoration" processing
876
without being explicitly asked with "--decorate" option, it failed
877
to read and honor the settings given by the "--decorate-refs"
878
option.
879
414
- Will merge to 'next'?
880
+ Will merge to 'master'.
881
source: <YahbseXEC66dK0k8@coredump.intra.peff.net>
882
883
@@ -443,126 +909,84 @@ Release tarballs are available at:
909
source: <patch-v5-6.6-78bb0995f08-20211125T215529Z-avarab@gmail.com>
910
911
446
-* cb/add-p-single-key-fix (2021-11-28) 1 commit
447
- (merged to 'next' on 2021-12-03 at 8d4f16e620)
448
- + add -p: avoid use of undefined $key when ReadKey -> EOF
449
-
450
- The single-key-input mode in "git add -p" had some code to handle
451
- keys that generate a sequence of input via ReadKey(), which did not
452
- handle end-of-file correctly, which has been fixed.
453
-
454
- Will merge to 'master'.
455
- source: <20211128174903.5623-1-carenas@gmail.com>
456
-
457
-
458
-* cb/mingw-gmtime-r (2021-11-27) 1 commit
459
- (merged to 'next' on 2021-12-03 at 785278d40e)
460
- + mingw: avoid fallback for {local,gm}time_r()
461
-
462
- Build fix on Windows.
463
-
464
- Will merge to 'master'.
465
- source: <pull.1142.v2.git.git.1638008132992.gitgitgadget@gmail.com>
466
-
467
-
912
* ds/trace2-regions-in-tests (2021-11-29) 2 commits
469
- - t/t*: remove custom GIT_TRACE2_EVENT_NESTING
470
- - test-lib.sh: set GIT_TRACE2_EVENT_NESTING
913
+ (merged to 'next' on 2021-12-07 at ebf31cbaad)
914
+ + t/t*: remove custom GIT_TRACE2_EVENT_NESTING
915
+ + test-lib.sh: set GIT_TRACE2_EVENT_NESTING
916
917
The default setting for trace2 event nesting was too low to cause
918
test failures, which is worked around by bumping it up in the test
919
framework.
920
476
- Will merge to 'next'.
921
+ Will merge to 'master'.
922
source: <pull.1085.git.1638193666.gitgitgadget@gmail.com>
923
924
925
* hn/allow-bogus-oid-in-ref-tests (2021-12-07) 8 commits
481
- - t1430: create valid symrefs using test-helper
482
- - t1430: remove refs using test-tool
483
- - refs: introduce REF_SKIP_REFNAME_VERIFICATION flag
484
- - refs: introduce REF_SKIP_OID_VERIFICATION flag
485
- - refs: update comment.
486
- - test-ref-store: plug memory leak in cmd_delete_refs
487
- - test-ref-store: parse symbolic flag constants
488
- - test-ref-store: remove force-create argument for create-reflog
926
+ (merged to 'next' on 2021-12-08 at 8fb70ef68b)
927
+ + t1430: create valid symrefs using test-helper
928
+ + t1430: remove refs using test-tool
929
+ + refs: introduce REF_SKIP_REFNAME_VERIFICATION flag
930
+ + refs: introduce REF_SKIP_OID_VERIFICATION flag
931
+ + refs: update comment.
932
+ + test-ref-store: plug memory leak in cmd_delete_refs
933
+ + test-ref-store: parse symbolic flag constants
934
+ + test-ref-store: remove force-create argument for create-reflog
935
936
The test helper for refs subsystem learned to write bogus and/or
937
nonexistent object name to refs to simulate error situations we
938
want to test Git in.
939
494
- Will merge to 'next'.
940
+ Will merge to 'master'.
941
source: <pull.1147.v4.git.git.1638884300.gitgitgadget@gmail.com>
942
943
944
* hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit
499
- - t1404: mark directory/file conflict tests with REFFILES
945
+ (merged to 'next' on 2021-12-07 at 074438a4ba)
946
+ + t1404: mark directory/file conflict tests with REFFILES
947
948
Test update.
949
503
- Will merge to 'next'.
950
+ Will merge to 'master'.
951
source: <pull.1148.v2.git.git.1638210022966.gitgitgadget@gmail.com>
952
953
954
* jc/reflog-iterator-callback-doc (2021-11-28) 1 commit
508
- - refs: document callback for reflog-ent iterators
955
+ (merged to 'next' on 2021-12-08 at ba5693952d)
956
+ + refs: document callback for reflog-ent iterators
957
958
Document the parameters given to the reflog entry iterator callback
959
functions.
960
513
- Will merge to 'next'?
514
- source: <xmqqk0gs5bgw.fsf@gitster.g>
515
-
516
-
517
-* po/size-t-for-vs (2021-12-01) 3 commits
518
- (merged to 'next' on 2021-12-02 at 489c5b0046)
519
- + object-file.c: LLP64 compatibility, upcast unity for left shift
520
- + diffcore-delta.c: LLP64 compatibility, upcast unity for left shift
521
- + repack.c: LLP64 compatibility, upcast unity for left shift
522
-
523
- On platforms where ulong is shorter than size_t, code paths that
524
- shifted 1 or 1U to the left lacked the necessary cast to size_t,
525
- which have been corrected.
526
-
527
- Will merge to 'master'.
528
- source: <20211201002902.1042-4-philipoakley@iee.email>
529
-
530
-
531
-* yn/complete-date-format-options (2021-11-25) 1 commit
532
- (merged to 'next' on 2021-12-03 at 4f37a904a1)
533
- + completion: add human and auto: date format
534
-
535
- The completion script (in contrib/) learns that the "--date"
536
- option of commands from the "git log" family takes "human" and
537
- "auto" as valid values.
538
-
961
Will merge to 'master'.
540
- source: <pull.1083.git.1637666875171.gitgitgadget@gmail.com>
962
+ source: <xmqqk0gs5bgw.fsf@gitster.g>
963
964
965
* jc/grep-patterntype-default-doc (2021-12-05) 1 commit
544
- - grep: clarify what `grep.patternType=default` means
966
+ (merged to 'next' on 2021-12-10 at e46385ad9d)
967
+ + grep: clarify what `grep.patternType=default` means
968
969
Doc update.
970
548
- Will merge to 'next'?
971
+ Will merge to 'master'.
972
source: <xmqqy24ykdel.fsf_-_@gitster.g>
973
974
975
* ab/ci-updates (2021-11-23) 5 commits
553
- - CI: don't run "make test" twice in one job
554
- - CI: use "$runs_on_pool", not "$jobname" to select packages & config
555
- - CI: rename the "Linux32" job to lower-case "linux32"
556
- - CI: use shorter names that fit in UX tooltips
557
- - CI: remove Travis CI support
976
+ (merged to 'next' on 2021-12-07 at 1d855a6b33)
977
+ + CI: don't run "make test" twice in one job
978
+ + CI: use "$runs_on_pool", not "$jobname" to select packages & config
979
+ + CI: rename the "Linux32" job to lower-case "linux32"
980
+ + CI: use shorter names that fit in UX tooltips
981
+ + CI: remove Travis CI support
982
983
Drop support for TravisCI and update test workflows at GitHub.
984
561
- Will merge to 'next'.
985
+ Will merge to 'master'.
986
source: <cover-v4-0.5-00000000000-20211123T134300Z-avarab@gmail.com>
987
988
565
-* en/keep-cwd (2021-12-01) 11 commits
989
+* en/keep-cwd (2021-12-09) 11 commits
990
- t2501: simplify the tests since we can now assume desired behavior
991
- dir: new flag to remove_dir_recurse() to spare the original_cwd
992
- dir: avoid incidentally removing the original_cwd in remove_path()
@@ -584,63 +1008,42 @@ Release tarballs are available at:
1008
The commands have been taught to keep an empty directory if it is
1009
the directory they were started in to avoid surprising users.
1010
587
- Needs review.
588
- There are some comments on earlier rounds; the latest one needs a
589
- serious review or at least Acks from past commentors.
590
- source: <pull.1140.v5.git.git.1638340854.gitgitgadget@gmail.com>
1011
+ Will merge to 'next'?
1012
+ source: <pull.1140.v6.git.git.1639026515.gitgitgadget@gmail.com>
1013
1014
1015
* ab/run-command (2021-11-25) 9 commits
594
- - run-command API: remove "env" member, always use "env_array"
595
- - difftool: use "env_array" to simplify memory management
596
- - run-command API: remove "argv" member, always use "args"
597
- - run-command API users: use strvec_push(), not argv construction
598
- - run-command API users: use strvec_pushl(), not argv construction
599
- - run-command tests: use strvec_pushv(), not argv assignment
600
- - run-command API users: use strvec_pushv(), not argv assignment
601
- - upload-archive: use regular "struct child_process" pattern
602
- - worktree: stop being overly intimate with run_command() internals
1016
+ (merged to 'next' on 2021-12-07 at 5c0bedf853)
1017
+ + run-command API: remove "env" member, always use "env_array"
1018
+ + difftool: use "env_array" to simplify memory management
1019
+ + run-command API: remove "argv" member, always use "args"
1020
+ + run-command API users: use strvec_push(), not argv construction
1021
+ + run-command API users: use strvec_pushl(), not argv construction
1022
+ + run-command tests: use strvec_pushv(), not argv assignment
1023
+ + run-command API users: use strvec_pushv(), not argv assignment
1024
+ + upload-archive: use regular "struct child_process" pattern
1025
+ + worktree: stop being overly intimate with run_command() internals
1026
1027
API clean-up.
1028
606
- Will merge to 'next'.
1029
+ Will merge to 'master'.
1030
cf. <211130.86k0gpcpy2.gmgdl@evledraar.gmail.com>
1031
cf. <CAPig+cSvFgJTiq8pXrWy_7ukQwE1y9ZGwMgKmyjWuQHdNGxiDQ@mail.gmail.com>
1032
source: <cover-v3-0.9-00000000000-20211125T224833Z-avarab@gmail.com>
1033
1034
612
-* hn/create-reflog-simplify (2021-11-22) 1 commit
613
- (merged to 'next' on 2021-12-02 at 87ff49b776)
614
- + refs: drop force_create argument of create_reflog API
615
- (this branch is used by hn/reftable-coverity-fixes.)
616
-
617
- A small simplification of API.
618
-
619
- Will merge to 'master'.
620
- source: <pull.1144.git.git.1637590749342.gitgitgadget@gmail.com>
621
-
622
-
1035
* hn/reflog-tests (2021-12-02) 5 commits
624
- - refs/debug: trim trailing LF from reflog message
625
- - test-ref-store: tweaks to for-each-reflog-ent format
626
- - t1405: check for_each_reflog_ent_reverse() more thoroughly
627
- - test-ref-store: don't add newline to reflog message
628
- - show-branch: show reflog message
1036
+ (merged to 'next' on 2021-12-07 at 84d4e4b211)
1037
+ + refs/debug: trim trailing LF from reflog message
1038
+ + test-ref-store: tweaks to for-each-reflog-ent format
1039
+ + t1405: check for_each_reflog_ent_reverse() more thoroughly
1040
+ + test-ref-store: don't add newline to reflog message
1041
+ + show-branch: show reflog message
1042
1043
Prepare tests on ref API to help testing reftable backends.
1044
632
- Will merge to 'next'.
633
- source: <pull.1145.v3.git.git.1638466593.gitgitgadget@gmail.com>
634
-
635
-
636
-* jt/midx-doc-fix (2021-11-22) 1 commit
637
- (merged to 'next' on 2021-12-02 at eac9f263ae)
638
- + Doc: no midx and partial clone relation
639
-
640
- Docfix.
641
-
1045
Will merge to 'master'.
643
- source: <20211122184114.3328662-1-jonathantanmy@google.com>
1046
+ source: <pull.1145.v3.git.git.1638466593.gitgitgadget@gmail.com>
1047
1048
1049
* tl/ls-tree-oid-only (2021-11-22) 1 commit
@@ -652,45 +1055,6 @@ Release tarballs are available at:
1055
source: <6c15b4c176b7c03072fa59a4efd9f6fea7d62eae.1637567328.git.dyroneteng@gmail.com>
1056
1057
655
-* jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits
656
- (merged to 'next' on 2021-12-02 at eefd61931f)
657
- + t7006: simplify exit-code checks for sigpipe tests
658
- + t7006: clean up SIGPIPE handling in trace2 tests
659
- + run-command: unify signal and regular logic for wait_or_whine()
660
-
661
- The function to cull a child process and determine the exit status
662
- had two separate code paths for normal callers and callers in a
663
- signal handler, and the latter did not yield correct value when the
664
- child has caught a signal. The handling of the exit status has
665
- been unified for these two code paths. An existing test with
666
- flakiness has also been corrected.
667
-
668
- Will merge to 'master'.
669
- source: <YZrSALOrdhuunHwp@coredump.intra.peff.net>
670
-
671
-
672
-* em/missing-pager (2021-11-24) 1 commit
673
- (merged to 'next' on 2021-12-03 at 22ad721b52)
674
- + pager: fix crash when pager program doesn't exist
675
-
676
- When a non-existent program is given as the pager, we tried to
677
- reuse an uninitialized child_process structure and crashed, which
678
- has been fixed.
679
-
680
- Will merge to 'master'.
681
- source: <20211125000239.2336-1-ematsumiya@suse.de>
682
-
683
-
684
-* ab/checkout-branch-info-leakfix (2021-11-18) 1 commit
685
- (merged to 'next' on 2021-12-02 at 5922388782)
686
- + checkout: fix "branch info" memory leaks
687
-
688
- Leakfix.
689
-
690
- Will merge to 'master'.
691
- source: <patch-v4-1.1-57bcd0cbc23-20211116T182604Z-avarab@gmail.com>
692
-
693
-
1058
* ab/make-dependency (2021-11-18) 24 commits
1059
- Makefile: move ".SUFFIXES" rule to shared.mak
1060
- Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
@@ -725,77 +1089,47 @@ Release tarballs are available at:
1089
source: <patch-v4-23.23-48a3927d972-20211117T101807Z-avarab@gmail.com>
1090
1091
728
-* ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit
729
- (merged to 'next' on 2021-12-02 at 1b49913760)
730
- + pull: don't say that merge is "the default strategy"
731
-
732
- The advice message given by "git pull" when the user hasn't made a
733
- choice between merge and rebase still said that the merge is the
734
- default, which no longer is the case. This has been corrected.
735
-
736
- Will merge to 'master'.
737
- source: <20211118154317.639118-1-alexhenrie24@gmail.com>
738
-
739
-
740
-* ds/fetch-pull-with-sparse-index (2021-12-06) 3 commits
741
- - ls-files: add --sparse option
742
- - fetch/pull: use the sparse index
743
- - Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index
744
- (this branch uses ld/sparse-diff-blame and vd/sparse-reset.)
1092
+* ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits
1093
+ . test-read-cache: remove --table, --expand options
1094
+ . t1091/t3705: remove 'test-tool read-cache --table'
1095
+ . t1092: replace 'read-cache --table' with 'ls-files --sparse'
1096
+ . ls-files: add --sparse option
1097
+ . fetch/pull: use the sparse index
1098
+ . Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index
1099
+ (this branch uses ld/sparse-diff-blame.)
1100
1101
"git fetch" and "git pull" are now declared sparse-index clean.
1102
Also "git ls-files" learns the "--sparse" option to help debugging.
1103
749
- Expecting a reroll.
750
- Discussion seems to have stalled, with a few loose ends questions.
751
- Also since the branch that this depends on was rerolled, it may
752
- benefit from a refresh.
753
- source: <pull.1080.git.1637077083.gitgitgadget@gmail.com>
1104
+ Ejected from 'seen', as it seems to fail its self-test.
1105
+ source: <pull.1080.v2.git.1638992395.gitgitgadget@gmail.com>
1106
1107
1108
* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits
757
- - ssh signing: make sign/amend test more resilient
758
- - ssh signing: support non ssh-* keytypes
1109
+ (merged to 'next' on 2021-12-10 at 2d0c8cb8e6)
1110
+ + ssh signing: make sign/amend test more resilient
1111
+ + ssh signing: support non ssh-* keytypes
1112
1113
The cryptographic signing using ssh keys can specify literal keys
1114
for keytypes whose name do not begin with the "ssh-" prefix by
1115
using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").
1116
764
- Will merge to 'next'?
1117
+ Will merge to 'master'.
1118
source: <20211119150707.3924636-1-fs@gigacodes.de>
1119
1120
1121
* fs/test-prereq (2021-12-01) 3 commits
769
- - test-lib: make BAIL_OUT() work in tests and prereq
770
- - test-lib: introduce required prereq for test runs
771
- - test-lib: show missing prereq summary
1122
+ (merged to 'next' on 2021-12-07 at fc8a8e0006)
1123
+ + test-lib: make BAIL_OUT() work in tests and prereq
1124
+ + test-lib: introduce required prereq for test runs
1125
+ + test-lib: show missing prereq summary
1126
1127
The test framework learns to list unsatisfied test prerequisites,
1128
and optionally error out when prerequisites that are expected to be
1129
satisfied are not.
1130
777
- Will merge to 'next'.
778
- source: <20211201085315.576865-1-fs@gigacodes.de>
779
-
780
-
781
-* jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit
782
- (merged to 'next' on 2021-12-02 at 0ac4fd64aa)
783
- + t5319: corrupt more bytes of the midx checksum
784
-
785
- Test fix.
786
-
787
- Will merge to 'master'.
788
- source: <YZQk6t1veegeAlYh@coredump.intra.peff.net>
789
-
790
-
791
-* js/trace2-avoid-recursive-errors (2021-11-18) 1 commit
792
- (merged to 'next' on 2021-12-02 at c5b1e5ddec)
793
- + trace2: disable tr2_dst before warning on write errors
794
-
795
- trace2 error code path fix.
796
-
1131
Will merge to 'master'.
798
- source: <5a9e49e7f1540d762374382e1769edf112cf093f.1637272706.git.steadmon@google.com>
1132
+ source: <20211201085315.576865-1-fs@gigacodes.de>
1133
1134
1135
* pw/xdiff-classify-record-in-histogram (2021-12-04) 6 commits
@@ -803,90 +1137,33 @@ Release tarballs are available at:
1137
+ xdiff: drop unused flags parameter from recs_match
1138
+ xdiff: drop xpparam_t parameter from histogram cmp_recs()
1139
+ xdiff: drop CMP_ENV macro from xhistogram
806
- (merged to 'next' on 2021-12-02 at 5ccd12d09b)
807
- + xdiff: simplify comparison
808
- + xdiff: avoid unnecessary memory allocations
809
- + diff histogram: intern strings
810
-
811
- "diff --histogram" optimization.
812
-
813
- Will merge to 'master'.
814
- source: <Yammtm+pIkMu43zZ@coredump.intra.peff.net>
815
- source: <pull.1079.git.1637148025.gitgitgadget@gmail.com>
816
-
817
-
818
-* rs/mergesort (2021-11-18) 1 commit
819
- (merged to 'next' on 2021-12-02 at 0490b0ffbd)
820
- + mergesort: avoid left shift overflow
821
-
822
- Bitop fix for platforms whose "long" is 32-bit.
823
-
824
- Will merge to 'master'.
825
- source: <5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de>
826
-
827
-
828
-* xw/am-empty (2021-12-07) 3 commits
829
- - am: support --allow-empty to record specific empty patches
830
- - am: support --empty=<option> to handle empty patches
831
- - doc: git-format-patch: describe the option --always
832
-
833
- "git am" learns "--empty=(die|drop|keep)" option to tweak what is
834
- done to a piece of e-mail without a patch in it.
835
-
836
- Almost there.
837
- source: <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
838
-
839
-
840
-* hk/ci-checkwhitespace-commentfix (2021-11-19) 1 commit
841
- (merged to 'next' on 2021-12-02 at 971178fe99)
842
- + ci(check-whitespace): update stale file top comments
843
-
844
- Comment fix.
845
-
846
- Will merge to 'master'.
847
- source: <pull.1143.git.git.1637347813367.gitgitgadget@gmail.com>
848
-
849
-
850
-* jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit
851
- (merged to 'next' on 2021-12-02 at e2cc1ae46a)
852
- + fetch-pack: ignore SIGPIPE when writing to index-pack
853
-
854
- "git fetch", when received a bad packfile, can fail with SIGPIPE.
855
- This wasn't wrong per-se, but we now detect the situation and fail
856
- in a more predictable way.
857
-
858
- Will merge to 'master'.
859
- source: <YZgQD3lrw4+i4EMd@coredump.intra.peff.net>
860
-
861
-
862
-* jk/refs-g11-workaround (2021-11-19) 1 commit
863
- (merged to 'next' on 2021-12-02 at 1025235670)
864
- + refs: work around gcc-11 warning with REF_HAVE_NEW
1140
+ (merged to 'next' on 2021-12-02 at 5ccd12d09b)
1141
+ + xdiff: simplify comparison
1142
+ + xdiff: avoid unnecessary memory allocations
1143
+ + diff histogram: intern strings
1144
866
- Workaround for a false-alarm by gcc-11
1145
+ "diff --histogram" optimization.
1146
1147
Will merge to 'master'.
869
- source: <YZgW/pz6CbpaywDa@coredump.intra.peff.net>
1148
+ source: <Yammtm+pIkMu43zZ@coredump.intra.peff.net>
1149
+ source: <pull.1079.git.1637148025.gitgitgadget@gmail.com>
1150
1151
872
-* mp/absorb-submodule-git-dir-upon-deinit (2021-11-19) 1 commit
873
- (merged to 'next' on 2021-12-03 at afc462a692)
874
- + submodule: absorb git dir instead of dying on deinit
1152
+* xw/am-empty (2021-12-07) 3 commits
1153
+ - am: support --allow-empty to record specific empty patches
1154
+ - am: support --empty=<option> to handle empty patches
1155
+ - doc: git-format-patch: describe the option --always
1156
876
- "git submodule deinit" for a submodule whose .git metadata
877
- directory is embedded in its working tree refused to work, until
878
- the submodule gets converted to use the "absorbed" form where the
879
- metadata directory is stored in superproject, and a gitfile at the
880
- top-level of the working tree of the submodule points at it. The
881
- command is taught to convert such submodules to the absorbed form
882
- as needed.
1157
+ "git am" learns "--empty=(die|drop|keep)" option to tweak what is
1158
+ done to a piece of e-mail without a patch in it.
1159
884
- Will merge to 'master'.
885
- source: <pull.1078.v7.git.git.1637319387717.gitgitgadget@gmail.com>
1160
+ Almost there.
1161
+ source: <pull.1076.v18.git.1638939946.gitgitgadget@gmail.com>
1162
1163
1164
* rj/receive-pack-avoid-sigpipe-during-status-reporting (2021-11-10) 1 commit
889
- - receive-pack: ignore SIGPIPE while reporting status to client
1165
+ (merged to 'next' on 2021-12-07 at 91039a781e)
1166
+ + receive-pack: ignore SIGPIPE while reporting status to client
1167
1168
When the "git push" command is killed while the receiving end is
1169
trying to report what happened to the ref update proposals, the
@@ -894,52 +1171,19 @@ Release tarballs are available at:
1171
to increase our chances to run the post-receive hook after it
1172
happens.
1173
897
- Will merge to 'next'.
1174
+ Will merge to 'master'.
1175
source: <20211110092942.1648429-1-robin@jarry.cc>
1176
1177
1178
* ab/parse-options-cleanup (2021-11-10) 1 commit
902
- - parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()
1179
+ (merged to 'next' on 2021-12-08 at f9a2ceb9f6)
1180
+ + parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()
1181
1182
Change the type of an internal function to return an enum (instead
1183
of int) and replace -2 that was used to signal an error with -1.
1184
907
- Will merge to 'next'?
908
- It is disturbing that a change claimed to be clean-up is not a faithful
909
- conversion, though.
910
- source: <patch-v2-1.1-376f76bb44e-20211110T012523Z-avarab@gmail.com>
911
-
912
-
913
-* cw/protocol-v2-doc-fix (2021-11-11) 1 commit
914
- (merged to 'next' on 2021-12-02 at 59f42a7cfc)
915
- + protocol-v2.txt: align delim-pkt spec with usage
916
-
917
- Doc update.
918
-
919
- Will merge to 'master'.
920
- source: <20211111220048.1702896-1-calvinwan@google.com>
921
-
922
-
923
-* jt/pack-header-lshift-overflow (2021-11-11) 1 commit
924
- (merged to 'next' on 2021-12-02 at 89c37479db)
925
- + packfile: avoid overflowing shift during decode
926
-
927
- The code to decode the length of packed object size has been
928
- corrected.
929
-
930
- Will merge to 'master'.
931
- source: <20211110234033.3144165-1-jonathantanmy@google.com>
932
-
933
-
934
-* bc/require-c99 (2021-12-01) 1 commit
935
- (merged to 'next' on 2021-12-02 at 76aa8bc2d0)
936
- + git-compat-util: add a test balloon for C99 support
937
-
938
- Weather balloon to break people with compilers that do not support
939
- C99.
940
-
1185
Will merge to 'master'.
942
- source: <20211201014050.38002-2-sandals@crustytoothpaste.net>
1186
+ source: <patch-v2-1.1-376f76bb44e-20211110T012523Z-avarab@gmail.com>
1187
1188
1189
* jc/c99-var-decl-in-for-loop (2021-12-03) 1 commit
@@ -953,25 +1197,16 @@ Release tarballs are available at:
1197
source: <xmqqpmr2j5lq.fsf_-_@gitster.g>
1198
1199
956
-* tl/midx-docfix (2021-11-18) 1 commit
957
- (merged to 'next' on 2021-12-02 at 0fae3ebdef)
958
- + midx: fix a formatting issue in "multi-pack-index.txt"
959
-
960
- Doc mark-up fix.
961
-
962
- Will merge to 'master'.
963
- source: <9b910a44f4143c94787110a688f2b17ba4eeb0fc.1637218943.git.dyroneteng@gmail.com>
964
-
965
-
1200
* ak/protect-any-current-branch (2021-12-01) 8 commits
967
- - branch: protect branches checked out in all worktrees
968
- - receive-pack: protect current branch for bare repository worktree
969
- - receive-pack: clean dead code from update_worktree()
970
- - fetch: protect branches checked out in all worktrees
971
- - worktree: simplify find_shared_symref() memory ownership model
972
- - branch: lowercase error messages
973
- - receive-pack: lowercase error messages
974
- - fetch: lowercase error messages
1201
+ (merged to 'next' on 2021-12-10 at dd2c6a557c)
1202
+ + branch: protect branches checked out in all worktrees
1203
+ + receive-pack: protect current branch for bare repository worktree
1204
+ + receive-pack: clean dead code from update_worktree()
1205
+ + fetch: protect branches checked out in all worktrees
1206
+ + worktree: simplify find_shared_symref() memory ownership model
1207
+ + branch: lowercase error messages
1208
+ + receive-pack: lowercase error messages
1209
+ + fetch: lowercase error messages
1210
1211
"git fetch" without the "--update-head-ok" option ought to protect
1212
a checked out branch from getting updated, to prevent the working
@@ -981,62 +1216,8 @@ Release tarballs are available at:
1216
been updated.
1217
(originally called ak/fetch-not-overwrite-any-current-branch)
1218
984
- Will merge to 'next'?
985
- source: <20211201221547.1796213-1-andersk@mit.edu>
986
-
987
-
988
-* jk/test-bitmap-fix (2021-11-05) 1 commit
989
- (merged to 'next' on 2021-12-02 at c273d402fb)
990
- + test_bitmap_hashes(): handle repository without bitmaps
991
-
992
- Tighten code for testing pack-bitmap.
993
-
994
- Will merge to 'master'.
995
- source: <YYTy6+DG5guzJIO7@coredump.intra.peff.net>
996
-
997
-
998
-* jk/jump-merge-with-pathspec (2021-11-09) 1 commit
999
- (merged to 'next' on 2021-12-02 at fea901973d)
1000
- + git-jump: pass "merge" arguments to ls-files
1001
-
1002
- The "merge" subcommand of "git jump" (in contrib/) silently ignored
1003
- pathspec and other parameters.
1004
-
1005
- Will merge to 'master'.
1006
- source: <YYqjY/zcBWyqY8/5@coredump.intra.peff.net>
1007
-
1008
-
1009
-* jk/strbuf-addftime-seconds-since-epoch (2021-11-04) 1 commit
1010
- (merged to 'next' on 2021-12-02 at d0b158d899)
1011
- + strbuf_addftime(): handle "%s" manually
1012
-
1013
- The "--date=format:<strftime>" gained a workaround for the lack of
1014
- system support for a non-local timezone to handle "%s" placeholder.
1015
-
1016
- Will merge to 'master'.
1017
- source: <YYEihoLbEGi44dDb@coredump.intra.peff.net>
1018
-
1019
-
1020
-* js/ci-no-directional-formatting (2021-11-04) 1 commit
1021
- (merged to 'next' on 2021-12-02 at bc756bc586)
1022
- + ci: disallow directional formatting
1023
-
1024
- CI has been taught to catch some Unicode directional formatting
1025
- sequence that can be used in certain mischief.
1026
-
1027
- Will merge to 'master'.
1028
- source: <pull.1071.v3.git.1636031609982.gitgitgadget@gmail.com>
1029
-
1030
-
1031
-* tw/var-default-branch (2021-11-03) 1 commit
1032
- (merged to 'next' on 2021-12-02 at 944512852e)
1033
- + var: add GIT_DEFAULT_BRANCH variable
1034
-
1035
- "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
1036
- the newly created branch if "git init" is run.
1037
-
1219
Will merge to 'master'.
1039
- source: <20211103201702.117771-1-thomas@t-8ch.de>
1220
+ source: <20211201221547.1796213-1-andersk@mit.edu>
1221
1222
1223
* ab/mark-leak-free-tests-even-more (2021-11-01) 15 commits
@@ -1063,72 +1244,33 @@ Release tarballs are available at:
1244
source: <cover-00.15-00000000000-20211030T221945Z-avarab@gmail.com>
1245
1246
1066
-* if/redact-packfile-uri (2021-11-11) 2 commits
1067
- (merged to 'next' on 2021-12-02 at 81213be9ac)
1068
- + http-fetch: redact url on die() message
1069
- + fetch-pack: redact packfile urls in traces
1070
-
1071
- Redact the path part of packfile URI that appears in the trace output.
1072
-
1073
- Will merge to 'master'.
1074
- source: <pull.1052.v7.git.1636588289.gitgitgadget@gmail.com>
1075
-
1076
-
1247
* ew/test-wo-fsync (2021-10-29) 1 commit
1078
- - tests: disable fsync everywhere
1248
+ (merged to 'next' on 2021-12-08 at 4b90e4870a)
1249
+ + tests: disable fsync everywhere
1250
1251
Allow running our tests while disabling fsync.
1252
1082
- Will merge to 'next'?
1253
+ Will merge to 'master'.
1254
Received a lukewarm reactions overall. Perhaps we should drop instead?
1255
source: <20211029001552.GA29647@dcvr>
1256
1257
1087
-* ja/doc-cleanup (2021-11-09) 10 commits
1088
- (merged to 'next' on 2021-12-02 at f72204942f)
1089
- + init doc: --shared=0xxx does not give umask but perm bits
1090
- + doc: git-init: clarify file modes in octal.
1091
- + doc: git-http-push: describe the refs as pattern pairs
1092
- + doc: uniformize <URL> placeholders' case
1093
- + doc: use three dots for indicating repetition instead of star
1094
- + doc: git-ls-files: express options as optional alternatives
1095
- + doc: use only hyphens as word separators in placeholders
1096
- + doc: express grammar placeholders between angle brackets
1097
- + doc: split placeholders as individual tokens
1098
- + doc: fix git credential synopsis
1099
-
1100
- Doc update.
1101
-
1102
- Will merge to 'master'.
1103
- source: <20211106184858.11500-1-jn.avila@free.fr>
1104
-
1105
-
1258
* re/color-default-reset (2021-10-28) 3 commits
1107
- - color: allow colors to be prefixed with "reset"
1108
- - color: support "default" to restore fg/bg color
1109
- - color: add missing GIT_COLOR_* white/black constants
1259
+ (merged to 'next' on 2021-12-08 at ab3ff50ce2)
1260
+ + color: allow colors to be prefixed with "reset"
1261
+ + color: support "default" to restore fg/bg color
1262
+ + color: add missing GIT_COLOR_* white/black constants
1263
1264
"default" and "reset" colors have been added to our palette.
1265
1113
- Will merge to 'next'?
1266
+ Will merge to 'master'.
1267
Seems to have stalled, but I am OK to merge it as-is.
1268
cf. <881B4747-B0B5-459B-B673-06972275A8B8@gmail.com>
1269
source: <pull.1117.git.git.1635210227532.gitgitgadget@gmail.com>
1270
source: <pull.1116.git.git.1635201156.gitgitgadget@gmail.com>
1271
1272
1120
-* jc/fix-first-object-walk (2021-10-29) 2 commits
1121
- (merged to 'next' on 2021-12-02 at 43a5c1ec03)
1122
- + docs: add headers in MyFirstObjectWalk
1123
- + docs: fix places that break compilation in MyFirstObjectWalk
1124
-
1125
- Doc update.
1126
-
1127
- Will merge to 'master'.
1128
- source: <pull.1063.v3.git.1635537163.gitgitgadget@gmail.com>
1129
-
1130
-
1131
-* pw/diff-color-moved-fix (2021-10-27) 15 commits
1273
+* pw/diff-color-moved-fix (2021-12-09) 15 commits
1274
- diff --color-moved: intern strings
1275
- diff: use designated initializers for emitted_diff_symbol
1276
- diff --color-moved-ws=allow-indentation-change: improve hash lookups
@@ -1138,67 +1280,50 @@ Release tarballs are available at:
1280
- diff --color-moved: call comparison function directly
1281
- diff --color-moved-ws=allow-indentation-change: simplify and optimize
1282
- diff: simplify allow-indentation-change delta calculation
1141
- - diff --color-moved: avoid false short line matches and bad zerba coloring
1283
+ - diff --color-moved: avoid false short line matches and bad zebra coloring
1284
- diff --color-moved=zebra: fix alternate coloring
1285
- diff --color-moved: rewind when discarding pmb
1286
- diff --color-moved: factor out function
1287
- diff --color-moved: clear all flags on blocks that are too short
1288
- diff --color-moved: add perf tests
1289
1148
- Long-overdue correctness and performance update to "diff
1149
- --color-moved" feature.
1150
-
1151
- Expecting a reroll.
1152
- cf. <e1aadd47-533c-fd8b-4fae-f64a53c81ec9@gmail.com>
1153
- cf. <pull.981.v4.git.1637056178.gitgitgadget@gmail.com>
1154
-
1155
-
1156
-* ab/generate-command-list (2021-11-05) 10 commits
1157
- (merged to 'next' on 2021-12-02 at 37a575b37f)
1158
- + generate-cmdlist.sh: don't parse command-list.txt thrice
1159
- + generate-cmdlist.sh: replace "grep' invocation with a shell version
1160
- + generate-cmdlist.sh: do not shell out to "sed"
1161
- + generate-cmdlist.sh: stop sorting category lines
1162
- + generate-cmdlist.sh: replace for loop by printf's auto-repeat feature
1163
- + generate-cmdlist.sh: run "grep | sort", not "sort | grep"
1164
- + generate-cmdlist.sh: don't call get_categories() from category_list()
1165
- + generate-cmdlist.sh: spawn fewer processes
1166
- + generate-cmdlist.sh: trivial whitespace change
1167
- + command-list.txt: sort with "LC_ALL=C sort"
1168
-
1169
- Build optimization.
1290
+ Correctness and performance update to "diff --color-moved" feature.
1291
1171
- Will merge to 'master'.
1172
- source: <cover-v3-00.10-00000000000-20211105T135058Z-avarab@gmail.com>
1292
+ Will merge to 'next'?
1293
+ source: <pull.981.v5.git.1639045809.gitgitgadget@gmail.com>
1294
1295
1296
* es/pretty-describe-more (2021-11-01) 3 commits
1176
- - pretty: add abbrev option to %(describe)
1177
- - pretty: add tag option to %(describe)
1178
- - pretty.c: rework describe options parsing for better extensibility
1297
+ (merged to 'next' on 2021-12-07 at e7862a34c8)
1298
+ + pretty: add abbrev option to %(describe)
1299
+ + pretty: add tag option to %(describe)
1300
+ + pretty.c: rework describe options parsing for better extensibility
1301
1302
Extend "git log --format=%(describe)" placeholder to allow passing
1303
selected command-line options to the underlying "git describe"
1304
command.
1305
1184
- Will merge to 'next'.
1306
+ Will merge to 'master'.
1307
source: <20211031171510.1646396-1-eschwartz@archlinux.org>
1308
1309
1188
-* fs/ssh-signing-key-lifetime (2021-12-01) 7 commits
1189
- - ssh signing: verify ssh-keygen in test prereq
1190
- - ssh signing: make fmt-merge-msg consider key lifetime
1191
- - ssh signing: make verify-tag consider key lifetime
1192
- - ssh signing: make git log verify key lifetime
1193
- - ssh signing: make verify-commit consider key lifetime
1194
- - ssh signing: add key lifetime test prereqs
1195
- - ssh signing: use sigc struct to pass payload
1310
+* fs/ssh-signing-key-lifetime (2021-12-09) 9 commits
1311
+ (merged to 'next' on 2021-12-10 at d5e7bd8b79)
1312
+ + ssh signing: verify ssh-keygen in test prereq
1313
+ + ssh signing: make fmt-merge-msg consider key lifetime
1314
+ + ssh signing: make verify-tag consider key lifetime
1315
+ + ssh signing: make git log verify key lifetime
1316
+ + ssh signing: make verify-commit consider key lifetime
1317
+ + ssh signing: add key lifetime test prereqs
1318
+ + ssh signing: use sigc struct to pass payload
1319
+ + t/fmt-merge-msg: make gpgssh tests more specific
1320
+ + t/fmt-merge-msg: do not redirect stderr
1321
1322
Extend the signing of objects with SSH keys and learn to pay
1323
attention to the key validity time range when verifying.
1324
1200
- Will merge to 'next'?
1201
- source: <20211130141112.78193-1-fs@gigacodes.de>
1325
+ Will merge to 'master'.
1326
+ source: <20211209085249.13587-1-fs@gigacodes.de>
1327
1328
1329
* jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits
@@ -1214,21 +1339,6 @@ Release tarballs are available at:
1339
source: <xmqqa6izcwio.fsf_-_@gitster.g>
1340
1341
1217
-* gc/remote-with-fewer-static-global-variables (2021-11-18) 5 commits
1218
- (merged to 'next' on 2021-12-02 at d7ea1696e5)
1219
- + remote: die if branch is not found in repository
1220
- + remote: remove the_repository->remote_state from static methods
1221
- + remote: use remote_state parameter internally
1222
- + remote: move static variables into per-repository struct
1223
- + t5516: add test case for pushing remote refspecs
1224
-
1225
- Code clean-up to eventually allow information on remotes defined
1226
- for an arbitrary repository to be read.
1227
-
1228
- Will merge to 'master'.
1229
- source: <20211118005325.64971-1-chooglen@google.com>
1230
-
1231
-
1342
* ab/config-based-hooks-2 (2021-11-24) 18 commits
1343
- run-command: remove old run_hook_{le,ve}() hook API
1344
- receive-pack: convert push-to-checkout hook to hook.h
@@ -1260,28 +1370,17 @@ Release tarballs are available at:
1370
source: <cover-v5-00.17-00000000000-20211123T114206Z-avarab@gmail.com>
1371
1372
1263
-* vd/sparse-sparsity-fix-on-read (2021-11-24) 4 commits
1264
- (merged to 'next' on 2021-12-02 at 1ec68669cb)
1265
- + sparse-index: update do_read_index to ensure correct sparsity
1266
- + sparse-index: add ensure_correct_sparsity function
1267
- + sparse-index: avoid unnecessary cache tree clearing
1268
- + test-read-cache.c: prepare_repo_settings after config init
1269
-
1270
- Ensure that the sparseness of the in-core index matches the
1271
- index.sparse configuration specified by the repository immediately
1272
- after the on-disk index file is read.
1273
-
1274
- Will merge to 'master'.
1275
- source: <pull.1059.v5.git.1637626833.gitgitgadget@gmail.com>
1276
-
1277
-
1373
* js/branch-track-inherit (2021-12-07) 2 commits
1374
. branch: add flags and config to inherit tracking
1375
. branch: accept multiple upstream branches for tracking
1376
+ (this branch is used by gc/branch-recurse-submodules.)
1377
1378
"git -c branch.autosetupmerge=inherit branch new old" makes "new"
1379
to have the same upstream as the "old" branch, instead of marking
1380
"old" itself as its upstream.
1381
+
1382
+ Waiting for a response
1383
+ cf. <xmqqk0gg6wqn.fsf@gitster.g>
1384
source: <cover.1638859949.git.steadmon@google.com>
1385
1386
@@ -1325,23 +1424,24 @@ Release tarballs are available at:
1424
1425
1426
* ld/sparse-diff-blame (2021-12-06) 8 commits
1328
- - blame: enable and test the sparse index
1329
- - diff: enable and test the sparse index
1330
- - diff: replace --staged with --cached in t1092 tests
1331
- - repo-settings: prepare_repo_settings only in git repos
1332
- - test-read-cache: set up repo after git directory
1333
- - commit-graph: return if there is no git directory
1334
- - git: ensure correct git directory setup with -h
1335
- - Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
1336
- (this branch is used by ds/fetch-pull-with-sparse-index; uses vd/sparse-reset.)
1427
+ (merged to 'next' on 2021-12-10 at 57b89936d6)
1428
+ + blame: enable and test the sparse index
1429
+ + diff: enable and test the sparse index
1430
+ + diff: replace --staged with --cached in t1092 tests
1431
+ + repo-settings: prepare_repo_settings only in git repos
1432
+ + test-read-cache: set up repo after git directory
1433
+ + commit-graph: return if there is no git directory
1434
+ + git: ensure correct git directory setup with -h
1435
+ + Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
1436
+ (this branch is used by ds/fetch-pull-with-sparse-index.)
1437
1438
Teach diff and blame to work well with sparse index.
1439
1340
- Will merge to 'next'?
1440
+ Will merge to 'master'.
1441
source: <pull.1050.v6.git.1638806161.gitgitgadget@gmail.com>
1442
1443
1344
-* ns/remerge-diff (2021-12-06) 8 commits
1444
+* ns/remerge-diff (2021-12-08) 8 commits
1445
- doc/diff-options: explain the new --remerge-diff option
1446
- show, log: adapt Elijah Newren's changes to common tmp-objdir API
1447
- show, log: provide a --remerge-diff capability
@@ -1363,7 +1463,7 @@ Release tarballs are available at:
1463
them to longer-term storage" infrastructure with another topic.
1464
1465
1366
-* ns/tmp-objdir (2021-12-06) 2 commits
1466
+* ns/tmp-objdir (2021-12-08) 2 commits
1467
- tmp-objdir: disable ref updates when replacing the primary odb
1468
- tmp-objdir: new API for creating temporary writable databases
1469
(this branch is used by ns/batched-fsync and ns/remerge-diff.)
@@ -1371,29 +1471,10 @@ Release tarballs are available at:
1471
New interface into the tmp-objdir API to help in-core use of the
1472
quarantine feature.
1473
1374
- Needs an Ack or Reviewed-by.
1474
+ Will merge to 'next'.
1475
source: <pull.1091.v3.git.1638828305.gitgitgadget@gmail.com>
1476
1477
1378
-* vd/sparse-reset (2021-11-29) 8 commits
1379
- (merged to 'next' on 2021-12-02 at 47b1095f39)
1380
- + unpack-trees: improve performance of next_cache_entry
1381
- + reset: make --mixed sparse-aware
1382
- + reset: make sparse-aware (except --mixed)
1383
- + reset: integrate with sparse index
1384
- + reset: expand test coverage for sparse checkouts
1385
- + sparse-index: update command for expand/collapse test
1386
- + reset: preserve skip-worktree bit in mixed reset
1387
- + reset: rename is_missing to !is_in_reset_tree
1388
- (this branch is used by ds/fetch-pull-with-sparse-index and ld/sparse-diff-blame.)
1389
-
1390
- Various operating modes of "git reset" have been made to work
1391
- better with the sparse index.
1392
-
1393
- Will merge to 'master'.
1394
- source: <pull.1048.v6.git.1638201164.gitgitgadget@gmail.com>
1395
-
1396
-
1478
* es/superproject-aware-submodules (2021-11-18) 5 commits
1479
- submodule: use config to find superproject worktree
1480
- submodule: record superproject gitdir during 'update'
@@ -1409,7 +1490,7 @@ Release tarballs are available at:
1490
source: <20211117005701.371808-1-emilyshaffer@google.com>
1491
1492
1412
-* ns/batched-fsync (2021-12-06) 8 commits
1493
+* ns/batched-fsync (2021-12-08) 8 commits
1494
- core.fsyncobjectfiles: performance tests for add and stash
1495
- core.fsyncobjectfiles: tests for batch mode
1496
- unpack-objects: use the bulk-checkin infrastructure
@@ -1429,35 +1510,37 @@ Release tarballs are available at:
1510
1511
1512
* en/zdiff3 (2021-12-01) 2 commits
1432
- - update documentation for new zdiff3 conflictStyle
1433
- - xdiff: implement a zealous diff3, or "zdiff3"
1513
+ (merged to 'next' on 2021-12-07 at baa3b24593)
1514
+ + update documentation for new zdiff3 conflictStyle
1515
+ + xdiff: implement a zealous diff3, or "zdiff3"
1516
1517
"Zealous diff3" style of merge conflict presentation has been added.
1518
1437
- Will merge to 'next'.
1519
+ Will merge to 'master'.
1520
source: <pull.1036.v5.git.git.1638317108.gitgitgadget@gmail.com>
1521
1522
1523
* js/scalar (2021-12-04) 15 commits
1442
- - scalar: implement the `version` command
1443
- - scalar: implement the `delete` command
1444
- - scalar: teach 'reconfigure' to optionally handle all registered enlistments
1445
- - scalar: allow reconfiguring an existing enlistment
1446
- - scalar: implement the `run` command
1447
- - scalar: teach 'clone' to support the --single-branch option
1448
- - scalar: implement the `clone` subcommand
1449
- - scalar: implement 'scalar list'
1450
- - scalar: let 'unregister' handle a deleted enlistment directory gracefully
1451
- - scalar: 'unregister' stops background maintenance
1452
- - scalar: 'register' sets recommended config and starts maintenance
1453
- - scalar: create test infrastructure
1454
- - scalar: start documenting the command
1455
- - scalar: create a rudimentary executable
1456
- - scalar: add a README with a roadmap
1524
+ (merged to 'next' on 2021-12-10 at 6248603a80)
1525
+ + scalar: implement the `version` command
1526
+ + scalar: implement the `delete` command
1527
+ + scalar: teach 'reconfigure' to optionally handle all registered enlistments
1528
+ + scalar: allow reconfiguring an existing enlistment
1529
+ + scalar: implement the `run` command
1530
+ + scalar: teach 'clone' to support the --single-branch option
1531
+ + scalar: implement the `clone` subcommand
1532
+ + scalar: implement 'scalar list'
1533
+ + scalar: let 'unregister' handle a deleted enlistment directory gracefully
1534
+ + scalar: 'unregister' stops background maintenance
1535
+ + scalar: 'register' sets recommended config and starts maintenance
1536
+ + scalar: create test infrastructure
1537
+ + scalar: start documenting the command
1538
+ + scalar: create a rudimentary executable
1539
+ + scalar: add a README with a roadmap
1540
1541
Add pieces from "scalar" to contrib/.
1542
1460
- Will merge to 'next'?
1543
+ Will merge to 'master'.
1544
source: <pull.1005.v10.git.1638538470.gitgitgadget@gmail.com>
1545
1546