projects
/
tools
/
git-buildpackage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b310ffd
)
gbp-pq: don't claim we're uptodate
author
Guido Günther
<agx@sigxcpu.org>
Fri, 4 Nov 2011 12:18:37 +0000
(13:18 +0100)
committer
Guido Günther
<agx@sigxcpu.org>
Fri, 4 Nov 2011 12:18:37 +0000
(13:18 +0100)
if 'rebase' is invoked from the pq branch.
gbp/scripts/pq.py
patch
|
blob
|
history
diff --git
a/gbp/scripts/pq.py
b/gbp/scripts/pq.py
index
2ad7b25
..
a96b742
100644
(file)
--- 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):