Francois Gouget : testbot: Use rebase when updating the Wine source.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 0dfc4662ab3f4a661b91f7e29c18dafb39424afb
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=0dfc4662ab3f4a661b91f7e2...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Mon Feb 14 16:59:04 2022 +0100

testbot: Use rebase when updating the Wine source.

The TestBot's Wine source should be unmodified so there should be no
difference between 'git merge' and 'git rebase'. If there are local
patches (for debugging?) rebase will keep them more visible.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/lib/Build/Utils.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index a56a4f2..9d16963 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -89,7 +89,7 @@ sub GitPull($)
   else
   {
     InfoMsg "\nUpdating the $Dir source\n";
-    system("cd '$DataDir/$Dir' && (set -x && git pull) && ".
+    system("cd '$DataDir/$Dir' && (set -x && git pull --rebase) && ".
            "echo $Dir:HEAD=`git rev-parse HEAD`");
   }
   if ($? != 0)