Francois Gouget : testbot/WineRunReconfig: Use rebase when updating the TestBot source.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 2fc5be931eb92037b65ff6b89950e5c85b36d99c
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=2fc5be931eb92037b65ff6b8...

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

testbot/WineRunReconfig: Use rebase when updating the TestBot source.

The TestBot 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/bin/WineRunReconfig.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 0c39228..73595c1 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -362,7 +362,7 @@ if ($Step->FileType ne "none")
 my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl";
 $Script = "#!/bin/sh\n".
           "( set -x\n".
-          "  git pull &&\n".
+          "  git pull --rebase &&\n".
           "  ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n".
           ") >Reconfig.log 2>&1\n";
 my $TA = $VM->GetAgent();