[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  75158e10 Fix git-set-file-times's handling of staged changed files.
       via  676537cf Switch to using image_family for Cirrus CI.
       via  d857fd42 Install bash on FreeBSD CI.
       via  5856b71e Update FreeBSD CI to 12.2.
       via  57adb297 See if explicitly installing m4 gets FreeBSD CI a newer gm4 version.
      from  ead44adc Allow the generator's msg iobuf to get bigger too.

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


- Log -----------------------------------------------------------------
commit 75158e108649b1e1b0095355e1e4273d15f3eff6
Author: Wayne Davison <wayne at opencoder.net>
Date:   Mon Mar 15 09:02:00 2021 -0700

    Fix git-set-file-times's handling of staged changed files.

commit 676537cf29422ec4b6b9013011282071a662f374
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Mar 2 19:16:52 2021 -0800

    Switch to using image_family for Cirrus CI.

commit d857fd42acc675d96de5dd34e530b95ff2c12169
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Mar 2 19:09:23 2021 -0800

    Install bash on FreeBSD CI.

commit 5856b71eb7f67de79f1a4de9d5452589f3729403
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Mar 2 19:02:08 2021 -0800

    Update FreeBSD CI to 12.2.

commit 57adb2973afecb50c5bf14c3276ceba57adafcd3
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Mar 2 14:13:54 2021 -0800

    See if explicitly installing m4 gets FreeBSD CI a newer gm4 version.

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

Summary of changes:
 .cirrus.yml                | 4 ++--
 support/git-set-file-times | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.cirrus.yml b/.cirrus.yml
index ba78af7d..62b9318c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,13 +1,13 @@
 freebsd_task:
   name: FreeBSD
   freebsd_instance:
-    image: freebsd-12-1-release-amd64
+    image_family: freebsd-12-2
   env:
     PATH: /usr/local/bin:$PATH
   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 wget
+    - pkg install -y bash autotools m4 xxhash zstd liblz4 wget
     - wget https://download.samba.org/pub/rsync/generated-files/git-version.h
   configure_script:
     - CPPFLAGS=-I/usr/local/include/ LDFLAGS=-L/usr/local/lib/ ./configure --disable-md2man
diff --git a/support/git-set-file-times b/support/git-set-file-times
index 51962d37..24b3fde5 100755
--- a/support/git-set-file-times
+++ b/support/git-set-file-times
@@ -27,11 +27,12 @@ def main():
 
     if not args.tree:
         # All modified files keep their current mtime.
-        proc = subprocess.Popen(git + 'ls-files -m -z'.split(), stdout=subprocess.PIPE, encoding='utf-8')
+        proc = subprocess.Popen(git + 'status -z --no-renames'.split(), stdout=subprocess.PIPE, encoding='utf-8')
         out = proc.communicate()[0]
         for fn in out.split('\0'):
-            if fn == '':
+            if fn == '' or (fn[0] != 'M' and fn[1] != 'M'):
                 continue
+            fn = fn[3:]
             if args.list:
                 mtime = os.lstat(fn).st_mtime
                 print_line(fn, mtime, mtime)


-- 
The rsync repository.