more notes on configuration

[buildfarm-client.git] / EximBuild / SCM.pm

diff --git a/EximBuild/SCM.pm b/EximBuild/SCM.pm
index f174982425941fe060ae7bd9de0aa5c71951bf31..cca3ed7e5f35eac74298d339ff4b0c671e1df6e4 100644 (file)
--- a/EximBuild/SCM.pm
+++ b/EximBuild/SCM.pm
@@ -1,6 +1,7 @@
 use strict;
 
 use File::Find;
+use Cwd;
 
 =comment
 
@@ -218,10 +219,10 @@ sub checkout
             chdir '..';
             print "Missing checked out branch bf_$branch:\n",@branches
               if ($main::verbose);
-            unshift @branches,"Missing checked out branch bf_$branch in $target:\n";
+            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 '..';
     }