[SCM] The rsync repository. - branch master updated

Wed Jul 15 03:26:33 UTC 2020

The branch, master has been updated
       via  95f68303 Mention the auto-build-save setup.
       via  129d7195 Enable FreeBSD CI ssl (#66)
       via  044339d6 Reduce the installed pkg items since they are so slow.
       via  4c4fc746 A few more NEWS & man tweaks.
       via  22cb57ee Try using cmarkgfm.
      from  4c0be4da Avoid a failed test on Cygwin.

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


- Log -----------------------------------------------------------------
commit 95f683039d9579745a0352b28bf5a08b79b9da40
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Jul 14 20:01:54 2020 -0700

    Mention the auto-build-save setup.

commit 129d7195ff3a66b2d803bfcdfaddce267d9f49dc
Author: Ben RUBSON <6764151+benrubson at users.noreply.github.com>
Date:   Tue Jul 14 22:22:55 2020 +0200

    Enable FreeBSD CI ssl (#66)

commit 044339d6b4ce6f097eedeaac622672c9102c09c9
Author: Wayne Davison <wayne at opencoder.net>
Date:   Mon Jul 13 16:26:58 2020 -0700

    Reduce the installed pkg items since they are so slow.

commit 4c4fc7462a2e812505dda5bc11985fc7e4e8a6fd
Author: Wayne Davison <wayne at opencoder.net>
Date:   Mon Jul 13 16:07:46 2020 -0700

    A few more NEWS & man tweaks.

commit 22cb57ee2011bae7f5323a13b18bf0e5d62fca83
Author: Wayne Davison <wayne at opencoder.net>
Date:   Mon Jul 13 15:44:43 2020 -0700

    Try using cmarkgfm.

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

Summary of changes:
 .cirrus.yml             |  4 +---
 INSTALL.md              | 12 ++++++++++++
 NEWS.md                 |  2 +-
 packaging/prep-auto-dir |  4 ++++
 rsync.1.md              |  7 ++++---
 5 files changed, 22 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.cirrus.yml b/.cirrus.yml
index 88e00e1d..5969576f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,9 +5,7 @@ task:
   prep_script:
     - dd if=/dev/zero of=/tmp/zpool bs=1M count=1024
     - zpool create -m `pwd`/testtmp zpool /tmp/zpool
-    - pkg install -y autotools xxhash zstd liblz4 openssl bash
-    - ln -s /usr/local/bin/bash /bin/bash
-    - pkg search cmark
+    - pkg install -y autotools xxhash zstd liblz4
   configure_script:
     - CPPFLAGS=-I/usr/local/include/ LDFLAGS=-L/usr/local/lib/ ./configure --disable-md2man
   make_script:
diff --git a/INSTALL.md b/INSTALL.md
index b53965e9..a504fb78 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -25,6 +25,18 @@ If you configure using --enable-maintainer-mode, then rsync will try
 to pop up an xterm on DISPLAY=:0 if it crashes.  You might find this
 useful, but it should be turned off for production builds.
 
+If you want to automatically use a separate "build" directory based on
+the current git branch name, start with a pristine git checkout and run
+"mkdir auto-build-save" before you run the first ./configure command.
+That will cause a fresh build dir to spring into existence along with a
+special Makefile symlink that allows you to run "make" and "./configure"
+from the source dir (the "build" dir gets auto switched based on branch).
+This is helpful when using the branch-from-patch and patch-update scripts
+to maintain the official rsync patches.  If you ever need to build from
+a "detached head" git position then you'll need to manually chdir into
+the build dir to run make.  I also like to create 2 more symlinks in the
+sourc dir:  ln -s build/rsync . ; ln -s build/testtmp .
+
 MAKE COMPATIBILITY
 ------------------
 
diff --git a/NEWS.md b/NEWS.md
index e7cbf532..c83e0367 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -36,7 +36,7 @@
  - Output file+line info on out-of-memory & overflow errors while also avoiding
    the output of alternate build-dir path info that is not useful to the user.
 
- - Improved the testsuite on FreeBSD.
+ - Improved the testsuite on FreeBSD & Cygwin.
 
  - Added some compatibility code for HPE NonStop platforms.
 
diff --git a/packaging/prep-auto-dir b/packaging/prep-auto-dir
index a9516df8..1e5a2965 100755
--- a/packaging/prep-auto-dir
+++ b/packaging/prep-auto-dir
@@ -15,6 +15,10 @@
 auto_top='auto-build-save'
 if test -d $auto_top -a -d .git; then
     desired_branch=`git rev-parse --abbrev-ref HEAD | tr / %`
+    if test "$desired_branch" = HEAD; then
+	echo "ERROR: switch to the right build dir manually when in detached HEAD mode." 1>&2
+	exit 1
+    fi
     auto_dir="$auto_top/$desired_branch"
     if test -d build; then
 	cur_branch=`readlink build/.branch`
diff --git a/rsync.1.md b/rsync.1.md
index 5be8029c..91942873 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -458,7 +458,7 @@ detailed description below for a complete description.
 --list-only              list the files instead of copying them
 --bwlimit=RATE           limit socket I/O bandwidth
 --stop-after=MINS        Stop rsync after MINS minutes have elapsed
---stop-at=y-m-dTh:m      Stop rsync at the specified moment in time
+--stop-at=y-m-dTh:m      Stop rsync at the specified point in time
 --write-batch=FILE       write a batched update to FILE
 --only-write-batch=FILE  like --write-batch but w/o updating dest
 --read-batch=FILE        read a batched update from FILE
@@ -3138,13 +3138,14 @@ your home directory (remove the '=' for that).
 
     The value can also be abbreviated in a variety of ways, such as specifying
     a 2-digit year and/or leaving off various values.  In all cases, the value
-    will be taken to be the next possible future moment where the supplied
+    will be taken to be the next possible point in time where the supplied
     information matches.  If the value specifies the current time or a past
     time, rsync exits with an error.
 
     For example, "1-30" specifies the next January 30th (at midnight local
     time), "14:00" specifies the next 2 P.M., "1" specifies the next 1st of the
-    month at midnight, and ":59" specifies the next 59th minute after the hour.
+    month at midnight, "31" specifies the next month where we can stop on its
+    31st day, and ":59" specifies the next 59th minute after the hour.
 
     For maximal flexibility, rsync does not communicate this option to the
     remote rsync since it is usually enough that one side of the connection


-- 
The rsync repository.

