From 999793d6a7bd86c4191e38bc04dcac5da97b5fbb Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Wed, 23 Feb 2011 21:03:08 +0000
Subject: Explicity fetch and rebase to avoid configuration issues

---
 lib/jitterbug/Builder.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/jitterbug/Builder.pm')

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 {
-- 
cgit 1.4.1