ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Use git fetch -fu origin +$branch:$branch to fetch all changes for branch.

Browse source
This commit is contained in:
Rob Vermaas 2012-04-26 08:36:40 +02:00
parent be3748e1ec
commit 6d5567bb16
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -336,25 +336,12 @@ sub fetchInputGit {
chdir $clonePath or die $!; # !!! urgh, shouldn't do a chdir chdir $clonePath or die $!; # !!! urgh, shouldn't do a chdir
if (defined $deepClone) {
# This fetch every branches from the remote repository and create a
# local branch for each heads of the remote repository. This is
# necessary to provide a working git-describe.
($res, $stdout, $stderr) = captureStdoutStderr(600,
("git", "pull", "--ff-only", "-fu", "--all"));
die "Error pulling latest change from git repo at `$uri':\n$stderr" unless $res;
# Make sure there is a local branch
($res, $stdout, $stderr) = captureStdoutStderr(600,
("git", "checkout", "-f", $branch));
die "Error making local branch $branch in $clonePath from git repo at `$uri':\n$stderr" unless $res;
} else {
# This command force the update of the local branch to be in the same as # This command force the update of the local branch to be in the same as
# the remote branch for whatever the repository state is. This command mirror # the remote branch for whatever the repository state is. This command mirror
# only one branch of the remote repository. # only one branch of the remote repository.
($res, $stdout, $stderr) = captureStdoutStderr(600, ($res, $stdout, $stderr) = captureStdoutStderr(600,
("git", "fetch", "-fu", "origin", "+$branch:$branch")); ("git", "fetch", "-fu", "origin", "+$branch:$branch"));
die "Error fetching latest change from git repo at `$uri':\n$stderr" unless $res; die "Error fetching latest change from git repo at `$uri':\n$stderr" unless $res;
}
($res, $stdout, $stderr) = captureStdoutStderr(600, ($res, $stdout, $stderr) = captureStdoutStderr(600,
("git", "rev-parse", "$branch")); ("git", "rev-parse", "$branch"));