delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into bootstrap

Browse source
This commit is contained in:
Rob Vermaas 2012-04-13 11:55:49 +02:00
parent 293c7d3507 6e62d9b7b5
commit 516a644a7f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib/Hydra/Helper/AddBuilds.pm
View file

@ -323,7 +323,7 @@ sub fetchInputGit {
my $storePath; my $storePath;
mkpath(scmPath); mkpath(scmPath);
my $clonePath = scmPath . "/" . sha256_hex($uri.$branch); my $clonePath = scmPath . "/" . sha256_hex($uri);
my $stdout; my $stderr; my $stdout; my $stderr;
if (! -d $clonePath) { if (! -d $clonePath) {
@ -335,7 +335,7 @@ sub fetchInputGit {
# git pull + check rev # git pull + check rev
chdir $clonePath or die $!; # !!! urgh, shouldn't do a chdir chdir $clonePath or die $!; # !!! urgh, shouldn't do a chdir
(my $res, $stdout, $stderr) = captureStdoutStderr(600, (my $res, $stdout, $stderr) = captureStdoutStderr(600,
("git", "pull")); ("git", "pull", "--all"));
die "Error pulling latest change git repo at `$uri':\n$stderr" unless $res; die "Error pulling latest change git repo at `$uri':\n$stderr" unless $res;
(my $res1, $stdout, $stderr) = captureStdoutStderr(600, (my $res1, $stdout, $stderr) = captureStdoutStderr(600,
@ -343,6 +343,10 @@ sub fetchInputGit {
die "Cannot get head revision of Git branch '$branch' at `$uri':\n$stderr" unless $res1 ; die "Cannot get head revision of Git branch '$branch' at `$uri':\n$stderr" unless $res1 ;
# Take the first commit ID returned by `ls-remote'. The
# assumption is that `ls-remote' returned both `refs/heads/BRANCH'
# and `refs/remotes/origin/BRANCH', and that both point at the
# same commit.
my ($first) = split /\n/, $stdout; my ($first) = split /\n/, $stdout;
(my $revision, my $ref) = split ' ', $first; (my $revision, my $ref) = split ' ', $first;
die unless $revision =~ /^[0-9a-fA-F]+$/; die unless $revision =~ /^[0-9a-fA-F]+$/;