fix git pull error

ckrause · ckrause · commit 7d4794f99d33 · 2025-02-10T21:38:27.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ To install or update LODA, please follow the [installation instructions](https:/
 ### Bugfixes
 
 * Fix duplicate stats regeneration
+* Fix sporadic `git pull` error
 
 ## v25.1.31
 
diff --git a/src/sys/setup.cpp b/src/sys/setup.cpp
@@ -161,8 +161,7 @@ void Setup::cloneProgramsHome(const std::string& git_url) {
 }
 
 bool Setup::pullProgramsHome(bool fail_on_error) {
-  return Git::git(getProgramsHome(), "pull origin main -q --ff-only",
-                  fail_on_error);
+  return Git::git(getProgramsHome(), "pull origin main -q", fail_on_error);
 }
 
 void Setup::checkDir(const std::string& home) {

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,7 @@ void Setup::cloneProgramsHome(const std::string& git_url) {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`bool Setup::pullProgramsHome(bool fail_on_error) {`
`164`		`- return Git::git(getProgramsHome(), "pull origin main -q --ff-only",`
`165`		`- fail_on_error);`
	`164`	`+ return Git::git(getProgramsHome(), "pull origin main -q", fail_on_error);`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`void Setup::checkDir(const std::string& home) {`