From a39a4ec2ed9657c6f34285f28e6dffd88ee49046 Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Sun, 29 Mar 2020 17:36:06 -0700
Subject: [PATCH] Only allow fast-forward pulls.

---
 litex_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/litex_setup.py b/litex_setup.py
index c6389ad6..be9c3b43 100755
--- a/litex_setup.py
+++ b/litex_setup.py
@@ -136,7 +136,7 @@ if "update" in sys.argv[1:]:
         print("[updating " + name + "]...")
         os.chdir(os.path.join(current_path, name))
         subprocess.check_call(
-            "git pull",
+            "git pull --ff-only",
             shell=True)
         os.chdir(os.path.join(current_path))
 
-- 
2.30.2