[Cryptech-Commits] [user/sra/build-tools] branch master updated: ff-only

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository user/sra/build-tools.

The following commit(s) were added to refs/heads/master by this push:
     new 31ef459  ff-only
31ef459 is described below

commit 31ef459ab6a4ff627850bdda19564b2a566eca15
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Sat Apr 18 16:32:39 2020 -0400

    ff-only
---
 https-sync-repos.py | 2 +-
 ssh-sync-repos.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/https-sync-repos.py b/https-sync-repos.py
index 13766e3..acd8694 100755
--- a/https-sync-repos.py
+++ b/https-sync-repos.py
@@ -28,7 +28,7 @@ for elt in ElementTree(file = urlopen(trac_page)).iter("{http://www.w3.org/1999/
         try:
             if pull:
                 check_call(("git", "fetch", "--all", "--prune"), cwd = repo)
-                check_call(("git", "merge"), cwd = repo)
+                check_call(("git", "merge", "--ff-only"), cwd = repo)
             else:
                 check_call(("git", "clone", url, repo))
         except:
diff --git a/ssh-sync-repos.py b/ssh-sync-repos.py
index 2cedac3..756686d 100755
--- a/ssh-sync-repos.py
+++ b/ssh-sync-repos.py
@@ -21,7 +21,7 @@ for repo in sorted(info["repos"]):
             pull = isdir(repo)
             if pull:
                 check_call(("git", "fetch", "--all", "--prune"), cwd = repo)
-                check_call(("git", "merge"), cwd = repo)
+                check_call(("git", "merge", "--ff-only"), cwd = repo)
             else:
                 check_call(("git", "clone", "{}:{}.git".format(user, repo), repo))
     except:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.