Attempt fastforward

google · Nov 19, 2024 · 1b0853f · 1b0853f
1 parent 2b77bfc
commit 1b0853f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/turbinia/workers/analysis/yara.py b/turbinia/workers/analysis/yara.py
@@ -68,7 +68,7 @@ def update_rules(self, rules):
       try:
         repository = git.Repo(path)
         origin = repository.remotes.origin
-        origin.pull(depth=1, rebase=True)
+        origin.pull(ff=True, depth=1)
         log.info('Successfully updated rules from %s in %s', repo, path)
       except git.exc.InvalidGitRepositoryError as e:
         log.error(