Branch: refs/heads/master
Home: https://github.com/NixOS/hydra
Commit: be3748e1ec8fe337f97f1509d9d8a814290c8d20
https://github.com/NixOS/hydra/commit/be3748e1ec8fe337f97f1509d9d8a814290c8d20
Author: Rob Vermaas <[email protected]>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M src/lib/Hydra/Helper/AddBuilds.pm
Log Message:
-----------
In case of deep clone, make sure there is local branch.
diff --git a/src/lib/Hydra/Helper/AddBuilds.pm
b/src/lib/Hydra/Helper/AddBuilds.pm
index 3a81cb5..feecf0d 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -343,6 +343,10 @@ sub fetchInputGit {
($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
# the remote branch for whatever the repository state is. This
command mirror
================================================================
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
