summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-08-09 19:21:45 +0200
committerGuido Günther <agx@sigxcpu.org>2011-08-09 19:23:25 +0200
commitb3931e00dfc7dcbeabc24c5f717d1fe21268470f (patch)
treeebe7a02e42d5d5aef0a99895409bff519e939b5e
parenta8789475a921a1bd87b43e6f30b8f3e8613c0fa7 (diff)
downloadgit-buildpackage-b3931e00dfc7dcbeabc24c5f717d1fe21268470f.tar.gz
git-buildpackage-b3931e00dfc7dcbeabc24c5f717d1fe21268470f.tar.bz2
git-buildpackage-b3931e00dfc7dcbeabc24c5f717d1fe21268470f.zip
Fix missing branch name in error message
-rwxr-xr-xgbp-pq3
1 files changed, 2 insertions, 1 deletions
diff --git a/gbp-pq b/gbp-pq
index 36224333..e826b8e1 100755
--- a/gbp-pq
+++ b/gbp-pq
@@ -185,7 +185,8 @@ def import_quilt_patches(repo, branch, series, tries):
pq_branch = pq_branch_name(branch)
if repo.has_branch(pq_branch):
- raise GbpError, ("Patch queue branch '%s'. already exists. Try 'rebase' instead.")
+ raise GbpError, ("Patch queue branch '%s'. already exists. Try 'rebase' instead."
+ % pq_branch)
commits = repo.commits(options=['-%d' % tries], first_parent=True)
for commit in commits: