From 44d289df6bc47f8f5a595f19725ec0f23e98c6ae Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Wed, 24 Oct 2007 22:56:08 +0200 Subject: git-import-orig: fix missing s/upstream/upstream_branch/ rename --- git-import-orig | 4 ++-- 1 file 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: -- cgit v1.2.3