From: Tim 'mithro' Ansell <me@mith.ro>
Date: Mon, 30 Mar 2020 00:36:06 +0000 (-0700)
Subject: Only allow fast-forward pulls.
X-Git-Tag: 24jan2021_ls180~424^2~4
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a39a4ec2ed9657c6f34285f28e6dffd88ee49046;p=litex.git

Only allow fast-forward pulls.
---

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))