diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-11-04 13:18:37 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-11-04 13:18:37 +0100 |
| commit | 61f044ba09d8076b49d4303d7ac1d11ffc2175f4 (patch) | |
| tree | dd3a2949c234f2d2a048db5a7604f47023fcdf36 /gbp | |
| parent | b310ffd1387e2fe4a1b87da95b9004fa670e686f (diff) | |
gbp-pq: don't claim we're uptodate
if 'rebase' is invoked from the pq branch.
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/scripts/pq.py | 8 |
1 files changed, 6 insertions, 2 deletions
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): |