diff options
| author | Jonathan "Duke" Leto <jonathan@leto.net> | 2011-02-23 21:25:22 +0000 |
|---|---|---|
| committer | Jonathan "Duke" Leto <jonathan@leto.net> | 2011-02-23 21:25:22 +0000 |
| commit | 2c96015078dc417b20ed8f4df734c438c2d0cb8f (patch) | |
| tree | 50e3b5b8b82a1e84777bf352a39ebc793bc7755f | |
| parent | Explicity fetch and rebase to avoid configuration issues (diff) | |
| download | jitterbug-2c96015078dc417b20ed8f4df734c438c2d0cb8f.tar.gz | |
Use checkout instead of rebase, since we don't know which branch name to rebase against
| -rw-r--r-- | lib/jitterbug/Builder.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/jitterbug/Builder.pm b/lib/jitterbug/Builder.pm index 150eae7..2af15d2 100644 --- a/lib/jitterbug/Builder.pm +++ b/lib/jitterbug/Builder.pm @@ -16,7 +16,7 @@ use Cwd; #use Data::Dumper; local $| = 1; -use constant DEBUG => 0; +use constant DEBUG => $ENV{DEBUG} || 0; sub new { my $self = bless {} => shift; @@ -121,8 +121,8 @@ sub run_task { system("git clean -dfx"); debug("Fetching new commits into $repo"); system("git fetch"); - debug("Rebasing onto origin/master"); - system("git rebase origin/master"); + debug("Checking out correct commit"); + system("git checkout " . $task->commit->sha256 ); chdir $pwd; $r = Git::Repository->new( work_tree => $build_dir ); } else { |