X-Git-Url: https://git.exim.org/buildfarm-client.git/blobdiff_plain/aab2ad4ca78fb4df24779408782af48e12d30131..b04f6889700e04f6a9d6ce14c7b29d86ec33d8e9:/EximBuild/SCM.pm diff --git a/EximBuild/SCM.pm b/EximBuild/SCM.pm index becd24e..9b006cd 100644 --- a/EximBuild/SCM.pm +++ b/EximBuild/SCM.pm @@ -1,6 +1,7 @@ use strict; use File::Find; +use Cwd; =comment @@ -8,7 +9,7 @@ Copyright (c) 2003-2010, Andrew Dunstan See accompanying License file for license details -=cut +=cut ########################################################################## # @@ -210,15 +211,15 @@ sub checkout unshift @ret, "git not found in path\n"; main::send_result("$target-Git",$status,\@ret); } - + chdir $target; my @branches = `git branch 2>&1`; - unless (grep {/^\* bf_$branch$/} @branches) + unless (grep {/^\* bf_\Q$branch\E$/} @branches) { chdir '..'; print "Missing checked out branch bf_$branch:\n",@branches if ($main::verbose); - unshift @branches,"Missing checked out branch bf_$branch:\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`;