Rebase to v2.50.0

.github/workflows/coverity.yml

@@ -147,7 +147,7 @@ jobs:
           key: cov-build-${{ env.COVERITY_LANGUAGE }}-${{ env.COVERITY_PLATFORM }}-${{ steps.lookup.outputs.hash }}
       - name: build with cov-build
         run: |
-          export PATH="$PATH:$(cygpath -au "$RUNNER_TEMP")/cov-analysis/bin" &&
+          export PATH="$PATH:$RUNNER_TEMP/cov-analysis/bin" &&
           cov-configure --gcc &&
           if ! cov-build --dir cov-int make
           then

Documentation/RelNotes/2.50.0.adoc

@@ -36,7 +36,7 @@ UI, Workflows & Features
  * Auth-related (and unrelated) error handling in send-email has been
    made more robust.
 
- * Updating multiple references have only been possible in all-or-none
+ * Updating multiple references have only been possible in an all-or-nothing
    fashion with transactions, but it can be more efficient to batch
    multiple updates even when some of them are allowed to fail in a
    best-effort manner.  A new "best effort batches of updates" mode
@@ -53,7 +53,7 @@ UI, Workflows & Features
 
  * The build procedure installs bash (but not zsh) completion script.
 
- * send-email has been updated to work better with Outlook's smtp server.
+ * send-email has been updated to work better with Outlook's SMTP server.
 
  * "git diff --minimal" used to give non-minimal output when its
    optimization kicked in, which has been disabled.
@@ -62,7 +62,7 @@ UI, Workflows & Features
    delta chains from forming in a corner case even when there is no
    such cycle.
 
- * Make repository clean-up tasks "gc" can do available to "git
+ * Make repository clean-up tasks that "gc" can do available to "git
    maintenance" front-end.
 
  * Bundle-URI feature did not use refs recorded in the bundle other
@@ -188,7 +188,7 @@ Performance, Internal Implementation, Development Support etc.
    been dropped.
 
  * The code path to access the "packed-refs" file while "fsck" is
-   taught to mmap the file, instead of reading the whole file in the
+   taught to mmap the file, instead of reading the whole file into
    memory.
 
  * Assorted fixes for issues found with CodeQL.
@@ -327,8 +327,9 @@ Fixes since v2.49
  * Fix for scheduled maintenance tasks on platforms using launchctl.
    (merge eb2d7beb0e jh/gc-launchctl-schedule-fix later to maint).
 
- * Update to arm64 Windows port.
-   (merge 436a42215e js/windows-arm64 later to maint).
+ * Update to arm64 Windows port (part of which had been reverted as it
+   broke builds for existing platforms, which may need to be redone in
+   future releases).
 
  * hashmap API clean-up to ensure hashmap_clear() leaves a cleared map
    in a reusable state.
@@ -391,14 +392,19 @@ Fixes since v2.49
    reverse failed to give the mode bits of the path "removed" by the
    patch to the file it creates, which has been corrected.
 
- * "git verify-refs" (and hence "git fsck --reference") started
-   erroring out in a repository in which secondary worktrees were
-   prepared with Git 2.43 or lower.
+ * "git verify-refs" errored out in a repository in which
+   linked worktrees were prepared with Git 2.43 or lower.
    (merge d5b3c38b8a sj/ref-contents-check-fix later to maint).
 
- * Update total_ram() functrion on BSD variants.
+ * Update total_ram() function on BSD variants.
 
- * Update online_cpus() functrion on BSD variants.
+ * Update online_cpus() function on BSD variants.
+
+ * Revert a botched bswap.h change that broke ntohll() functions on
+   big-endian systems with __builtin_bswap32/64().
+
+ * Fixes for GitHub Actions Coverity job.
+   (merge 3cc4fc1ebd js/github-ci-win-coverity-fix later to maint).
 
  * Other code cleanup, docfix, build fix, etc.
    (merge 227c4f33a0 ja/doc-block-delimiter-markup-fix later to maint).

Documentation/git-maintenance.adoc

@@ -172,7 +172,7 @@ rerere-gc::
 
 worktree-prune::
 	The `worktree-prune` task deletes stale or broken worktrees. See
-	linkit:git-worktree[1] for more information.
+	linkgit:git-worktree[1] for more information.
 
 OPTIONS
 -------

GIT-VERSION-GEN

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v2.50.0-rc2
+DEF_VER=v2.50.0
 
 LF='
 '
@@ -82,7 +82,7 @@ read GIT_MAJOR_VERSION GIT_MINOR_VERSION GIT_MICRO_VERSION GIT_PATCH_LEVEL trail
 $(echo "$GIT_VERSION" 0 0 0 0 | tr '.a-zA-Z-' ' ')
 EOF
 
-REPLACED=$(printf "%s" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
+REPLACED=$(printf "%s\n" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
 	-e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \
 	-e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \
 	-e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \

generate-configlist.sh

@@ -13,16 +13,16 @@ print_config_list () {
 	cat <<EOF
 static const char *config_name_list[] = {
 EOF
-	sed -E '
-/^`?[a-zA-Z].*\..*`?::$/ {
+	sed -e '
+	/^`*[a-zA-Z].*\..*`*::$/ {
 	/deprecated/d;
 	s/::$//;
 	s/`//g;
 	s/^.*$/	"&",/;
 	p;};
-d' \
+	d' \
 	    "$SOURCE_DIR"/Documentation/*config.adoc \
-	    "$SOURCE_DIR"/Documentation/config/*.adoc|
+	    "$SOURCE_DIR"/Documentation/config/*.adoc |
 	sort
 	cat <<EOF
 	NULL,

po/TEAMS

@@ -29,6 +29,10 @@ Repository:	https://github.com/jnavila/git
 Leader:		Jean-Noël Avila <jn.avila@free.fr>
 Members:	Sébastien Helleu <flashcode@flashtux.org>
 
+Language:	ga (Irish)
+Repository:	https://github.com/aindriu80/git-po
+Members:	Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
+
 Language:	id (Indonesian)
 Repository:	https://github.com/bagasme/git-po
 Leader:		Bagas Sanjaya <bagasdotme@gmail.com>