From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 15 Mar 2021 16:02:00 +0000 (-0700)
Subject: Fix git-set-file-times's handling of staged changed files.
X-Git-Tag: v3.2.4pre1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75158e108649b1e1b0095355e1e4273d15f3eff6;p=thirdparty%2Frsync.git

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

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)