gnu-web-doc-update: Assume the git username is used for CVS.

[Collin Funk]

Hi,

I made my first release the other day for GNU Hello. When I first ran
'make web-manual-update', it failed because my local system username is
"collin", but my Savannah username is "collinfunk". I had to run
'USER=collinfunk make web-manual-update', which worked fine.

But I think this change should make things a bit more intuitive. It
tries to use the username from the 'git clone' url like this:

    git clone collinf...@git.savannah.gnu.org:/srv/git/gnulib.git

Or from the user's SSH configuration. For example, I have this in mine:

    # GNU Savannah
    Host git.savannah.gnu.org
      User collinfunk

Any thoughts on this change? I haven't pushed it yet in case anyone
wants to review.

Collin


>From e85f4c094625c2fa1c4bbc35e98230c6202281fb Mon Sep 17 00:00:00 2001
Message-ID: <e85f4c094625c2fa1c4bbc35e98230c6202281fb.1774152841.git.collin.fu...@gmail.com>
From: Collin Funk <collin.fu...@gmail.com>
Date: Sat, 21 Mar 2026 21:13:27 -0700
Subject: [PATCH] gnu-web-doc-update: Assume the git username is used for CVS.

* build-aux/gnu-web-doc-update (cvs_user): Try to find the username from
the 'git clone' url or the user's ssh configuration.
---
 ChangeLog                    |  6 ++++++
 build-aux/gnu-web-doc-update | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0487b1fdb0..efe5c23858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2026-03-21  Collin Funk  <collin.fu...@gmail.com>
+
+	gnu-web-doc-update: Assume the git username is used for CVS.
+	* build-aux/gnu-web-doc-update (cvs_user): Try to find the username from
+	the 'git clone' url or the user's ssh configuration.
+
 2026-03-20  Collin Funk  <collin.fu...@gmail.com>
 
 	vasprintf-posix, vasprintf, stdio-windows: Prefer AC_CHECK_FUNCS_ONCE.
diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update
index 15e7f6490f..db294c67a3 100755
--- a/build-aux/gnu-web-doc-update
+++ b/build-aux/gnu-web-doc-update
@@ -2,7 +2,7 @@
 # Run this after each non-alpha release, to update the web documentation at
 # https://www.gnu.org/software/$pkg/manual/
 
-VERSION=2025-06-10.02; # UTC
+VERSION=2026-03-22.04; # UTC
 
 # Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
@@ -110,7 +110,13 @@ find_tool XARGS gxargs xargs
 builddir=.
 dryrun=
 rm_stale='echo'
-cvs_user="$USER"
+cvs_user=$($GIT remote get-url origin | cut -s -d @ -f 1)
+if test -z "$cvs_user"; then
+  cvs_user=$(ssh -G git.savannah.gnu.org | grep '^user ' | awk '{ print $2 }')
+fi
+if test -z "$cvs_user"; then
+  cvs_user="$USER"
+fi
 while test $# != 0
 do
   # Handle --option=value by splitting apart and putting back on argv.
-- 
2.53.0