What's cooking (2019/12 #04)
Junio C Hamano committed
Dec 17, 2019 at 13:56 UTC
d45a02b1a642286e192546cb4d11d6878dab3516
1 file changed
+371
-272
whats-cooking.txt
+371
-272
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2019, #03; Tue, 10)
4
-X-master-at: 83f90b8666dffdc13ddedebd3c91bf4ae7307d24
5
-X-next-at: c3465028122a735d0278f138f606ef64549fd8a8
3
+Subject: What's cooking in git.git (Dec 2019, #04; Tue, 17)
4
+X-master-at: b02fd2accad4d48078671adf38fe5b5976d77304
5
+X-next-at: 63ccf5415c3f64822b547b264c51e5537392acd7
6
7
-What's cooking in git.git (Dec 2019, #03; Tue, 10)
7
+What's cooking in git.git (Dec 2019, #04; Tue, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -23,6 +23,19 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
26
+* rs/test-cleanup (2019-11-30) 7 commits
27
+ (merged to 'next' on 2019-12-02 at eabc2e30f5)
28
+ + t7811: don't create unused file
29
+ + t9300: don't create unused file
30
+ + test: use test_must_be_empty F instead of test_cmp empty F
31
+ + test: use test_must_be_empty F instead of test -z $(cat F)
32
+ + t1400: use test_must_be_empty
33
+ + t1410: use test_line_count
34
+ + t1512: use test_line_count
35
+
36
+ Test cleanup.
37
+
38
+
39
* ag/sequencer-continue-leakfix (2019-11-30) 1 commit
40
(merged to 'next' on 2019-12-05 at 923a6a7ab6)
41
+ sequencer: fix a memory leak in sequencer_continue()
@@ -30,6 +43,19 @@ of the repositories listed at
43
Leakfix.
44
45
46
+* ag/sequencer-todo-updates (2019-11-25) 5 commits
47
+ (merged to 'next' on 2019-11-27 at 3258d51dfc)
48
+ + sequencer: directly call pick_commits() from complete_action()
49
+ + rebase: fill `squash_onto' in get_replay_opts()
50
+ + sequencer: move the code writing total_nr on the disk to a new function
51
+ + sequencer: update `done_nr' when skipping commands in a todo list
52
+ + sequencer: update `total_nr' when adding an item to a todo list
53
+ (this branch is used by ag/edit-todo-drop-check.)
54
+
55
+ Reduce unnecessary reading of state variables back from the disk
56
+ during sequencer operation.
57
+
58
+
59
* am/pathspec-from-file (2019-11-20) 6 commits
60
(merged to 'next' on 2019-11-27 at ee131b80fb)
61
+ commit: support the --pathspec-from-file option
@@ -60,6 +86,25 @@ of the repositories listed at
86
Test portability fix.
87
88
89
+* cs/store-packfiles-in-hashmap (2019-12-03) 1 commit
90
+ (merged to 'next' on 2019-12-05 at 887d5559bb)
91
+ + packfile.c: speed up loading lots of packfiles
92
+
93
+ In a repository with many packfiles, the cost of the procedure that
94
+ avoids registering the same packfile twice was unnecessarily high
95
+ by using an inefficient search algorithm, which has been corrected.
96
+
97
+
98
+* dd/time-reentrancy (2019-12-01) 3 commits
99
+ (merged to 'next' on 2019-12-05 at d0c91f4d1b)
100
+ + mingw: use {gm,local}time_s as backend for {gm,local}time_r
101
+ + archive-zip.c: switch to reentrant localtime_r
102
+ + date.c: switch to reentrant {gm,local}time_r
103
+
104
+ Avoid gmtime() and localtime() and prefer their reentrant
105
+ counterparts.
106
+
107
+
108
* dl/lore-is-the-archive (2019-12-04) 3 commits
109
(merged to 'next' on 2019-12-05 at c87e168cd6)
110
+ doc: replace LKML link with lore.kernel.org
@@ -90,6 +135,27 @@ of the repositories listed at
135
messages.
136
137
138
+* dl/range-diff-with-notes (2019-12-06) 3 commits
139
+ (merged to 'next' on 2019-12-10 at af8f441807)
140
+ + range-diff: clear `other_arg` at end of function
141
+ + range-diff: mark pointers as const
142
+ + t3206: fix incorrect test name
143
+
144
+ Code clean-up.
145
+
146
+
147
+* dl/rebase-with-autobase (2019-12-05) 5 commits
148
+ (merged to 'next' on 2019-12-06 at 2d72b8cffe)
149
+ + rebase: fix format.useAutoBase breakage
150
+ + format-patch: teach --no-base
151
+ + t4014: use test_config()
152
+ + format-patch: fix indentation
153
+ + t3400: demonstrate failure with format.useAutoBase
154
+
155
+ "git rebase" did not work well when format.useAutoBase
156
+ configuration variable is set, which has been corrected.
157
+
158
+
159
* dl/submodule-set-url (2019-10-30) 1 commit
160
(merged to 'next' on 2019-12-05 at a164eccad1)
161
+ submodule: teach set-url subcommand
@@ -97,6 +163,45 @@ of the repositories listed at
163
"git submodule" learned a subcommand "set-url".
164
165
166
+* dl/test-cleanup (2019-12-04) 26 commits
167
+ (merged to 'next' on 2019-12-06 at 9129e71939)
168
+ + t7700: stop losing return codes of git commands
169
+ + t7700: make references to SHA-1 generic
170
+ + t7700: replace egrep with grep
171
+ + t7700: consolidate code into test_has_duplicate_object()
172
+ + t7700: consolidate code into test_no_missing_in_packs()
173
+ + t7700: s/test -f/test_path_is_file/
174
+ + t7700: move keywords onto their own line
175
+ + t7700: remove spaces after redirect operators
176
+ + t7700: drop redirections to /dev/null
177
+ + t7501: stop losing return codes of git commands
178
+ + t7501: remove spaces after redirect operators
179
+ + t5703: stop losing return codes of git commands
180
+ + t5703: simplify one-time-sed generation logic
181
+ + t5317: use ! grep to check for no matching lines
182
+ + t5317: stop losing return codes of git commands
183
+ + t4138: stop losing return codes of git commands
184
+ + t4015: use test_write_lines()
185
+ + t4015: stop losing return codes of git commands
186
+ + t3600: comment on inducing SIGPIPE in `git rm`
187
+ + t3600: stop losing return codes of git commands
188
+ + t3600: use test_line_count() where possible
189
+ + t3301: stop losing return codes of git commands
190
+ + t0090: stop losing return codes of git commands
191
+ + t0014: remove git command upstream of pipe
192
+ + apply-one-time-sed.sh: modernize style
193
+ + lib-bash.sh: move `then` onto its own line
194
+
195
+ Test cleanup.
196
+
197
+
198
+* dr/branch-usage-casefix (2019-12-09) 1 commit
199
+ (merged to 'next' on 2019-12-10 at ad8a629fc6)
200
+ + l10n: minor case fix in 'git branch' '--unset-upstream' description
201
+
202
+ Message fix.
203
+
204
+
205
* ds/commit-graph-delay-gen-progress (2019-11-27) 2 commits
206
(merged to 'next' on 2019-12-05 at 9252a4b1b6)
207
+ commit-graph: use start_delayed_progress()
@@ -131,6 +236,33 @@ of the repositories listed at
236
Code cleanup.
237
238
239
+* hw/doc-in-header (2019-11-18) 20 commits
240
+ (merged to 'next' on 2019-12-10 at 75ae310f9a)
241
+ + trace2: move doc to trace2.h
242
+ + submodule-config: move doc to submodule-config.h
243
+ + tree-walk: move doc to tree-walk.h
244
+ + trace: move doc to trace.h
245
+ + run-command: move doc to run-command.h
246
+ + parse-options: add link to doc file in parse-options.h
247
+ + credential: move doc to credential.h
248
+ + argv-array: move doc to argv-array.h
249
+ + cache: move doc to cache.h
250
+ + sigchain: move doc to sigchain.h
251
+ + pathspec: move doc to pathspec.h
252
+ + revision: move doc to revision.h
253
+ + attr: move doc to attr.h
254
+ + refs: move doc to refs.h
255
+ + remote: move doc to remote.h and refspec.h
256
+ + sha1-array: move doc to sha1-array.h
257
+ + merge: move doc to ll-merge.h
258
+ + graph: move doc to graph.h and graph.c
259
+ + dir: move doc to dir.h
260
+ + diff: move doc to diff.h and diffcore.h
261
+
262
+ Move material from Documentation/technical/api-*.txt to header
263
+ files.
264
+
265
+
266
* jk/lore-is-the-archive (2019-11-30) 2 commits
267
(merged to 'next' on 2019-12-02 at 603a2b0105)
268
+ doc: replace public-inbox links with lore.kernel.org
@@ -155,6 +287,37 @@ of the repositories listed at
287
that point at objects we have never heard of.
288
289
290
+* js/add-i-a-bit-more-tests (2019-12-06) 7 commits
291
+ (merged to 'next' on 2019-12-10 at d7ffb75a43)
292
+ + apply --allow-overlap: fix a corner case
293
+ + git add -p: use non-zero exit code when the diff generation failed
294
+ + t3701: verify that the diff.algorithm config setting is handled
295
+ + t3701: verify the shown messages when nothing can be added
296
+ + t3701: add a test for the different `add -p` prompts
297
+ + t3701: avoid depending on the TTY prerequisite
298
+ + t3701: add a test for advanced split-hunk editing
299
+ (this branch uses js/builtin-add-i-cmds.)
300
+
301
+ Test coverage update in preparation for further work on "git add -i".
302
+
303
+
304
+* js/builtin-add-i-cmds (2019-12-01) 9 commits
305
+ (merged to 'next' on 2019-12-05 at 30cfe5c15d)
306
+ + built-in add -i: offer the `quit` command
307
+ + built-in add -i: re-implement the `diff` command
308
+ + built-in add -i: implement the `patch` command
309
+ + built-in add -i: re-implement `add-untracked` in C
310
+ + built-in add -i: re-implement `revert` in C
311
+ + built-in add -i: implement the `update` command
312
+ + built-in add -i: prepare for multi-selection commands
313
+ + built-in add -i: allow filtering the modified files list
314
+ + add-interactive: make sure to release `rev.prune_data`
315
+ (this branch is used by js/add-i-a-bit-more-tests.)
316
+
317
+ "git add -i" that is getting rewritten in C has been extended to
318
+ cover subcommands other than the "patch".
319
+
320
+
321
* js/mingw-inherit-only-std-handles (2019-12-02) 6 commits
322
(merged to 'next' on 2019-12-05 at 289f13054b)
323
+ mingw: forbid translating ERROR_SUCCESS to an errno value
@@ -171,6 +334,13 @@ of the repositories listed at
334
operation in the parent process on Windows.
335
336
337
+* js/t3404-indent-fix (2019-12-09) 1 commit
338
+ (merged to 'next' on 2019-12-10 at 3a705a40d6)
339
+ + t3404: fix indentation
340
+
341
+ Test cleanup.
342
+
343
+
344
* jt/clone-recursesub-ref-advise (2019-12-03) 2 commits
345
(merged to 'next' on 2019-12-05 at fc071dddfe)
346
+ submodule--helper: advise on fatal alternate error
@@ -203,24 +373,32 @@ of the repositories listed at
373
rebase" proper.
374
375
206
-* rs/simplify-prepare-cmd (2019-11-27) 1 commit
207
- (merged to 'next' on 2019-12-02 at 12e1a9e935)
208
- + run-command: use prepare_git_cmd() in prepare_cmd()
376
+* rs/archive-zip-code-cleanup (2019-12-09) 1 commit
377
+ (merged to 'next' on 2019-12-10 at 5a0b530805)
378
+ + archive-zip: use enum for compression method
379
380
Code cleanup.
381
382
213
-* rs/test-cleanup (2019-11-30) 7 commits
214
- (merged to 'next' on 2019-12-02 at eabc2e30f5)
215
- + t7811: don't create unused file
216
- + t9300: don't create unused file
217
- + test: use test_must_be_empty F instead of test_cmp empty F
218
- + test: use test_must_be_empty F instead of test -z $(cat F)
219
- + t1400: use test_must_be_empty
220
- + t1410: use test_line_count
221
- + t1512: use test_line_count
383
+* rs/commit-export-env-simplify (2019-12-09) 1 commit
384
+ (merged to 'next' on 2019-12-10 at 591b24162c)
385
+ + commit: use strbuf_add() to add a length-limited string
386
223
- Test cleanup.
387
+ Code cleanup.
388
+
389
+
390
+* rs/patch-id-use-oid-to-hex (2019-12-09) 1 commit
391
+ (merged to 'next' on 2019-12-10 at cf403a83da)
392
+ + patch-id: use oid_to_hex() to print multiple object IDs
393
+
394
+ Code cleanup.
395
+
396
+
397
+* rs/simplify-prepare-cmd (2019-11-27) 1 commit
398
+ (merged to 'next' on 2019-12-02 at 12e1a9e935)
399
+ + run-command: use prepare_git_cmd() in prepare_cmd()
400
+
401
+ Code cleanup.
402
403
404
* rs/use-skip-prefix-more (2019-11-27) 5 commits
@@ -234,6 +412,15 @@ of the repositories listed at
412
Code cleanup.
413
414
415
+* rs/xdiff-ignore-ws-w-func-context (2019-12-05) 1 commit
416
+ (merged to 'next' on 2019-12-06 at e0522318ac)
417
+ + xdiff: unignore changes in function context
418
+
419
+ The "diff" machinery learned not to lose added/removed blank lines
420
+ in the context when --ignore-blank-lines and --function-context are
421
+ used at the same time.
422
+
423
+
424
* sg/assume-no-todo-update-in-cherry-pick (2019-11-24) 1 commit
425
(merged to 'next' on 2019-11-27 at 6908186f85)
426
+ sequencer: don't re-read todo for revert and cherry-pick
@@ -251,6 +438,15 @@ of the repositories listed at
438
TravisCI update.
439
440
441
+* sg/t9300-robustify (2019-12-06) 2 commits
442
+ (merged to 'next' on 2019-12-10 at dee7a9a945)
443
+ + t9300-fast-import: don't hang if background fast-import exits too early
444
+ + t9300-fast-import: store the PID in a variable instead of pidfile
445
+
446
+ The test on "fast-import" used to get stuck when "fast-import" died
447
+ in the middle.
448
+
449
+
450
* sg/test-squelch-noise-in-commit-bulk (2019-11-27) 1 commit
451
(merged to 'next' on 2019-12-05 at 7819efee07)
452
+ test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
@@ -268,42 +464,6 @@ of the repositories listed at
464
--------------------------------------------------
465
[New Topics]
466
271
-* at/rebase-fork-point-regression-fix (2019-12-09) 1 commit
272
- - rebase: fix --fork-point with short refname
273
-
274
- The "--fork-point" mode of "git rebase" regressed when the command
275
- was rewritten in C back in 2.20 era, which has been corrected.
276
-
277
- Waiting for discussion to settle.
278
-
279
-
280
-* dl/range-diff-with-notes (2019-12-06) 3 commits
281
- (merged to 'next' on 2019-12-10 at af8f441807)
282
- + range-diff: clear `other_arg` at end of function
283
- + range-diff: mark pointers as const
284
- + t3206: fix incorrect test name
285
-
286
- Code clean-up.
287
-
288
- Will merge to 'master'.
289
-
290
-
291
-* js/add-i-a-bit-more-tests (2019-12-06) 7 commits
292
- (merged to 'next' on 2019-12-10 at d7ffb75a43)
293
- + apply --allow-overlap: fix a corner case
294
- + git add -p: use non-zero exit code when the diff generation failed
295
- + t3701: verify that the diff.algorithm config setting is handled
296
- + t3701: verify the shown messages when nothing can be added
297
- + t3701: add a test for the different `add -p` prompts
298
- + t3701: avoid depending on the TTY prerequisite
299
- + t3701: add a test for advanced split-hunk editing
300
- (this branch uses js/builtin-add-i-cmds.)
301
-
302
- Test coverage update in preparation for further work on "git add -i".
303
-
304
- Will merge to 'master'.
305
-
306
-
467
* pw/advise-rebase-skip (2019-12-06) 9 commits
468
- rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
469
- rebase: fix advice when a fixup creates an empty commit
@@ -323,18 +483,10 @@ of the repositories listed at
483
The tip two are still RFC.
484
485
326
-* sg/t9300-robustify (2019-12-06) 2 commits
327
- (merged to 'next' on 2019-12-10 at dee7a9a945)
328
- + t9300-fast-import: don't hang if background fast-import exits too early
329
- + t9300-fast-import: store the PID in a variable instead of pidfile
330
-
331
- The test on "fast-import" used to get stuck when "fast-import" died
332
- in the middle.
333
-
334
- Will merge to 'master'.
335
-
336
-
337
-* dl/format-patch-notes-config-fixup (2019-12-09) 5 commits
486
+* dl/format-patch-notes-config-fixup (2019-12-13) 7 commits
487
+ (merged to 'next' on 2019-12-16 at e4da5b93bb)
488
+ + notes: break set_display_notes() into smaller functions
489
+ + config/format.txt: clarify behavior of multiple format.notes
490
(merged to 'next' on 2019-12-10 at 2d8830090f)
491
+ format-patch: move git_config() before repo_init_revisions()
492
+ format-patch: use --notes behavior for format.notes
@@ -350,53 +502,143 @@ of the repositories listed at
502
Will merge to 'master'.
503
504
353
-* dr/branch-usage-casefix (2019-12-09) 1 commit
354
- (merged to 'next' on 2019-12-10 at ad8a629fc6)
355
- + l10n: minor case fix in 'git branch' '--unset-upstream' description
505
+* bk/p4-misc-usability (2019-12-16) 4 commits
506
+ - git-p4: failure because of RCS keywords should show help
507
+ - git-p4: wrap patchRCSKeywords test to revert changes on failure
508
+ - git-p4: show detailed help when parsing options fail
509
+ - git-p4: yes/no prompts should sanitize user text
510
357
- Message fix.
511
+ Miscellaneous small UX improvements on "git-p4".
512
359
- Will merge to 'master'.
513
+ Will merge to 'next'.
514
+ cf. <xmqq8sncj991.fsf@gitster-ct.c.googlers.com>
515
516
362
-* js/t3404-indent-fix (2019-12-09) 1 commit
363
- (merged to 'next' on 2019-12-10 at 3a705a40d6)
364
- + t3404: fix indentation
517
+* en/fill-directory-fixes (2019-12-11) 8 commits
518
+ - dir: consolidate similar code in treat_directory()
519
+ - dir: synchronize treat_leading_path() and read_directory_recursive()
520
+ - dir: fix checks on common prefix directory
521
+ - dir: break part of read_directory_recursive() out for reuse
522
+ - dir: exit before wildcard fall-through if there is no wildcard
523
+ - dir: remove stray quote character in comment
524
+ - Revert "dir.c: make 'git-status --ignored' work within leading directories"
525
+ - t3011: demonstrate directory traversal failures
526
366
- Test cleanup.
527
+ Assorted fixes to the directory traversal API.
528
368
- Will merge to 'master'.
529
+ Will merge to 'next'.
530
531
371
-* rs/archive-zip-code-cleanup (2019-12-09) 1 commit
372
- (merged to 'next' on 2019-12-10 at 5a0b530805)
373
- + archive-zip: use enum for compression method
532
+* ja/doc-markup-cleanup (2019-12-13) 2 commits
533
+ - doc: indent multi-line items in list
534
+ - doc: remove non pure ASCII characters
535
375
- Code cleanup.
536
+ Doc cleanup.
537
377
- Will merge to 'master'.
538
+ Will merge to 'next'.
539
540
380
-* rs/commit-export-env-simplify (2019-12-09) 1 commit
381
- (merged to 'next' on 2019-12-10 at 591b24162c)
382
- + commit: use strbuf_add() to add a length-limited string
541
+* jc/drop-gen-hdrs (2019-12-13) 1 commit
542
+ - Makefile: drop GEN_HDRS
543
544
Code cleanup.
545
386
- Will merge to 'master'.
546
+ Will merge to 'next'.
547
548
389
-* rs/patch-id-use-oid-to-hex (2019-12-09) 1 commit
390
- (merged to 'next' on 2019-12-10 at cf403a83da)
391
- + patch-id: use oid_to_hex() to print multiple object IDs
549
+* js/add-p-in-c (2019-12-13) 19 commits
550
+ - built-in add -p: show helpful hint when nothing can be staged
551
+ - built-in add -p: only show the applicable parts of the help text
552
+ - built-in add -p: implement the 'q' ("quit") command
553
+ - built-in add -p: implement the '/' ("search regex") command
554
+ - built-in add -p: implement the 'g' ("goto") command
555
+ - built-in add -p: implement hunk editing
556
+ - strbuf: add a helper function to call the editor "on an strbuf"
557
+ - built-in add -p: coalesce hunks after splitting them
558
+ - built-in add -p: implement the hunk splitting feature
559
+ - built-in add -p: show different prompts for mode changes and deletions
560
+ - built-in app -p: allow selecting a mode change as a "hunk"
561
+ - built-in add -p: handle deleted empty files
562
+ - built-in add -p: support multi-file diffs
563
+ - built-in add -p: offer a helpful error message when hunk navigation failed
564
+ - built-in add -p: color the prompt and the help text
565
+ - built-in add -p: adjust hunk headers as needed
566
+ - built-in add -p: show colored hunks by default
567
+ - built-in add -i: wire up the new C code for the `patch` command
568
+ - built-in add -i: start implementing the `patch` functionality in C
569
+ (this branch is used by js/patch-mode-in-others-in-c.)
570
+
571
+ The effort to move "git-add--interactive" to C continues.
572
+
573
+ Will merge to 'next'.
574
+
575
+
576
+* ln/userdiff-elixir (2019-12-13) 1 commit
577
+ - userdiff: remove empty subexpression from elixir regex
578
+
579
+ Hotfix.
580
+
581
+ Will merge to 'next'.
582
+
583
+
584
+* mr/bisect-use-after-free (2019-12-11) 1 commit
585
+ - bisect--helper: avoid use-after-free
586
+
587
+ Use-after-free fix.
588
+
589
+ Will merge to 'next'.
590
+
591
+
592
+* pb/submodule-doc-xref (2019-12-11) 1 commit
593
+ - gitmodules: link to gitsubmodules guide
594
+
595
+ Doc update.
596
+
597
+ Will merge to 'next'.
598
+
599
+
600
+* rb/p4-lfs (2019-12-11) 1 commit
601
+ - git-p4: honor lfs.storage configuration variable
602
+
603
+ "git p4" used to ignore lfs.storage configuration variable, which
604
+ has been corrected.
605
+
606
+ Will merge to 'next'.
607
+
608
+
609
+* rs/ref-read-cleanup (2019-12-11) 2 commits
610
+ - remote: pass NULL to read_ref_full() because object ID is not needed
611
+ - refs: pass NULL to refs_read_ref_full() because object ID is not needed
612
613
Code cleanup.
614
395
- Will merge to 'master'.
615
+ Will merge to 'next'.
616
+
617
+
618
+* js/patch-mode-in-others-in-c (2019-12-17) 7 commits
619
+ - commit --interactive: make it work with the built-in `add -i`
620
+ - built-in add -p: implement the "worktree" patch modes
621
+ - built-in add -p: implement the "checkout" patch modes
622
+ - built-in stash: use the built-in `git add -p` if so configured
623
+ - legacy stash -p: respect the add.interactive.usebuiltin setting
624
+ - built-in add -p: implement the "stash" and "reset" patch modes
625
+ - built-in add -p: prepare for patch modes other than "stage"
626
+ (this branch uses js/add-p-in-c.)
627
+
628
+ The effort to move "git-add--interactive" to C continues.
629
630
--------------------------------------------------
631
[Stalled]
632
633
+* at/rebase-fork-point-regression-fix (2019-12-09) 1 commit
634
+ - rebase: fix --fork-point with short refname
635
+
636
+ The "--fork-point" mode of "git rebase" regressed when the command
637
+ was rewritten in C back in 2.20 era, which has been corrected.
638
+
639
+ Was waiting for discussion to settle.
640
+ cf. <CAPig+cQ-3Ds41hr91fRo_GvuFMTP7zNVJtaSqi-Yccq4Pk-8Qg@mail.gmail.com>
641
+
642
* ma/config-bool-valex (2019-11-14) 8 commits
643
- builtin/config: die if "value_regex" doesn't canonicalize as boolean
644
- builtin/config: warn if "value_regex" doesn't canonicalize as boolean
@@ -508,12 +750,13 @@ of the repositories listed at
750
[Cooking]
751
752
* ra/t5150-depends-on-perl (2019-11-27) 1 commit
511
- . t5150: skip request-pull test if Perl is disabled
753
+ (merged to 'next' on 2019-12-16 at 69bb280692)
754
+ + t5150: skip request-pull test if Perl is disabled
755
756
Some Porcelain commands are written in Perl, and tests on them are
757
expected not to work when the platform lacks a working perl.
758
516
- Redo.
759
+ Will merge to 'master'.
760
761
762
* am/pathspec-f-f-checkout (2019-12-04) 7 commits
@@ -532,21 +775,7 @@ of the repositories listed at
775
Will merge to 'master'.
776
777
535
-* dl/rebase-with-autobase (2019-12-05) 5 commits
536
- (merged to 'next' on 2019-12-06 at 2d72b8cffe)
537
- + rebase: fix format.useAutoBase breakage
538
- + format-patch: teach --no-base
539
- + t4014: use test_config()
540
- + format-patch: fix indentation
541
- + t3400: demonstrate failure with format.useAutoBase
542
-
543
- "git rebase" did not work well when format.useAutoBase
544
- configuration variable is set, which has been corrected.
545
-
546
- Will merge to 'master'.
547
-
548
-
549
-* es/pathspec-f-f-grep (2019-12-06) 1 commit
778
+* es/pathspec-f-f-grep (2019-12-13) 1 commit
779
- grep: support the --pathspec-from-file option
780
781
"git grep" learned the "--pathspec-from-file" command line
@@ -556,21 +785,9 @@ of the repositories listed at
785
cf. <20191204203911.237056-1-emilyshaffer@google.com>
786
787
559
-* rs/xdiff-ignore-ws-w-func-context (2019-12-05) 1 commit
560
- (merged to 'next' on 2019-12-06 at e0522318ac)
561
- + xdiff: unignore changes in function context
562
-
563
- The "diff" machinery learned not to lose added/removed blank lines
564
- in the context when --ignore-blank-lines and --function-context are
565
- used at the same time.
566
-
567
- Will merge to 'master'.
568
-
569
-
788
* ag/edit-todo-drop-check (2019-12-06) 2 commits
789
- rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
790
- sequencer: move check_todo_list_from_file() to rebase-interactive.c
573
- (this branch uses ag/sequencer-todo-updates.)
791
792
Allow the rebase.missingCommitsCheck configuration to kick in when
793
"rebase --edit-todo" and "rebase --continue" restarts the procedure.
@@ -579,26 +796,28 @@ of the repositories listed at
796
cf. <64aa4049-ee35-df4c-1e6c-80707f4f9070@gmail.com>
797
798
582
-* ds/sparse-cone (2019-11-22) 19 commits
583
- - sparse-checkout: check for dirty status
584
- - sparse-checkout: update working directory in-process for 'init'
585
- - sparse-checkout: cone mode should not interact with .gitignore
586
- - sparse-checkout: write using lockfile
587
- - sparse-checkout: use in-process update for disable subcommand
588
- - sparse-checkout: update working directory in-process
589
- - sparse-checkout: sanitize for nested folders
590
- - unpack-trees: add progress to clear_ce_flags()
591
- - unpack-trees: hash less in cone mode
592
- - sparse-checkout: init and set in cone mode
593
- - sparse-checkout: use hashmaps for cone patterns
594
- - sparse-checkout: add 'cone' mode
595
- - trace2: add region in clear_ce_flags
596
- - sparse-checkout: create 'disable' subcommand
597
- - sparse-checkout: add '--stdin' option to set subcommand
598
- - sparse-checkout: 'set' subcommand
599
- - clone: add --sparse mode
600
- - sparse-checkout: create 'init' subcommand
601
- - sparse-checkout: create builtin with 'list' subcommand
799
+* ds/sparse-cone (2019-12-13) 20 commits
800
+ (merged to 'next' on 2019-12-16 at c840c1d816)
801
+ + sparse-checkout: respect core.ignoreCase in cone mode
802
+ + sparse-checkout: check for dirty status
803
+ + sparse-checkout: update working directory in-process for 'init'
804
+ + sparse-checkout: cone mode should not interact with .gitignore
805
+ + sparse-checkout: write using lockfile
806
+ + sparse-checkout: use in-process update for disable subcommand
807
+ + sparse-checkout: update working directory in-process
808
+ + sparse-checkout: sanitize for nested folders
809
+ + unpack-trees: add progress to clear_ce_flags()
810
+ + unpack-trees: hash less in cone mode
811
+ + sparse-checkout: init and set in cone mode
812
+ + sparse-checkout: use hashmaps for cone patterns
813
+ + sparse-checkout: add 'cone' mode
814
+ + trace2: add region in clear_ce_flags
815
+ + sparse-checkout: create 'disable' subcommand
816
+ + sparse-checkout: add '--stdin' option to set subcommand
817
+ + sparse-checkout: 'set' subcommand
818
+ + clone: add --sparse mode
819
+ + sparse-checkout: create 'init' subcommand
820
+ + sparse-checkout: create builtin with 'list' subcommand
821
822
Management of sparsely checked-out working tree has gained a
823
dedicated "sparse-checkout" command.
@@ -607,145 +826,25 @@ of the repositories listed at
826
cf. <bea26b66-ac52-8f0e-9557-c958db7be628@gmail.com>
827
828
610
-* dl/test-cleanup (2019-12-04) 26 commits
611
- (merged to 'next' on 2019-12-06 at 9129e71939)
612
- + t7700: stop losing return codes of git commands
613
- + t7700: make references to SHA-1 generic
614
- + t7700: replace egrep with grep
615
- + t7700: consolidate code into test_has_duplicate_object()
616
- + t7700: consolidate code into test_no_missing_in_packs()
617
- + t7700: s/test -f/test_path_is_file/
618
- + t7700: move keywords onto their own line
619
- + t7700: remove spaces after redirect operators
620
- + t7700: drop redirections to /dev/null
621
- + t7501: stop losing return codes of git commands
622
- + t7501: remove spaces after redirect operators
623
- + t5703: stop losing return codes of git commands
624
- + t5703: simplify one-time-sed generation logic
625
- + t5317: use ! grep to check for no matching lines
626
- + t5317: stop losing return codes of git commands
627
- + t4138: stop losing return codes of git commands
628
- + t4015: use test_write_lines()
629
- + t4015: stop losing return codes of git commands
630
- + t3600: comment on inducing SIGPIPE in `git rm`
631
- + t3600: stop losing return codes of git commands
632
- + t3600: use test_line_count() where possible
633
- + t3301: stop losing return codes of git commands
634
- + t0090: stop losing return codes of git commands
635
- + t0014: remove git command upstream of pipe
636
- + apply-one-time-sed.sh: modernize style
637
- + lib-bash.sh: move `then` onto its own line
638
-
639
- Test cleanup.
640
-
641
- Will merge to 'master'.
642
-
643
-
644
-* cs/store-packfiles-in-hashmap (2019-12-03) 1 commit
645
- (merged to 'next' on 2019-12-05 at 887d5559bb)
646
- + packfile.c: speed up loading lots of packfiles
647
-
648
- In a repository with many packfiles, the cost of the procedure that
649
- avoids registering the same packfile twice was unnecessarily high
650
- by using an inefficient search algorithm, which has been corrected.
651
-
652
- Will merge to 'master'.
653
-
654
-
655
-* dd/time-reentrancy (2019-12-01) 3 commits
656
- (merged to 'next' on 2019-12-05 at d0c91f4d1b)
657
- + mingw: use {gm,local}time_s as backend for {gm,local}time_r
658
- + archive-zip.c: switch to reentrant localtime_r
659
- + date.c: switch to reentrant {gm,local}time_r
660
-
661
- Avoid gmtime() and localtime() and prefer their reentrant
662
- counterparts.
663
-
664
- Will merge to 'master'.
665
-
666
-
667
-* hw/doc-in-header (2019-11-18) 20 commits
668
- (merged to 'next' on 2019-12-10 at 75ae310f9a)
669
- + trace2: move doc to trace2.h
670
- + submodule-config: move doc to submodule-config.h
671
- + tree-walk: move doc to tree-walk.h
672
- + trace: move doc to trace.h
673
- + run-command: move doc to run-command.h
674
- + parse-options: add link to doc file in parse-options.h
675
- + credential: move doc to credential.h
676
- + argv-array: move doc to argv-array.h
677
- + cache: move doc to cache.h
678
- + sigchain: move doc to sigchain.h
679
- + pathspec: move doc to pathspec.h
680
- + revision: move doc to revision.h
681
- + attr: move doc to attr.h
682
- + refs: move doc to refs.h
683
- + remote: move doc to remote.h and refspec.h
684
- + sha1-array: move doc to sha1-array.h
685
- + merge: move doc to ll-merge.h
686
- + graph: move doc to graph.h and graph.c
687
- + dir: move doc to dir.h
688
- + diff: move doc to diff.h and diffcore.h
689
-
690
- Move material from Documentation/technical/api-*.txt to header
691
- files.
692
-
693
- Will merge to 'master'.
694
-
695
-
696
-* js/builtin-add-i-cmds (2019-12-01) 9 commits
697
- (merged to 'next' on 2019-12-05 at 30cfe5c15d)
698
- + built-in add -i: offer the `quit` command
699
- + built-in add -i: re-implement the `diff` command
700
- + built-in add -i: implement the `patch` command
701
- + built-in add -i: re-implement `add-untracked` in C
702
- + built-in add -i: re-implement `revert` in C
703
- + built-in add -i: implement the `update` command
704
- + built-in add -i: prepare for multi-selection commands
705
- + built-in add -i: allow filtering the modified files list
706
- + add-interactive: make sure to release `rev.prune_data`
707
- (this branch is used by js/add-i-a-bit-more-tests.)
708
-
709
- "git add -i" that is getting rewritten in C has been extended to
710
- cover subcommands other than the "patch".
711
-
712
- Will merge to 'master'.
713
-
714
-
829
* sg/name-rev-wo-recursion (2019-12-09) 14 commits
716
- - name-rev: cleanup name_ref()
717
- - name-rev: eliminate recursion in name_rev()
718
- - name-rev: use 'name->tip_name' instead of 'tip_name'
719
- - name-rev: drop name_rev()'s 'generation' and 'distance' parameters
720
- - name-rev: restructure creating/updating 'struct rev_name' instances
721
- - name-rev: restructure parsing commits and applying date cutoff
722
- - name-rev: pull out deref handling from the recursion
723
- - name-rev: extract creating/updating a 'struct name_rev' into a helper
724
- - t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
725
- - name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
726
- - name-rev: avoid unnecessary cast in name_ref()
727
- - name-rev: use strbuf_strip_suffix() in get_rev_name()
728
- - t6120-describe: modernize the 'check_describe' helper
729
- - t6120-describe: correct test repo history graph in comment
830
+ (merged to 'next' on 2019-12-16 at ce57cd054f)
831
+ + name-rev: cleanup name_ref()
832
+ + name-rev: eliminate recursion in name_rev()
833
+ + name-rev: use 'name->tip_name' instead of 'tip_name'
834
+ + name-rev: drop name_rev()'s 'generation' and 'distance' parameters
835
+ + name-rev: restructure creating/updating 'struct rev_name' instances
836
+ + name-rev: restructure parsing commits and applying date cutoff
837
+ + name-rev: pull out deref handling from the recursion
838
+ + name-rev: extract creating/updating a 'struct name_rev' into a helper
839
+ + t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
840
+ + name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
841
+ + name-rev: avoid unnecessary cast in name_ref()
842
+ + name-rev: use strbuf_strip_suffix() in get_rev_name()
843
+ + t6120-describe: modernize the 'check_describe' helper
844
+ + t6120-describe: correct test repo history graph in comment
845
846
Redo "git name-rev" to avoid recursive calls.
847
733
- Will merge to 'next'.
734
- cf. <20191209115258.9281-1-szeder.dev@gmail.com>
735
-
736
-
737
-* ag/sequencer-todo-updates (2019-11-25) 5 commits
738
- (merged to 'next' on 2019-11-27 at 3258d51dfc)
739
- + sequencer: directly call pick_commits() from complete_action()
740
- + rebase: fill `squash_onto' in get_replay_opts()
741
- + sequencer: move the code writing total_nr on the disk to a new function
742
- + sequencer: update `done_nr' when skipping commands in a todo list
743
- + sequencer: update `total_nr' when adding an item to a todo list
744
- (this branch is used by ag/edit-todo-drop-check.)
745
-
746
- Reduce unnecessary reading of state variables back from the disk
747
- during sequencer operation.
748
-
848
Will merge to 'master'.
849
850