aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/buildpackage.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-05-23 07:59:38 +0200
committerGuido Günther <agx@sigxcpu.org>2017-05-23 08:17:32 +0200
commitbe6af1e1f957abd01be0dbe1834630664b53fdbf (patch)
tree92124918c178b2cbb768c0c18816e057e348e147 /gbp/scripts/buildpackage.py
parent8ea5d6f4e48687ba4ce195c41bbc27684e092f10 (diff)
Test that we don't fail tagging when on pq branch
Closes: #863167
Diffstat (limited to 'gbp/scripts/buildpackage.py')
-rwxr-xr-xgbp/scripts/buildpackage.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 0922ff9f..e0ae07c7 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -794,7 +794,7 @@ def main(argv):
'GBP_BUILD_DIR': build_dir})
)()
if options.tag or options.tag_only:
- if is_pq_branch(branch):
+ if branch and is_pq_branch(branch):
commit = repo.get_merge_base(branch, pq_branch_base(branch))
else:
commit = head