From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Mon, 9 Oct 2023 16:40:44 +0000 (+0200)
Subject: chg: pull --rebase the branches of interest, this should avoid issues with modified... 
X-Git-Url: https://git.exim.org/buildfarm-client.git/commitdiff_plain/7819c9cb95a037b5ed2f91dfba5bbef642358f16

chg: pull --rebase the branches of interest, this should avoid issues with modified history
---

diff --git a/EximBuild/SCM.pm b/EximBuild/SCM.pm
index 9b006cd..cca3ed7 100644
--- a/EximBuild/SCM.pm
+++ b/EximBuild/SCM.pm
@@ -222,7 +222,7 @@ sub checkout
             unshift @branches,"Missing checked out branch bf_$branch in " . cwd() . ":\n";
             main::send_result("$target-Git",$status,\@branches);
         }
-        my @pulllog = `git pull 2>&1`;
+        my @pulllog = `git pull --rebase 2>&1`;
         push(@gitlog,@pulllog);
         chdir '..';
     }