What's cooking (2020/02) #06)

1 files changed, 296 insertions, 225 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 98c8f2d..97c866b 100644
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,10 +1,10 @@
 To: git@vger.kernel.org
 Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Feb 2020, #05; Tue, 25)
+Subject: What's cooking in git.git (Feb 2020, #06; Fri, 28)
 X-master-at: 2d2118b814c11f509e1aa76cb07110f7231668dc
-X-next-at: 5900a2a8f925f2c0ac44ac71f8d2c1959bdec53b
+X-next-at: f298c6ed49a42836ab0b0f9c379d447974961a64
 
-What's cooking in git.git (Feb 2020, #05; Tue, 25)
+What's cooking in git.git (Feb 2020, #06; Fri, 28)
 --------------------------------------------------
 
 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
 '+' are in 'next'.  The ones marked with '.' do not appear in any of
 the integration branches, but I am still holding onto them.
 
-Accumulated fixes on the 'master' front have been flushed to 'maint'
-and a new maintenance release 2.25.1 has been tagged.
-
 You can find the changes described here in the integration branches
 of the repositories listed at
 
     http://git-blame.blogspot.com/p/git-public-repositories.html
 
 --------------------------------------------------
-[Graduated to "master"]
+[New Topics]
+
+* ag/rebase-remove-redundant-code (2020-02-26) 1 commit
+  (merged to 'next' on 2020-02-27 at b1f5289b67)
+ + builtin/rebase: remove a call to get_oid() on `options.switch_to'
+
+ Code reduction.
+
+ Will merge to 'master'.
+
+
+* js/ci-windows-update (2020-02-27) 3 commits
+  (merged to 'next' on 2020-02-27 at 691f1c929c)
+ + Azure Pipeline: switch to the latest agent pools
+ + ci: prevent `perforce` from being quarantined
+ + t/lib-httpd: avoid using macOS' sed
+
+ Updates to the CI settings.
+
+ Will merge to 'master'.
+
+
+* en/merge-path-collision (2020-02-27) 1 commit
+ - merge-recursive: apply collision handling unification to recursive case
+
+ Handling of conflicting renames in merge-recursive have further
+ been made consistent with how existing codepaths try to mimick what
+ is done to add/add conflicts.
+
+ Will merge to 'next'.
+
+
+* en/test-cleanup (2020-02-27) 5 commits
+ - t6020: new test with interleaved lexicographic ordering of directories
+ - t6022, t6046: test expected behavior instead of testing a proxy for it
+ - t3035: prefer test_must_fail to bash negation for git commands
+ - t6020, t6022, t6035: update merge tests to use test helper functions
+ - t602[1236], t6034: modernize test formatting
+
+ Test cleanup.
+
+ Will merge to 'next'.
+
 
-* bw/remote-rename-update-config (2020-02-10) 6 commits
-  (merged to 'next' on 2020-02-14 at 30b1a477de)
- + remote rename/remove: gently handle remote.pushDefault config
- + config: provide access to the current line number
- + remote rename/remove: handle branch.<name>.pushRemote config values
- + remote: clean-up config callback
- + remote: clean-up by returning early to avoid one indentation
- + pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
+* js/https-proxy-config (2020-02-27) 2 commits
+ - config: documentation for HTTPS proxy client cert.
+ - http: add client cert for HTTPS proxies.
 
- "git remote rename X Y" needs to adjust configuration variables
- (e.g. branch.<name>.remote) whose value used to be X to Y.
- branch.<name>.pushRemote is now also updated.
+ A handful of options to configure SSL when talking to proxies have
+ been added.
 
+ Not enough review.  Addition of on-disk key looks wrong.
 
-* es/bright-colors (2020-02-11) 3 commits
-  (merged to 'next' on 2020-02-14 at cc17dbc7e8)
- + color.c: alias RGB colors 8-15 to aixterm colors
- + color.c: support bright aixterm colors
- + color.c: refactor color_output arguments
 
- The basic 7 colors learned the brighter counterparts
- (e.g. "brightred").
+* rs/commit-graph-code-simplification (2020-02-27) 1 commit
+  (merged to 'next' on 2020-02-27 at f298c6ed49)
+ + commit-graph: use progress title directly
 
+ Code simplfication.
 
-* es/doc-mentoring (2020-02-14) 2 commits
-  (merged to 'next' on 2020-02-17 at e3f3e316eb)
- + MyFirstContribution: rephrase contact info
-  (merged to 'next' on 2020-02-05 at 3b05aabbcd)
- + MyFirstContribution: add avenues for getting help
+ Will merge to 'master'.
+
+
+* jc/doc-single-h-is-for-help (2020-02-27) 1 commit
+ - Documentation: clarify that `-h` alone stands for `help`
+
+ Both "git ls-remote -h" and "git grep -h" give short usage help,
+ like any other Git subcommand, but it is not unreasonable to expect
+ that the former would behave the same as "git ls-remote --head"
+ (there is no other sensible behaviour for the latter).  The
+ documentation has been updated in an attempt to clarify this.
+
+
+* hi/gpg-use-check-signature (2020-02-28) 1 commit
+ - Revert "gpg-interface: prefer check_signature() for GPG verification"
+
+ "git merge signed-tag" while lacking the public key started to say
+ "No signature", which was utterly wrong.  This regression has been
+ reverted.
+
+ Will merge to 'next'.
+
+
+* rt/format-zero-length-fix (2020-02-28) 2 commits
+ - config.mak.dev: re-enable -Wformat-zero-length
+ - rebase-interactive.c: silence format-zero-length warnings
 
- Doc for new contributors.
+ Recently we inadvertently added a few instances of using 0-width
+ format string to functions that we mark as printf-like without any
+ developers noticing.  The root cause was that the compiler warning
+ that is triggered by this is almost always useless and we disabled
+ the warning in our developer builds, but not for general public.
+ The new instances have been corrected, and the warning has been
+ resurrected in the developer builds.
+
+ Will merge to 'next'.
 
 --------------------------------------------------
-[New Topics]
+[Stalled]
+
+* yz/p4-py3 (2020-02-13) 14 commits
+ - ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
+ - git-p4: use python3's input() everywhere
+ - git-p4: simplify regex pattern generation for parsing diff-tree
+ - git-p4: use dict.items() iteration for python3 compatibility
+ - git-p4: use functools.reduce instead of reduce
+ - git-p4: fix freezing while waiting for fast-import progress
+ - git-p4: use marshal format version 2 when sending to p4
+ - git-p4: open .gitp4-usercache.txt in text mode
+ - git-p4: convert path to unicode before processing them
+ - git-p4: encode/decode communication with git for python3
+ - git-p4: encode/decode communication with p4 for python3
+ - git-p4: remove string type aliasing
+ - git-p4: change the expansion test from basestring to list
+ - git-p4: make python2.7 the oldest supported version
+
+ Update "git p4" to work with Python 3.
+
+ Hold.
+ Waiting for SoB from Szeder on the last step.
+ cf. <xmqqk14qqj7n.fsf@gitster-ct.c.googlers.com>
+
+
+* dl/merge-autostash (2020-01-13) 17 commits
+ - pull: pass --autostash to merge
+ - t5520: make test_pull_autostash() accept expect_parent_num
+ - merge: teach --autostash option
+ - sequencer: unlink autostash in apply_autostash()
+ - sequencer: extract perform_autostash() from rebase
+ - rebase: generify create_autostash()
+ - rebase: extract create_autostash()
+ - reset: extract reset_head() from rebase
+ - rebase: generify reset_head()
+ - rebase: use apply_autostash() from sequencer.c
+ - sequencer: make apply_rebase() accept a path
+ - rebase: use read_oneliner()
+ - sequencer: make read_oneliner() extern
+ - sequencer: configurably warn on non-existent files
+ - sequencer: use file strbuf for read_oneliner()
+ - t7600: use test_write_lines()
+ - Makefile: alphabetically sort += lists
+
+ "git merge" learns the "--autostash" option.
+
+ Expecting a reroll.
+ cf. <20200123042906.GA29009@generichostname>
+
+
+* tb/commit-graph-split-merge (2020-02-12) 3 commits
+ - builtin/commit-graph.c: support '--input=none'
+ - builtin/commit-graph.c: introduce '--input=<source>'
+ - builtin/commit-graph.c: support '--split[=<strategy>]'
+
+ The code to write out the commit-graph has been taught a few
+ options to control if the resulting graph chains should be merged
+ or a single new incremental graph is created.
+
+ Waiting for the discussion to settle.
+ cf. <20200212205028.GE4364@syl.local>
+
+
+* bk/p4-pre-edit-changelist (2020-02-14) 7 commits
+ - git-p4: add RCS keyword status message
+ - git-p4: add p4 submit hooks
+ - git-p4: restructure code in submit
+ - git-p4: add --no-verify option
+ - git-p4: add p4-pre-submit exit text
+ - git-p4: create new function run_git_hook
+ - git-p4: rewrite prompt to be Windows compatible
+
+ "git p4" learned four new hooks and also "--no-verify" option to
+ bypass them (and the existing "p4-pre-submit" hook).
+
+ Waiting for response to RFH from Windows/Python folks.
+ cf. <pull.698.v6.git.git.1581691486.gitgitgadget@gmail.com>
+
+
+* en/fill-directory-exponential (2020-01-31) 6 commits
+ - t7063: blindly accept diffs
+ - dir: replace exponential algorithm with a linear one
+ - dir: refactor treat_directory to clarify control flow
+ - dir: fix confusion based on variable tense
+ - dir: fix broken comment
+ - dir: consolidate treat_path() and treat_one_path()
+
+ The directory traversal code had redundant recursive calls which
+ made its performance characteristics exponential with respect to
+ the depth of the tree, which was corrected.
+
+ Expecting an update.
+ cf. <CABPp-BEnt4C_7XyxQKxk4aga=JjM9fXCE-7SFp7azO_v5-pQYw@mail.gmail.com>
+ cf. <pull.700.v2.git.git.1580495486.gitgitgadget@gmail.com>
+ cf. <CABPp-BF0SO92wxY-dM14Vxv6BGA5=T=CicdwbiaZ7c9w6-j2jQ@mail.gmail.com>
+
+
+* vn/reset-deleted-ita (2019-07-26) 1 commit
+ - reset: unstage empty deleted ita files
+
+ "git reset HEAD [<pathspec>]" did not reset an empty file that was
+ added with the intent-to-add bit.
+
+ Expecting a reroll.
+
+
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
+ - zlib.c: use size_t for size
+
+ The wrapper to call into zlib followed our long tradition to use
+ "unsigned long" for sizes of regions in memory, which have been
+ updated to use "size_t".
+
+--------------------------------------------------
+[Cooking]
+
+* pw/advise-rebase-skip (2019-12-06) 9 commits
+ - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
+ - rebase: fix advice when a fixup creates an empty commit
+ - commit: give correct advice for empty commit during a rebase
+ - commit: encapsulate determine_whence() for sequencer
+ - commit: use enum value for multiple cherry-picks
+ - sequencer: write CHERRY_PICK_HEAD for reword and edit
+ - cherry-pick: check commit error messages
+ - cherry-pick: add test for `--skip` advice in `git commit`
+ - t3404: use test_cmp_rev
+
+ The mechanism to prevent "git commit" from making an empty commit
+ or amending during an interrupted cherry-pick was broken during the
+ rewrite of "git rebase" in C, which has been corrected.
+
+ Will discard the tip two, which are still RFC, and advance the rest.
+ cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
+
+
+* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
+ - rebase: --fork-point regression fix
+
+ The "--fork-point" mode of "git rebase" regressed when the command
+ was rewritten in C back in 2.20 era, which has been corrected.
+
+ Will merge to 'next'.
+ Was waiting for a response to "shouldn't this be sufficient?" but
+ I think it should.
+
 
-* am/mingw-poll-fix (2020-02-18) 1 commit
+* am/mingw-poll-fix (2020-02-27) 1 commit
  - mingw: workaround for hangs when sending STDIN
 
  MinGW's poll() emulation has been improved.
 
- Needs review by Windows folks.
+ Will merge to 'next'.
 
 
 * en/check-ignore (2020-02-18) 1 commit
@@ -139,6 +343,8 @@ of the repositories listed at
  apply" (it is designed to be a good "git am" input).  It learned a
  new option to show only the patch part.
 
+ Will merge to 'next'.
+
 
 * bc/wildcard-credential (2020-02-20) 5 commits
   (merged to 'next' on 2020-02-25 at ba3706cb90)
@@ -156,13 +362,14 @@ of the repositories listed at
 
 
 * es/recursive-single-branch-clone (2020-02-25) 2 commits
- - clone: pass --single-branch during --recurse-submodules
- - submodule--helper: use C99 named initializer
+  (merged to 'next' on 2020-02-27 at 8e8fcca7cd)
+ + clone: pass --single-branch during --recurse-submodules
+ + submodule--helper: use C99 named initializer
 
  "git clone --recurse-submodules --single-branch" now uses the same
- simgle-branch option when cloning the submodules.
+ single-branch option when cloning the submodules.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * jc/describe-misnamed-annotated-tag (2020-02-20) 1 commit
@@ -172,11 +379,13 @@ of the repositories listed at
  the best name to explain commit C, and the tag is stored in a
  "wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the
  command gave a warning message but used A (not B) to describe C.
- If C is exactly at the tag, the desribe output would be "A", but
+ If C is exactly at the tag, the describe output would be "A", but
  "git rev-parse A^0" would not be equal as "git rev-parse C^0".  The
- behaviour of the command has been changed to use the "long" form
+ behavior of the command has been changed to use the "long" form
  i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse.
 
+ Will merge to 'next'.
+
 
 * jk/run-command-formatfix (2020-02-22) 1 commit
   (merged to 'next' on 2020-02-25 at 39ad6eeb86)
@@ -187,15 +396,6 @@ of the repositories listed at
  Will merge to 'master'.
 
 
-* jn/reftable-doc (2020-02-22) 1 commit
-  (merged to 'next' on 2020-02-25 at e128adbaf6)
- + reftable: file format documentation
-
- Doc update, in preparation for adding the reftable feature.
-
- Will merge to 'master'.
-
-
 * pb/recurse-submodules-fix (2020-02-19) 6 commits
  - t/lib-submodule-update: add test removing nested submodules
  - unpack-trees: check for missing submodule directory in merged_entry
@@ -210,18 +410,15 @@ of the repositories listed at
 
  Code cleanup.
 
- Almost there.
+ Will merge to 'next'.
 
 
-* bc/sha-256-part-1-of-4 (2020-02-25) 25 commits
- - SQUASH???
+* bc/sha-256-part-1-of-4 (2020-02-28) 22 commits
  - fast-import: add options for rewriting submodules
  - fast-import: add a generic function to iterate over marks
  - fast-import: make find_marks work on any mark set
  - fast-import: add helper function for inserting mark object entries
  - fast-import: permit reading multiple marks files
- - tag: store SHA-256 signatures in a header
- - gpg-interface: improve interface for parsing tags
  - commit: use expected signature header for SHA-256
  - worktree: allow repository version 1
  - init-db: move writing repo version into a function
@@ -240,16 +437,22 @@ of the repositories listed at
  - hash: implement and use a context cloning function
  - builtin/pack-objects: make hash agnostic
 
+ SHA-256 transition continues.
+
+ Tentatively I dropped the bits about signed tag, as it depended on
+ a reverted change to the gpg interface API. 
+
 
 * es/do-not-let-rebase-switch-to-protected-branch (2020-02-24) 2 commits
- - rebase: refuse to switch to branch already checked out elsewhere
- - t3400: make test clean up after itself
+  (merged to 'next' on 2020-02-27 at 4b0009b609)
+ + rebase: refuse to switch to branch already checked out elsewhere
+ + t3400: make test clean up after itself
 
  "git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
  checked it out, even when the BRANCH is checked out in a different
  worktree.  This has been corrected.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * es/worktree-avoid-duplication-fix (2020-02-24) 3 commits
@@ -289,21 +492,22 @@ of the repositories listed at
 
 
 * jk/nth-packed-object-id (2020-02-24) 10 commits
- - packfile: drop nth_packed_object_sha1()
- - packed_object_info(): use object_id internally for delta base
- - packed_object_info(): use object_id for returning delta base
- - pack-check: push oid lookup into loop
- - pack-check: convert "internal error" die to a BUG()
- - pack-bitmap: use object_id when loading on-disk bitmaps
- - pack-objects: use object_id struct in pack-reuse code
- - pack-objects: convert oe_set_delta_ext() to use object_id
- - pack-objects: read delta base oid into object_id struct
- - nth_packed_object_oid(): use customary integer return
+  (merged to 'next' on 2020-02-27 at 8f1e796030)
+ + packfile: drop nth_packed_object_sha1()
+ + packed_object_info(): use object_id internally for delta base
+ + packed_object_info(): use object_id for returning delta base
+ + pack-check: push oid lookup into loop
+ + pack-check: convert "internal error" die to a BUG()
+ + pack-bitmap: use object_id when loading on-disk bitmaps
+ + pack-objects: use object_id struct in pack-reuse code
+ + pack-objects: convert oe_set_delta_ext() to use object_id
+ + pack-objects: read delta base oid into object_id struct
+ + nth_packed_object_oid(): use customary integer return
 
  Code cleanup to use "struct object_id" more by replacing use of
  "char *sha1"
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * kk/complete-diff-color-moved (2020-02-24) 1 commit
@@ -344,54 +548,16 @@ of the repositories listed at
  Will merge to 'master'.
 
 
-* be/describe-multiroot (2020-02-25) 1 commit
- - describe: dont abort too early when searching tags
+* be/describe-multiroot (2020-02-26) 1 commit
+  (merged to 'next' on 2020-02-27 at b476663ffc)
+ + describe: don't abort too early when searching tags
 
  "git describe" in a repository with multiple root commits sometimes
  gave up looking for the best tag to describe a given commit with
  too early, which has been adjusted.
 
---------------------------------------------------
-[Stalled]
-
-* pw/advise-rebase-skip (2019-12-06) 9 commits
- - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
- - rebase: fix advice when a fixup creates an empty commit
- - commit: give correct advice for empty commit during a rebase
- - commit: encapsulate determine_whence() for sequencer
- - commit: use enum value for multiple cherry-picks
- - sequencer: write CHERRY_PICK_HEAD for reword and edit
- - cherry-pick: check commit error messages
- - cherry-pick: add test for `--skip` advice in `git commit`
- - t3404: use test_cmp_rev
-
- The mechanism to prevent "git commit" from making an empty commit
- or amending during an interrupted cherry-pick was broken during the
- rewrite of "git rebase" in C, which has been corrected.
-
- What's the status of this one?
- The tip two are still RFC.
- cf. <CABPp-BE_ktNmDB43N_qijzYzhXvsK8Fi7TJQ7goHu+MzGvdpBQ@mail.gmail.com>
-
-
-* vn/reset-deleted-ita (2019-07-26) 1 commit
- - reset: unstage empty deleted ita files
-
- "git reset HEAD [<pathspec>]" did not reset an empty file that was
- added with the intent-to-add bit.
-
- Expecting a reroll.
-
-
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- - zlib.c: use size_t for size
+ Will merge to 'master'.
 
- The wrapper to call into zlib followed our long tradition to use
- "unsigned long" for sizes of regions in memory, which have been
- updated to use "size_t".
-
---------------------------------------------------
-[Cooking]
 
 * jk/object-filter-with-bitmap (2020-02-18) 16 commits
   (merged to 'next' on 2020-02-19 at d38487e23d)
@@ -415,24 +581,23 @@ of the repositories listed at
 
  The object reachability bitmap machinery and the partial cloning
  machinery were not prepared to work well together, because some
- object-filtering criteria partial clones use inherently rely on
- object traversal, but the bitmap machinery is an optimization to
- bypass that object traversal.  There however are some cases that
- they can work together, and they were taught about this case.
+ object-filtering criteria that partial clones use inherently rely
+ on object traversal, but the bitmap machinery is an optimization
+ to bypass that object traversal.  There however are some cases
+ where they can work together, and they were taught about them.
 
  Will merge to 'master'.
 
 
-* hw/advise-ng (2020-02-25) 3 commits
+* hw/advise-ng (2020-02-27) 4 commits
  - tag: use new advice API to check visibility
  - advice: revamp advise API
+ - advice: change "setupStreamFailure" to "setUpstreamFailure"
  - advice: extract vadvise() from advise()
 
  Revamping of the advise API to allow more systematic enumeration of
  advice knobs in the future.
 
- Getting there, but not quite.
-
 
 * ds/sparse-add (2020-02-20) 5 commits
   (merged to 'next' on 2020-02-25 at de68d14e77)
@@ -448,20 +613,10 @@ of the repositories listed at
  Will merge to 'master'.
 
 
-* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
- - rebase: --fork-point regression fix
-
- The "--fork-point" mode of "git rebase" regressed when the command
- was rewritten in C back in 2.20 era, which has been corrected.
-
- Was waiting for discussion to settle.
- cf. <CAPig+cQ-3Ds41hr91fRo_GvuFMTP7zNVJtaSqi-Yccq4Pk-8Qg@mail.gmail.com>
- cf. <xmqq36dtwcvw.fsf@gitster-ct.c.googlers.com>
-
-
-* hn/reftable (2020-02-18) 5 commits
+* hn/reftable (2020-02-26) 6 commits
  . Reftable support for git-core
  . Add reftable library
+ . reftable: file format documentation
  . refs: document how ref_iterator_advance_fn should handle symrefs
  . create .git/refs in files-backend.c
  . refs.h: clarify reflog iteration order
@@ -538,53 +693,6 @@ of the repositories listed at
  Will merge to 'master'.
 
 
-* bk/p4-pre-edit-changelist (2020-02-14) 7 commits
- - git-p4: add RCS keyword status message
- - git-p4: add p4 submit hooks
- - git-p4: restructure code in submit
- - git-p4: add --no-verify option
- - git-p4: add p4-pre-submit exit text
- - git-p4: create new function run_git_hook
- - git-p4: rewrite prompt to be Windows compatible
-
- "git p4" learned four new hooks and also "--no-verify" option to
- bypass them (and the existing "p4-pre-submit" hook).
-
- Waiting for response to RFH from Windows/Python folks.
- cf. <pull.698.v6.git.git.1581691486.gitgitgadget@gmail.com>
-
-
-* en/fill-directory-exponential (2020-01-31) 6 commits
- - t7063: blindly accept diffs
- - dir: replace exponential algorithm with a linear one
- - dir: refactor treat_directory to clarify control flow
- - dir: fix confusion based on variable tense
- - dir: fix broken comment
- - dir: consolidate treat_path() and treat_one_path()
-
- The directory traversal code had redundant recursive calls which
- made its performance characteristics exponential wrt the depth of
- the tree, which was corrected.
-
- Expecting an update.
- cf. <CABPp-BEnt4C_7XyxQKxk4aga=JjM9fXCE-7SFp7azO_v5-pQYw@mail.gmail.com>
- cf. <pull.700.v2.git.git.1580495486.gitgitgadget@gmail.com>
- cf. <CABPp-BF0SO92wxY-dM14Vxv6BGA5=T=CicdwbiaZ7c9w6-j2jQ@mail.gmail.com>
-
-
-* tb/commit-graph-split-merge (2020-02-12) 3 commits
- - builtin/commit-graph.c: support '--input=none'
- - builtin/commit-graph.c: introduce '--input=<source>'
- - builtin/commit-graph.c: support '--split[=<strategy>]'
-
- The code to write out the commit-graph has been taught a few
- options to control if the resulting graph chains should be merged
- or a single new incremental graph is created.
-
- Waiting for the discussion to settle.
- cf. <20200212205028.GE4364@syl.local>
-
-
 * am/pathspec-f-f-more (2020-02-19) 8 commits
  - stash push: support the --pathspec-from-file option
  - stash: eliminate crude option parsing
@@ -598,53 +706,7 @@ of the repositories listed at
  "git rm" and "git stash" learns the new "--pathspec-from-file"
  option.
 
-
-* dl/merge-autostash (2020-01-13) 17 commits
- - pull: pass --autostash to merge
- - t5520: make test_pull_autostash() accept expect_parent_num
- - merge: teach --autostash option
- - sequencer: unlink autostash in apply_autostash()
- - sequencer: extract perform_autostash() from rebase
- - rebase: generify create_autostash()
- - rebase: extract create_autostash()
- - reset: extract reset_head() from rebase
- - rebase: generify reset_head()
- - rebase: use apply_autostash() from sequencer.c
- - sequencer: make apply_rebase() accept a path
- - rebase: use read_oneliner()
- - sequencer: make read_oneliner() extern
- - sequencer: configurably warn on non-existent files
- - sequencer: use file strbuf for read_oneliner()
- - t7600: use test_write_lines()
- - Makefile: alphabetically sort += lists
-
- "git merge" learns the "--autostash" option.
-
- Expecting a reroll.
- cf. <20200123042906.GA29009@generichostname>
-
-
-* yz/p4-py3 (2020-02-13) 14 commits
- - ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
- - git-p4: use python3's input() everywhere
- - git-p4: simplify regex pattern generation for parsing diff-tree
- - git-p4: use dict.items() iteration for python3 compatibility
- - git-p4: use functools.reduce instead of reduce
- - git-p4: fix freezing while waiting for fast-import progress
- - git-p4: use marshal format version 2 when sending to p4
- - git-p4: open .gitp4-usercache.txt in text mode
- - git-p4: convert path to unicode before processing them
- - git-p4: encode/decode communication with git for python3
- - git-p4: encode/decode communication with p4 for python3
- - git-p4: remove string type aliasing
- - git-p4: change the expansion test from basestring to list
- - git-p4: make python2.7 the oldest supported version
-
- Update "git p4" to work with Python 3.
-
- Hold.
- Waiting for SoB from Szeder on the last step.
- cf. <xmqqk14qqj7n.fsf@gitster-ct.c.googlers.com>
+ Will merge to 'next'.
 
 
 * en/rebase-backend (2020-02-16) 20 commits
@@ -687,10 +749,19 @@ of the repositories listed at
  the best name to explain commit C, and the tag is stored in a
  "wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the
  command gave a warning message but used A (not B) to describe C.
- If C is exactly at the tag, the desribe output would be "A", but
+ If C is exactly at the tag, the describe output would be "A", but
  "git rev-parse A^0" would not be equal as "git rev-parse C^0".  The
- behaviour of the command has been changed to use "B" to describe C
+ behavior of the command has been changed to use "B" to describe C
  instead.
 
  This is not the only possible approach for the issue, and it is
  unknown if the proposed solution is the best one.
+
+
+* jn/reftable-doc (2020-02-22) 1 commit
+  (merged to 'next' on 2020-02-25 at e128adbaf6)
+ + reftable: file format documentation
+
+ Doc update, in preparation for adding the reftable feature.
+
+ Let's take and polish this as a part of hn/reftable topic.