diff options
| author | Jonathan "Duke" Leto <jonathan@leto.net> | 2011-02-23 21:03:08 +0000 |
|---|---|---|
| committer | Jonathan "Duke" Leto <jonathan@leto.net> | 2011-02-23 21:03:31 +0000 |
| commit | 999793d6a7bd86c4191e38bc04dcac5da97b5fbb (patch) | |
| tree | c34e134da2404e4a70eb21f0705d203a7c60d17b | |
| parent | Don't try to embed TAP output into current page (diff) | |
| download | jitterbug-999793d6a7bd86c4191e38bc04dcac5da97b5fbb.tar.gz | |
Explicity fetch and rebase to avoid configuration issues
| -rw-r--r-- | lib/jitterbug/Builder.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/jitterbug/Builder.pm b/lib/jitterbug/Builder.pm index 9abef14..150eae7 100644 --- a/lib/jitterbug/Builder.pm +++ b/lib/jitterbug/Builder.pm @@ -120,7 +120,9 @@ sub run_task { debug("Cleaning git repo"); system("git clean -dfx"); debug("Fetching new commits into $repo"); - system("git pull --rebase"); + system("git fetch"); + debug("Rebasing onto origin/master"); + system("git rebase origin/master"); chdir $pwd; $r = Git::Repository->new( work_tree => $build_dir ); } else { |