summaryrefslogtreecommitdiff
path: root/git-import-orig
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-10-24 22:56:08 +0200
committerGuido Guenther <agx@sigxcpu.org>2007-10-24 22:56:08 +0200
commit44d289df6bc47f8f5a595f19725ec0f23e98c6ae (patch)
treedee11b75e2ed91e8f1ec6b13c47d10ff761bb523 /git-import-orig
parent6b97ce263a930fc0c7f0bd8facbf96d1e5ac26b8 (diff)
downloadgit-buildpackage-44d289df6bc47f8f5a595f19725ec0f23e98c6ae.tar.gz
git-buildpackage-44d289df6bc47f8f5a595f19725ec0f23e98c6ae.tar.bz2
git-buildpackage-44d289df6bc47f8f5a595f19725ec0f23e98c6ae.zip
git-import-orig: fix missing s/upstream/upstream_branch/ rename
Diffstat (limited to 'git-import-orig')
-rwxr-xr-xgit-import-orig4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-import-orig b/git-import-orig
index f5c1b0f0..145bc34a 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -137,12 +137,12 @@ def main(argv):
else:
is_empty = True
- if not repo.has_branch(options.upstream) and not is_empty:
+ if not repo.has_branch(options.upstream_branch) and not is_empty:
print >>sys.stderr, """
Repository does not have branch '%s' for upstream sources. If there is none see
/usr/share/doc/git-buildpackage/manual-html/gbpc.import.convert.html on howto
create it otherwise use --upstream-branch to specify it.
-""" % options.upstream_upstream
+""" % options.upstream_branch
raise GbpError
if options.version: