aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/push.py
diff options
context:
space:
mode:
Diffstat (limited to 'gbp/scripts/push.py')
-rwxr-xr-xgbp/scripts/push.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/scripts/push.py b/gbp/scripts/push.py
index d6876e26..63a06a20 100755
--- a/gbp/scripts/push.py
+++ b/gbp/scripts/push.py
@@ -172,8 +172,10 @@ def main(argv):
if options.pristine_tar:
commit, _ = repo.get_pristine_tar_commit(source)
if commit:
- ref = 'refs/heads/pristine-tar'
- to_push['refs'].append((ref, get_push_src(repo, ref, commit)))
+ target = repo.get_merge_branch('pristine-tar')
+ if not repo.branch_contains(target, commit, remote=True):
+ ref = 'refs/heads/pristine-tar'
+ to_push['refs'].append((ref, get_push_src(repo, ref, commit)))
if do_push(repo, [dest], to_push, dry_run=options.dryrun):
retval = 0