From 4cb8cb5b8e1aea34afc94f2124b3ce5e781188eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 11 Jul 2022 16:16:07 +0200
Subject: [PATCH] commands: force --ff-only when updating clones

---
 scrutiny/projects/management/commands/checkout.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scrutiny/projects/management/commands/checkout.py b/scrutiny/projects/management/commands/checkout.py
index 47bdd7b..2303b24 100644
--- a/scrutiny/projects/management/commands/checkout.py
+++ b/scrutiny/projects/management/commands/checkout.py
@@ -28,7 +28,7 @@ class Command(BaseCommand):
                 cwd = checkouts_directory
             else:
                 # pull
-                cmd = ['git', 'pull']
+                cmd = ['git', 'pull', '--ff-only']
                 cwd = checkout_dir
 
             if self.verbose: