[tools] testbot: Use rebase when updating the Wine source.

[Francois Gouget]

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 at codeweavers.com>
---
This avoids a git warning.

 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 a56a4f2a49..9d169633e6 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)
-- 
2.30.2