[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  ad6245f3 Include "buildall" flag in the release commit.
       via  ca980b58 Yet another manpage tweak.
       via  677aa0dc Fix version verification when "\|" doesn't work in sed.
      from  02559675 Silence autoconf warnings.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ad6245f3944c6f1fefab044fd4836c0a050b8871
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Oct 16 12:14:37 2022 -0700

    Include "buildall" flag in the release commit.

commit ca980b5863a91678a0777999381f1c0cabdb115e
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Oct 16 12:04:22 2022 -0700

    Yet another manpage tweak.

commit 677aa0dc911a452399e35e2c2b5bd18b25f5b55a
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Oct 16 11:14:15 2022 -0700

    Fix version verification when "\|" doesn't work in sed.

-----------------------------------------------------------------------

Summary of changes:
 mkgitver                |  6 ++++--
 packaging/release-rsync |  2 +-
 rsync.1.md              | 23 +++++++++++------------
 3 files changed, 16 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/mkgitver b/mkgitver
index 75c9fe1e..0102b089 100755
--- a/mkgitver
+++ b/mkgitver
@@ -7,8 +7,10 @@ if [ ! -f git-version.h ]; then
 fi
 
 if test -d "$srcdir/.git" || test -f "$srcdir/.git"; then
-    gitver=`git describe --abbrev=8 2>/dev/null | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(pre[0-9]*\)*\(-\|$\)/p'`
-    if [ -n "$gitver" ]; then
+    gitver=`git describe --abbrev=8 2>/dev/null`
+    # NOTE: I'm avoiding "|" in sed since I'm not sure if sed -r is portable and "\|" fails on some OSes.
+    verchk=`echo "$gitver-" | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(pre[0-9]*\)*-/p'`
+    if [ -n "$verchk" ]; then
 	echo "#define RSYNC_GITVER \"$gitver\"" >git-version.h.new
 	if ! diff git-version.h.new git-version.h >/dev/null; then
 	    echo "Updating git-version.h"
diff --git a/packaging/release-rsync b/packaging/release-rsync
index 9603fd10..511e90f1 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -256,7 +256,7 @@ About to:
 """)
     ans = input("<Press Enter OR 'y' to continue> ")
 
-    s = cmd_run(['git', 'commit', '-a', '-m', f'Preparing for release of {version}'])
+    s = cmd_run(['git', 'commit', '-a', '-m', f'Preparing for release of {version} [buildall]'])
     if s.returncode:
         die('Aborting')
 
diff --git a/rsync.1.md b/rsync.1.md
index 21d2e2ff..65cf8815 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -173,23 +173,22 @@ item to the last element of the destination path.  Keep in mind that it is best
 to only use this idiom when copying a file and use the above trailing-slash
 idiom when copying a directory.
 
-The following example copies file foo.c file as bar.c in the "dest" dir
-(assuming that bar.c isn't a directory):
+The following example copies the `foo.c` file as `bar.c` in the `save` dir
+(assuming that `bar.c` isn't a directory):
 
->     rsync -ai src/foo.c dest/bar.c
+>     rsync -ai src/foo.c save/bar.c
 
-The single-item rename rule might accidentally bite you if you unknowingly copy
-a single item and specify a destination dir that doesn't exist (without using a
-trailing slash).  For example, if `src/*.c` matches just one file and
-`dest/dir` doesn't exist yet, this will confuse you by renaming the file to the
-destination path:
+The single-item copy rule might accidentally bite you if you unknowingly copy a
+single item and specify a destination dir that doesn't exist (without using a
+trailing slash).  For example, if `src/*.c` matches one file and `save/dir`
+doesn't exist, this will confuse you by naming the destination file `save/dir`:
 
->     rsync -ai src/*.c dest/dir
+>     rsync -ai src/*.c save/dir
 
-To prevent accidental renaming, either make sure the destination dir already
-exists or specify a destination path with a trailing slash:
+To prevent such an accident, either make sure the destination dir exists or
+specify the destination path with a trailing slash:
 
->     rsync -ai src/*.c dest/dir/
+>     rsync -ai src/*.c save/dir/
 
 ## SORTED TRANSFER ORDER
 


-- 
The rsync repository.