git://git.exim.org
/
buildfarm-client.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update submodule wiki
[buildfarm-client.git]
/
EximBuild
/
SCM.pm
diff --git
a/EximBuild/SCM.pm
b/EximBuild/SCM.pm
index a722f3d8e642ed926f6a7ecb4749bb87efdefd04..9b006cd1b899b07b9bd46f2c2560cadc15beb6bf 100644
(file)
--- a/
EximBuild/SCM.pm
+++ b/
EximBuild/SCM.pm
@@
-1,6
+1,7
@@
use strict;
use File::Find;
use strict;
use File::Find;
+use Cwd;
=comment
=comment
@@
-8,7
+9,7
@@
Copyright (c) 2003-2010, Andrew Dunstan
See accompanying License file for license details
See accompanying License file for license details
-=cut
+=cut
##########################################################################
#
##########################################################################
#
@@
-210,7
+211,7
@@
sub checkout
unshift @ret, "git not found in path\n";
main::send_result("$target-Git",$status,\@ret);
}
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_\Q$branch\E$/} @branches)
chdir $target;
my @branches = `git branch 2>&1`;
unless (grep {/^\* bf_\Q$branch\E$/} @branches)
@@
-218,7
+219,7
@@
sub checkout
chdir '..';
print "Missing checked out branch bf_$branch:\n",@branches
if ($main::verbose);
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`;
main::send_result("$target-Git",$status,\@branches);
}
my @pulllog = `git pull 2>&1`;