From: Guido Günther <agx@sigxcpu.org>
Date: Fri, 4 Nov 2011 12:18:37 +0000 (+0100)
Subject: gbp-pq: don't claim we're uptodate
X-Git-Tag: debian/0.6.0_git20111202~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61f044ba09d8076b49d4303d7ac1d11ffc2175f4;p=tools%2Fgit-buildpackage.git

gbp-pq: don't claim we're uptodate

if 'rebase' is invoked from the pq branch.
---

diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index 2ad7b25..a96b742 100644
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -344,8 +344,12 @@ def drop_pq(repo, branch):
 
 
 def rebase_pq(repo, branch):
-    switch_to_pq_branch(repo, branch)
-    GitCommand("rebase")([branch])
+    if is_pq_branch(branch):
+        base = pq_branch_base(branch)
+    else:
+        switch_to_pq_branch(repo, branch)
+        base = branch
+    GitCommand("rebase")([base])
 
 
 def main(argv):