From: Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
Date: Mon, 11 Apr 2022 15:57:19 +0000 (+0900)
Subject: Specify log format to avoid malfunctions and unexpected errors. (#305)
X-Git-Tag: v3.2.4~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fda51692be7a6268e97237f7cf43f7ac16023f7;p=thirdparty%2Frsync.git

Specify log format to avoid malfunctions and unexpected errors. (#305)

Solve the following problems:
* mishandling of commit message lines similar to committer lines
* UnicodeDecodeError with commit messages that cannot be interpreted
  as utf-8
---

diff --git a/support/git-set-file-times b/support/git-set-file-times
index 24b3fde5..e06f0737 100755
--- a/support/git-set-file-times
+++ b/support/git-set-file-times
@@ -38,7 +38,7 @@ def main():
                 print_line(fn, mtime, mtime)
             ls.discard(fn)
 
-    cmd = git + 'log -r --name-only --no-color --pretty=raw --no-renames -z'.split()
+    cmd = git + 'log -r --name-only --format=%x00commit%x20%H%n%x00commit_time%x20%ct%n --no-renames -z'.split()
     if args.tree:
         cmd.append(args.tree)
     cmd += ['--'] + args.files
@@ -46,7 +46,7 @@ def main():
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, encoding='utf-8')
     for line in proc.stdout:
         line = line.strip()
-        m = re.match(r'^committer .*? (\d+) [-+]\d+$', line)
+        m = re.match(r'^\0commit_time (\d+)$', line)
         if m:
             commit_time = int(m[1])
         elif NULL_COMMIT_RE.search(line):