Sync with 2.26-rc0

Documentation/RelNotes/2.26.0.txt

@@ -38,6 +38,15 @@ UI, Workflows & Features
  * The basic 7 colors learned the brighter counterparts
    (e.g. "brightred").
 
+ * "git sparse-checkout" learned a new "add" subcommand.
+
+ * A configuration element used for credential subsystem can now use
+   wildcard pattern to specify for which set of URLs the entry
+   applies.
+
+ * "git clone --recurse-submodules --single-branch" now uses the same
+   single-branch option when cloning the submodules.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -108,6 +117,9 @@ Performance, Internal Implementation, Development Support etc.
    equivalent of "format-patch piped to am").  The rebase.backend
    configuration variable can be set to customize.
 
+ * Underlying machinery of "git bisect--helper" is being refactored
+   into pieces that are more easily reused.
+
 
 Fixes since v2.25
 -----------------
@@ -251,6 +263,31 @@ Fixes since v2.25
    the default.
    (merge 3e96c66805 ds/partial-clone-fixes later to maint).
 
+ * In rare cases "git worktree add <path>" could think that <path>
+   was already a registered worktree even when it wasn't and refuse
+   to add the new worktree. This has been corrected.
+   (merge bb69b3b009 es/worktree-avoid-duplication-fix later to maint).
+
+ * "git push" should stop from updating a branch that is checked out
+   when receive.denyCurrentBranch configuration is set, but it failed
+   to pay attention to checkouts in secondary worktrees.  This has
+   been corrected.
+   (merge 4d864895a2 hv/receive-denycurrent-everywhere later to maint).
+
+ * "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.
+   (merge b5cabb4a96 es/do-not-let-rebase-switch-to-protected-branch later to maint).
+
+ * "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.
+
+ * "git merge signed-tag" while lacking the public key started to say
+   "No signature", which was utterly wrong.  This regression has been
+   reverted.
+   (merge 0106b1d4be hi/gpg-use-check-signature later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 26f924d50e en/simplify-check-updates-in-unpack-trees later to maint).
    (merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint).
@@ -275,3 +312,6 @@ Fixes since v2.25
    (merge 2ce6d075fa rs/micro-cleanups later to maint).
    (merge 27f182b3fc rs/blame-typefix-for-fingerprint later to maint).
    (merge 3c29e21eb0 ma/test-cleanup later to maint).
+   (merge 240fc04f81 ag/rebase-remove-redundant-code later to maint).
+   (merge 7f487ce062 js/ci-windows-update later to maint).
+   (merge d68ce906c7 rs/commit-graph-code-simplification later to maint).

GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.25.GIT
+DEF_VER=v2.26.0-rc0
 
 LF='
 '

t/t5537-fetch-shallow.sh

@@ -17,8 +17,8 @@ test_expect_success 'setup' '
 	commit 4 &&
 	git config --global transfer.fsckObjects true &&
 	test_oid_cache <<-EOF
-	sed sha1:s/0034shallow %s/0036unshallow %s/
-	sed sha256:s/004cshallow %s/004eunshallow %s/
+	perl sha1:s/0034shallow %s/0036unshallow %s/
+	perl sha256:s/004cshallow %s/004eunshallow %s/
 	EOF
 '
 
@@ -243,7 +243,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
 	# with an empty packfile. This is done by refetching with a shorter
 	# depth (to ensure that the packfile is empty), and overwriting the
 	# shallow line in the response with the unshallow line we want.
-	printf "$(test_oid sed)" \
+	printf "$(test_oid perl)" \
 	       "$(git -C "$REPO" rev-parse HEAD)" \
 	       "$(git -C "$REPO" rev-parse HEAD^)" \
 	       >"$HTTPD_ROOT_PATH/one-time-perl" &&