Only allow fast-forward pulls.

2020-03-29 17:36:06 -07:00 · 2020-03-29 17:36:06 -07:00 · a39a4ec2ed
parent e618d41ffb
commit a39a4ec2ed
1 changed files with 1 additions and 1 deletions
--- 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))