path: root/git-buildpackage
diff options
authorGuido Guenther <agx@sigxcpu.org>2006-12-22 17:51:33 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-12-22 17:51:33 +0100
commit62af3b51357f13584f1c8901c088280599c9ba81 (patch)
tree537825931df550f09c91e967aed8afbe33a52c3a /git-buildpackage
parent8eadd9e525664b95ad58516cb3ad02ba6d544d73 (diff)
git-import-orig: improve error message when the upstream branch cannot be found.debian/0.2.20
We cannot create the branch automatically since on repositories not created by git-import-dsc it's not clear where to branch from. (Closes: #403990) While doing that also remove pointless patch arguments from most of the git helper functions Minor doc updates
Diffstat (limited to 'git-buildpackage')
1 files changed, 2 insertions, 2 deletions
diff --git a/git-buildpackage b/git-buildpackage
index 95d7216..a0744a3 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -85,13 +85,13 @@ def main(argv):
if not options.ignore_new:
- (ret, out) = is_repository_clean('.')
+ (ret, out) = is_repository_clean()
if not ret:
print >>sys.stderr, "You have uncommitted changes in your source tree:"
print >>sys.stderr, out
print >>sys.stderr, "Use --git-ignore-new to ignore."
return 1
- branch=get_repository_branch('.')
+ branch=get_repository_branch()
if branch != options.debian_branch and not options.ignore_new:
print >>sys.stderr, "You are not on branch '%s' but on '%s'" % (options.debian_branch, branch)
print >>sys.stderr, "Use --git-ignore-new to ignore or --git-debian-branch to set the branch name."