What's cooking (2020/02) #06)
Junio C Hamano committed
Feb 28, 2020 at 14:46 UTC
4d1c4e03ce8257114c50f59c247b3221a5ca7d92
1 file changed
+296
-225
whats-cooking.txt
+296
-225
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2020, #05; Tue, 25)
3
+Subject: What's cooking in git.git (Feb 2020, #06; Fri, 28)
4
X-master-at: 2d2118b814c11f509e1aa76cb07110f7231668dc
5
-X-next-at: 5900a2a8f925f2c0ac44ac71f8d2c1959bdec53b
5
+X-next-at: f298c6ed49a42836ab0b0f9c379d447974961a64
6
7
-What's cooking in git.git (Feb 2020, #05; Tue, 25)
7
+What's cooking in git.git (Feb 2020, #06; Fri, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,58 +12,262 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-Accumulated fixes on the 'master' front have been flushed to 'maint'
16
-and a new maintenance release 2.25.1 has been tagged.
17
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
24
-[Graduated to "master"]
21
+[New Topics]
22
+
23
+* ag/rebase-remove-redundant-code (2020-02-26) 1 commit
24
+ (merged to 'next' on 2020-02-27 at b1f5289b67)
25
+ + builtin/rebase: remove a call to get_oid() on `options.switch_to'
26
+
27
+ Code reduction.
28
+
29
+ Will merge to 'master'.
30
+
31
+
32
+* js/ci-windows-update (2020-02-27) 3 commits
33
+ (merged to 'next' on 2020-02-27 at 691f1c929c)
34
+ + Azure Pipeline: switch to the latest agent pools
35
+ + ci: prevent `perforce` from being quarantined
36
+ + t/lib-httpd: avoid using macOS' sed
37
+
38
+ Updates to the CI settings.
39
+
40
+ Will merge to 'master'.
41
+
42
+
43
+* en/merge-path-collision (2020-02-27) 1 commit
44
+ - merge-recursive: apply collision handling unification to recursive case
45
+
46
+ Handling of conflicting renames in merge-recursive have further
47
+ been made consistent with how existing codepaths try to mimick what
48
+ is done to add/add conflicts.
49
+
50
+ Will merge to 'next'.
51
+
52
+
53
+* en/test-cleanup (2020-02-27) 5 commits
54
+ - t6020: new test with interleaved lexicographic ordering of directories
55
+ - t6022, t6046: test expected behavior instead of testing a proxy for it
56
+ - t3035: prefer test_must_fail to bash negation for git commands
57
+ - t6020, t6022, t6035: update merge tests to use test helper functions
58
+ - t602[1236], t6034: modernize test formatting
59
+
60
+ Test cleanup.
61
+
62
+ Will merge to 'next'.
63
+
64
26
-* bw/remote-rename-update-config (2020-02-10) 6 commits
27
- (merged to 'next' on 2020-02-14 at 30b1a477de)
28
- + remote rename/remove: gently handle remote.pushDefault config
29
- + config: provide access to the current line number
30
- + remote rename/remove: handle branch.<name>.pushRemote config values
31
- + remote: clean-up config callback
32
- + remote: clean-up by returning early to avoid one indentation
33
- + pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
65
+* js/https-proxy-config (2020-02-27) 2 commits
66
+ - config: documentation for HTTPS proxy client cert.
67
+ - http: add client cert for HTTPS proxies.
68
35
- "git remote rename X Y" needs to adjust configuration variables
36
- (e.g. branch.<name>.remote) whose value used to be X to Y.
37
- branch.<name>.pushRemote is now also updated.
69
+ A handful of options to configure SSL when talking to proxies have
70
+ been added.
71
72
+ Not enough review. Addition of on-disk key looks wrong.
73
40
-* es/bright-colors (2020-02-11) 3 commits
41
- (merged to 'next' on 2020-02-14 at cc17dbc7e8)
42
- + color.c: alias RGB colors 8-15 to aixterm colors
43
- + color.c: support bright aixterm colors
44
- + color.c: refactor color_output arguments
74
46
- The basic 7 colors learned the brighter counterparts
47
- (e.g. "brightred").
75
+* rs/commit-graph-code-simplification (2020-02-27) 1 commit
76
+ (merged to 'next' on 2020-02-27 at f298c6ed49)
77
+ + commit-graph: use progress title directly
78
79
+ Code simplfication.
80
50
-* es/doc-mentoring (2020-02-14) 2 commits
51
- (merged to 'next' on 2020-02-17 at e3f3e316eb)
52
- + MyFirstContribution: rephrase contact info
53
- (merged to 'next' on 2020-02-05 at 3b05aabbcd)
54
- + MyFirstContribution: add avenues for getting help
81
+ Will merge to 'master'.
82
+
83
+
84
+* jc/doc-single-h-is-for-help (2020-02-27) 1 commit
85
+ - Documentation: clarify that `-h` alone stands for `help`
86
+
87
+ Both "git ls-remote -h" and "git grep -h" give short usage help,
88
+ like any other Git subcommand, but it is not unreasonable to expect
89
+ that the former would behave the same as "git ls-remote --head"
90
+ (there is no other sensible behaviour for the latter). The
91
+ documentation has been updated in an attempt to clarify this.
92
+
93
+
94
+* hi/gpg-use-check-signature (2020-02-28) 1 commit
95
+ - Revert "gpg-interface: prefer check_signature() for GPG verification"
96
+
97
+ "git merge signed-tag" while lacking the public key started to say
98
+ "No signature", which was utterly wrong. This regression has been
99
+ reverted.
100
+
101
+ Will merge to 'next'.
102
+
103
+
104
+* rt/format-zero-length-fix (2020-02-28) 2 commits
105
+ - config.mak.dev: re-enable -Wformat-zero-length
106
+ - rebase-interactive.c: silence format-zero-length warnings
107
56
- Doc for new contributors.
108
+ Recently we inadvertently added a few instances of using 0-width
109
+ format string to functions that we mark as printf-like without any
110
+ developers noticing. The root cause was that the compiler warning
111
+ that is triggered by this is almost always useless and we disabled
112
+ the warning in our developer builds, but not for general public.
113
+ The new instances have been corrected, and the warning has been
114
+ resurrected in the developer builds.
115
+
116
+ Will merge to 'next'.
117
118
--------------------------------------------------
59
-[New Topics]
119
+[Stalled]
120
+
121
+* yz/p4-py3 (2020-02-13) 14 commits
122
+ - ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
123
+ - git-p4: use python3's input() everywhere
124
+ - git-p4: simplify regex pattern generation for parsing diff-tree
125
+ - git-p4: use dict.items() iteration for python3 compatibility
126
+ - git-p4: use functools.reduce instead of reduce
127
+ - git-p4: fix freezing while waiting for fast-import progress
128
+ - git-p4: use marshal format version 2 when sending to p4
129
+ - git-p4: open .gitp4-usercache.txt in text mode
130
+ - git-p4: convert path to unicode before processing them
131
+ - git-p4: encode/decode communication with git for python3
132
+ - git-p4: encode/decode communication with p4 for python3
133
+ - git-p4: remove string type aliasing
134
+ - git-p4: change the expansion test from basestring to list
135
+ - git-p4: make python2.7 the oldest supported version
136
+
137
+ Update "git p4" to work with Python 3.
138
+
139
+ Hold.
140
+ Waiting for SoB from Szeder on the last step.
141
+ cf. <xmqqk14qqj7n.fsf@gitster-ct.c.googlers.com>
142
+
143
+
144
+* dl/merge-autostash (2020-01-13) 17 commits
145
+ - pull: pass --autostash to merge
146
+ - t5520: make test_pull_autostash() accept expect_parent_num
147
+ - merge: teach --autostash option
148
+ - sequencer: unlink autostash in apply_autostash()
149
+ - sequencer: extract perform_autostash() from rebase
150
+ - rebase: generify create_autostash()
151
+ - rebase: extract create_autostash()
152
+ - reset: extract reset_head() from rebase
153
+ - rebase: generify reset_head()
154
+ - rebase: use apply_autostash() from sequencer.c
155
+ - sequencer: make apply_rebase() accept a path
156
+ - rebase: use read_oneliner()
157
+ - sequencer: make read_oneliner() extern
158
+ - sequencer: configurably warn on non-existent files
159
+ - sequencer: use file strbuf for read_oneliner()
160
+ - t7600: use test_write_lines()
161
+ - Makefile: alphabetically sort += lists
162
+
163
+ "git merge" learns the "--autostash" option.
164
+
165
+ Expecting a reroll.
166
+ cf. <20200123042906.GA29009@generichostname>
167
+
168
+
169
+* tb/commit-graph-split-merge (2020-02-12) 3 commits
170
+ - builtin/commit-graph.c: support '--input=none'
171
+ - builtin/commit-graph.c: introduce '--input=<source>'
172
+ - builtin/commit-graph.c: support '--split[=<strategy>]'
173
+
174
+ The code to write out the commit-graph has been taught a few
175
+ options to control if the resulting graph chains should be merged
176
+ or a single new incremental graph is created.
177
+
178
+ Waiting for the discussion to settle.
179
+ cf. <20200212205028.GE4364@syl.local>
180
+
181
+
182
+* bk/p4-pre-edit-changelist (2020-02-14) 7 commits
183
+ - git-p4: add RCS keyword status message
184
+ - git-p4: add p4 submit hooks
185
+ - git-p4: restructure code in submit
186
+ - git-p4: add --no-verify option
187
+ - git-p4: add p4-pre-submit exit text
188
+ - git-p4: create new function run_git_hook
189
+ - git-p4: rewrite prompt to be Windows compatible
190
+
191
+ "git p4" learned four new hooks and also "--no-verify" option to
192
+ bypass them (and the existing "p4-pre-submit" hook).
193
+
194
+ Waiting for response to RFH from Windows/Python folks.
195
+ cf. <pull.698.v6.git.git.1581691486.gitgitgadget@gmail.com>
196
+
197
+
198
+* en/fill-directory-exponential (2020-01-31) 6 commits
199
+ - t7063: blindly accept diffs
200
+ - dir: replace exponential algorithm with a linear one
201
+ - dir: refactor treat_directory to clarify control flow
202
+ - dir: fix confusion based on variable tense
203
+ - dir: fix broken comment
204
+ - dir: consolidate treat_path() and treat_one_path()
205
+
206
+ The directory traversal code had redundant recursive calls which
207
+ made its performance characteristics exponential with respect to
208
+ the depth of the tree, which was corrected.
209
+
210
+ Expecting an update.
211
+ cf. <CABPp-BEnt4C_7XyxQKxk4aga=JjM9fXCE-7SFp7azO_v5-pQYw@mail.gmail.com>
212
+ cf. <pull.700.v2.git.git.1580495486.gitgitgadget@gmail.com>
213
+ cf. <CABPp-BF0SO92wxY-dM14Vxv6BGA5=T=CicdwbiaZ7c9w6-j2jQ@mail.gmail.com>
214
+
215
+
216
+* vn/reset-deleted-ita (2019-07-26) 1 commit
217
+ - reset: unstage empty deleted ita files
218
+
219
+ "git reset HEAD [<pathspec>]" did not reset an empty file that was
220
+ added with the intent-to-add bit.
221
+
222
+ Expecting a reroll.
223
+
224
+
225
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
226
+ - zlib.c: use size_t for size
227
+
228
+ The wrapper to call into zlib followed our long tradition to use
229
+ "unsigned long" for sizes of regions in memory, which have been
230
+ updated to use "size_t".
231
+
232
+--------------------------------------------------
233
+[Cooking]
234
+
235
+* pw/advise-rebase-skip (2019-12-06) 9 commits
236
+ - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
237
+ - rebase: fix advice when a fixup creates an empty commit
238
+ - commit: give correct advice for empty commit during a rebase
239
+ - commit: encapsulate determine_whence() for sequencer
240
+ - commit: use enum value for multiple cherry-picks
241
+ - sequencer: write CHERRY_PICK_HEAD for reword and edit
242
+ - cherry-pick: check commit error messages
243
+ - cherry-pick: add test for `--skip` advice in `git commit`
244
+ - t3404: use test_cmp_rev
245
+
246
+ The mechanism to prevent "git commit" from making an empty commit
247
+ or amending during an interrupted cherry-pick was broken during the
248
+ rewrite of "git rebase" in C, which has been corrected.
249
+
250
+ Will discard the tip two, which are still RFC, and advance the rest.
251
+ cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
252
+
253
+
254
+* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
255
+ - rebase: --fork-point regression fix
256
+
257
+ The "--fork-point" mode of "git rebase" regressed when the command
258
+ was rewritten in C back in 2.20 era, which has been corrected.
259
+
260
+ Will merge to 'next'.
261
+ Was waiting for a response to "shouldn't this be sufficient?" but
262
+ I think it should.
263
+
264
61
-* am/mingw-poll-fix (2020-02-18) 1 commit
265
+* am/mingw-poll-fix (2020-02-27) 1 commit
266
- mingw: workaround for hangs when sending STDIN
267
268
MinGW's poll() emulation has been improved.
269
66
- Needs review by Windows folks.
270
+ Will merge to 'next'.
271
272
273
* en/check-ignore (2020-02-18) 1 commit
@@ -139,6 +343,8 @@ of the repositories listed at
343
apply" (it is designed to be a good "git am" input). It learned a
344
new option to show only the patch part.
345
346
+ Will merge to 'next'.
347
+
348
349
* bc/wildcard-credential (2020-02-20) 5 commits
350
(merged to 'next' on 2020-02-25 at ba3706cb90)
@@ -156,13 +362,14 @@ of the repositories listed at
362
363
364
* es/recursive-single-branch-clone (2020-02-25) 2 commits
159
- - clone: pass --single-branch during --recurse-submodules
160
- - submodule--helper: use C99 named initializer
365
+ (merged to 'next' on 2020-02-27 at 8e8fcca7cd)
366
+ + clone: pass --single-branch during --recurse-submodules
367
+ + submodule--helper: use C99 named initializer
368
369
"git clone --recurse-submodules --single-branch" now uses the same
163
- simgle-branch option when cloning the submodules.
370
+ single-branch option when cloning the submodules.
371
165
- Will merge to 'next'.
372
+ Will merge to 'master'.
373
374
375
* jc/describe-misnamed-annotated-tag (2020-02-20) 1 commit
@@ -172,11 +379,13 @@ of the repositories listed at
379
the best name to explain commit C, and the tag is stored in a
380
"wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the
381
command gave a warning message but used A (not B) to describe C.
175
- If C is exactly at the tag, the desribe output would be "A", but
382
+ If C is exactly at the tag, the describe output would be "A", but
383
"git rev-parse A^0" would not be equal as "git rev-parse C^0". The
177
- behaviour of the command has been changed to use the "long" form
384
+ behavior of the command has been changed to use the "long" form
385
i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse.
386
387
+ Will merge to 'next'.
388
+
389
390
* jk/run-command-formatfix (2020-02-22) 1 commit
391
(merged to 'next' on 2020-02-25 at 39ad6eeb86)
@@ -187,15 +396,6 @@ of the repositories listed at
396
Will merge to 'master'.
397
398
190
-* jn/reftable-doc (2020-02-22) 1 commit
191
- (merged to 'next' on 2020-02-25 at e128adbaf6)
192
- + reftable: file format documentation
193
-
194
- Doc update, in preparation for adding the reftable feature.
195
-
196
- Will merge to 'master'.
197
-
198
-
399
* pb/recurse-submodules-fix (2020-02-19) 6 commits
400
- t/lib-submodule-update: add test removing nested submodules
401
- unpack-trees: check for missing submodule directory in merged_entry
@@ -210,18 +410,15 @@ of the repositories listed at
410
411
Code cleanup.
412
213
- Almost there.
413
+ Will merge to 'next'.
414
415
216
-* bc/sha-256-part-1-of-4 (2020-02-25) 25 commits
217
- - SQUASH???
416
+* bc/sha-256-part-1-of-4 (2020-02-28) 22 commits
417
- fast-import: add options for rewriting submodules
418
- fast-import: add a generic function to iterate over marks
419
- fast-import: make find_marks work on any mark set
420
- fast-import: add helper function for inserting mark object entries
421
- fast-import: permit reading multiple marks files
223
- - tag: store SHA-256 signatures in a header
224
- - gpg-interface: improve interface for parsing tags
422
- commit: use expected signature header for SHA-256
423
- worktree: allow repository version 1
424
- init-db: move writing repo version into a function
@@ -240,16 +437,22 @@ of the repositories listed at
437
- hash: implement and use a context cloning function
438
- builtin/pack-objects: make hash agnostic
439
440
+ SHA-256 transition continues.
441
+
442
+ Tentatively I dropped the bits about signed tag, as it depended on
443
+ a reverted change to the gpg interface API.
444
+
445
446
* es/do-not-let-rebase-switch-to-protected-branch (2020-02-24) 2 commits
245
- - rebase: refuse to switch to branch already checked out elsewhere
246
- - t3400: make test clean up after itself
447
+ (merged to 'next' on 2020-02-27 at 4b0009b609)
448
+ + rebase: refuse to switch to branch already checked out elsewhere
449
+ + t3400: make test clean up after itself
450
451
"git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
452
checked it out, even when the BRANCH is checked out in a different
453
worktree. This has been corrected.
454
252
- Will merge to 'next'.
455
+ Will merge to 'master'.
456
457
458
* es/worktree-avoid-duplication-fix (2020-02-24) 3 commits
@@ -289,21 +492,22 @@ of the repositories listed at
492
493
494
* jk/nth-packed-object-id (2020-02-24) 10 commits
292
- - packfile: drop nth_packed_object_sha1()
293
- - packed_object_info(): use object_id internally for delta base
294
- - packed_object_info(): use object_id for returning delta base
295
- - pack-check: push oid lookup into loop
296
- - pack-check: convert "internal error" die to a BUG()
297
- - pack-bitmap: use object_id when loading on-disk bitmaps
298
- - pack-objects: use object_id struct in pack-reuse code
299
- - pack-objects: convert oe_set_delta_ext() to use object_id
300
- - pack-objects: read delta base oid into object_id struct
301
- - nth_packed_object_oid(): use customary integer return
495
+ (merged to 'next' on 2020-02-27 at 8f1e796030)
496
+ + packfile: drop nth_packed_object_sha1()
497
+ + packed_object_info(): use object_id internally for delta base
498
+ + packed_object_info(): use object_id for returning delta base
499
+ + pack-check: push oid lookup into loop
500
+ + pack-check: convert "internal error" die to a BUG()
501
+ + pack-bitmap: use object_id when loading on-disk bitmaps
502
+ + pack-objects: use object_id struct in pack-reuse code
503
+ + pack-objects: convert oe_set_delta_ext() to use object_id
504
+ + pack-objects: read delta base oid into object_id struct
505
+ + nth_packed_object_oid(): use customary integer return
506
507
Code cleanup to use "struct object_id" more by replacing use of
508
"char *sha1"
509
306
- Will merge to 'next'.
510
+ Will merge to 'master'.
511
512
513
* kk/complete-diff-color-moved (2020-02-24) 1 commit
@@ -344,54 +548,16 @@ of the repositories listed at
548
Will merge to 'master'.
549
550
347
-* be/describe-multiroot (2020-02-25) 1 commit
348
- - describe: dont abort too early when searching tags
551
+* be/describe-multiroot (2020-02-26) 1 commit
552
+ (merged to 'next' on 2020-02-27 at b476663ffc)
553
+ + describe: don't abort too early when searching tags
554
555
"git describe" in a repository with multiple root commits sometimes
556
gave up looking for the best tag to describe a given commit with
557
too early, which has been adjusted.
558
354
---------------------------------------------------
355
-[Stalled]
356
-
357
-* pw/advise-rebase-skip (2019-12-06) 9 commits
358
- - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
359
- - rebase: fix advice when a fixup creates an empty commit
360
- - commit: give correct advice for empty commit during a rebase
361
- - commit: encapsulate determine_whence() for sequencer
362
- - commit: use enum value for multiple cherry-picks
363
- - sequencer: write CHERRY_PICK_HEAD for reword and edit
364
- - cherry-pick: check commit error messages
365
- - cherry-pick: add test for `--skip` advice in `git commit`
366
- - t3404: use test_cmp_rev
367
-
368
- The mechanism to prevent "git commit" from making an empty commit
369
- or amending during an interrupted cherry-pick was broken during the
370
- rewrite of "git rebase" in C, which has been corrected.
371
-
372
- What's the status of this one?
373
- The tip two are still RFC.
374
- cf. <CABPp-BE_ktNmDB43N_qijzYzhXvsK8Fi7TJQ7goHu+MzGvdpBQ@mail.gmail.com>
375
-
376
-
377
-* vn/reset-deleted-ita (2019-07-26) 1 commit
378
- - reset: unstage empty deleted ita files
379
-
380
- "git reset HEAD [<pathspec>]" did not reset an empty file that was
381
- added with the intent-to-add bit.
382
-
383
- Expecting a reroll.
384
-
385
-
386
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
387
- - zlib.c: use size_t for size
559
+ Will merge to 'master'.
560
389
- The wrapper to call into zlib followed our long tradition to use
390
- "unsigned long" for sizes of regions in memory, which have been
391
- updated to use "size_t".
392
-
393
---------------------------------------------------
394
-[Cooking]
561
562
* jk/object-filter-with-bitmap (2020-02-18) 16 commits
563
(merged to 'next' on 2020-02-19 at d38487e23d)
@@ -415,24 +581,23 @@ of the repositories listed at
581
582
The object reachability bitmap machinery and the partial cloning
583
machinery were not prepared to work well together, because some
418
- object-filtering criteria partial clones use inherently rely on
419
- object traversal, but the bitmap machinery is an optimization to
420
- bypass that object traversal. There however are some cases that
421
- they can work together, and they were taught about this case.
584
+ object-filtering criteria that partial clones use inherently rely
585
+ on object traversal, but the bitmap machinery is an optimization
586
+ to bypass that object traversal. There however are some cases
587
+ where they can work together, and they were taught about them.
588
589
Will merge to 'master'.
590
591
426
-* hw/advise-ng (2020-02-25) 3 commits
592
+* hw/advise-ng (2020-02-27) 4 commits
593
- tag: use new advice API to check visibility
594
- advice: revamp advise API
595
+ - advice: change "setupStreamFailure" to "setUpstreamFailure"
596
- advice: extract vadvise() from advise()
597
598
Revamping of the advise API to allow more systematic enumeration of
599
advice knobs in the future.
600
434
- Getting there, but not quite.
435
-
601
602
* ds/sparse-add (2020-02-20) 5 commits
603
(merged to 'next' on 2020-02-25 at de68d14e77)
@@ -448,20 +613,10 @@ of the repositories listed at
613
Will merge to 'master'.
614
615
451
-* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
452
- - rebase: --fork-point regression fix
453
-
454
- The "--fork-point" mode of "git rebase" regressed when the command
455
- was rewritten in C back in 2.20 era, which has been corrected.
456
-
457
- Was waiting for discussion to settle.
458
- cf. <CAPig+cQ-3Ds41hr91fRo_GvuFMTP7zNVJtaSqi-Yccq4Pk-8Qg@mail.gmail.com>
459
- cf. <xmqq36dtwcvw.fsf@gitster-ct.c.googlers.com>
460
-
461
-
462
-* hn/reftable (2020-02-18) 5 commits
616
+* hn/reftable (2020-02-26) 6 commits
617
. Reftable support for git-core
618
. Add reftable library
619
+ . reftable: file format documentation
620
. refs: document how ref_iterator_advance_fn should handle symrefs
621
. create .git/refs in files-backend.c
622
. refs.h: clarify reflog iteration order
@@ -538,53 +693,6 @@ of the repositories listed at
693
Will merge to 'master'.
694
695
541
-* bk/p4-pre-edit-changelist (2020-02-14) 7 commits
542
- - git-p4: add RCS keyword status message
543
- - git-p4: add p4 submit hooks
544
- - git-p4: restructure code in submit
545
- - git-p4: add --no-verify option
546
- - git-p4: add p4-pre-submit exit text
547
- - git-p4: create new function run_git_hook
548
- - git-p4: rewrite prompt to be Windows compatible
549
-
550
- "git p4" learned four new hooks and also "--no-verify" option to
551
- bypass them (and the existing "p4-pre-submit" hook).
552
-
553
- Waiting for response to RFH from Windows/Python folks.
554
- cf. <pull.698.v6.git.git.1581691486.gitgitgadget@gmail.com>
555
-
556
-
557
-* en/fill-directory-exponential (2020-01-31) 6 commits
558
- - t7063: blindly accept diffs
559
- - dir: replace exponential algorithm with a linear one
560
- - dir: refactor treat_directory to clarify control flow
561
- - dir: fix confusion based on variable tense
562
- - dir: fix broken comment
563
- - dir: consolidate treat_path() and treat_one_path()
564
-
565
- The directory traversal code had redundant recursive calls which
566
- made its performance characteristics exponential wrt the depth of
567
- the tree, which was corrected.
568
-
569
- Expecting an update.
570
- cf. <CABPp-BEnt4C_7XyxQKxk4aga=JjM9fXCE-7SFp7azO_v5-pQYw@mail.gmail.com>
571
- cf. <pull.700.v2.git.git.1580495486.gitgitgadget@gmail.com>
572
- cf. <CABPp-BF0SO92wxY-dM14Vxv6BGA5=T=CicdwbiaZ7c9w6-j2jQ@mail.gmail.com>
573
-
574
-
575
-* tb/commit-graph-split-merge (2020-02-12) 3 commits
576
- - builtin/commit-graph.c: support '--input=none'
577
- - builtin/commit-graph.c: introduce '--input=<source>'
578
- - builtin/commit-graph.c: support '--split[=<strategy>]'
579
-
580
- The code to write out the commit-graph has been taught a few
581
- options to control if the resulting graph chains should be merged
582
- or a single new incremental graph is created.
583
-
584
- Waiting for the discussion to settle.
585
- cf. <20200212205028.GE4364@syl.local>
586
-
587
-
696
* am/pathspec-f-f-more (2020-02-19) 8 commits
697
- stash push: support the --pathspec-from-file option
698
- stash: eliminate crude option parsing
@@ -598,53 +706,7 @@ of the repositories listed at
706
"git rm" and "git stash" learns the new "--pathspec-from-file"
707
option.
708
601
-
602
-* dl/merge-autostash (2020-01-13) 17 commits
603
- - pull: pass --autostash to merge
604
- - t5520: make test_pull_autostash() accept expect_parent_num
605
- - merge: teach --autostash option
606
- - sequencer: unlink autostash in apply_autostash()
607
- - sequencer: extract perform_autostash() from rebase
608
- - rebase: generify create_autostash()
609
- - rebase: extract create_autostash()
610
- - reset: extract reset_head() from rebase
611
- - rebase: generify reset_head()
612
- - rebase: use apply_autostash() from sequencer.c
613
- - sequencer: make apply_rebase() accept a path
614
- - rebase: use read_oneliner()
615
- - sequencer: make read_oneliner() extern
616
- - sequencer: configurably warn on non-existent files
617
- - sequencer: use file strbuf for read_oneliner()
618
- - t7600: use test_write_lines()
619
- - Makefile: alphabetically sort += lists
620
-
621
- "git merge" learns the "--autostash" option.
622
-
623
- Expecting a reroll.
624
- cf. <20200123042906.GA29009@generichostname>
625
-
626
-
627
-* yz/p4-py3 (2020-02-13) 14 commits
628
- - ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
629
- - git-p4: use python3's input() everywhere
630
- - git-p4: simplify regex pattern generation for parsing diff-tree
631
- - git-p4: use dict.items() iteration for python3 compatibility
632
- - git-p4: use functools.reduce instead of reduce
633
- - git-p4: fix freezing while waiting for fast-import progress
634
- - git-p4: use marshal format version 2 when sending to p4
635
- - git-p4: open .gitp4-usercache.txt in text mode
636
- - git-p4: convert path to unicode before processing them
637
- - git-p4: encode/decode communication with git for python3
638
- - git-p4: encode/decode communication with p4 for python3
639
- - git-p4: remove string type aliasing
640
- - git-p4: change the expansion test from basestring to list
641
- - git-p4: make python2.7 the oldest supported version
642
-
643
- Update "git p4" to work with Python 3.
644
-
645
- Hold.
646
- Waiting for SoB from Szeder on the last step.
647
- cf. <xmqqk14qqj7n.fsf@gitster-ct.c.googlers.com>
709
+ Will merge to 'next'.
710
711
712
* en/rebase-backend (2020-02-16) 20 commits
@@ -687,10 +749,19 @@ of the repositories listed at
749
the best name to explain commit C, and the tag is stored in a
750
"wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the
751
command gave a warning message but used A (not B) to describe C.
690
- If C is exactly at the tag, the desribe output would be "A", but
752
+ If C is exactly at the tag, the describe output would be "A", but
753
"git rev-parse A^0" would not be equal as "git rev-parse C^0". The
692
- behaviour of the command has been changed to use "B" to describe C
754
+ behavior of the command has been changed to use "B" to describe C
755
instead.
756
757
This is not the only possible approach for the issue, and it is
758
unknown if the proposed solution is the best one.
759
+
760
+
761
+* jn/reftable-doc (2020-02-22) 1 commit
762
+ (merged to 'next' on 2020-02-25 at e128adbaf6)
763
+ + reftable: file format documentation
764
+
765
+ Doc update, in preparation for adding the reftable feature.
766
+
767
+ Let's take and polish this as a part of hn/reftable topic.