projects / litex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e618d41)
Only allow fast-forward pulls.
authorTim 'mithro' Ansell <me@mith.ro>
Mon, 30 Mar 2020 00:36:06 +0000 (17:36 -0700)
committerTim 'mithro' Ansell <me@mith.ro>
Sun, 12 Apr 2020 01:37:06 +0000 (18:37 -0700)
litex_setup.py patch | blob | history

diff --git a/litex_setup.py b/litex_setup.py
index c6389ad668a01e1ac1dd879193deba0a5ec8d3e9..be9c3b432d377d8e1ce1c08302d2a0bf400de1b8 100755 (executable)
--- 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))