aboutsummaryrefslogtreecommitdiffhomepage
path: root/git-import-orig
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-10-03 14:09:25 +0200
committerGuido Guenther <agx@sigxcpu.org>2007-10-03 14:09:25 +0200
commit6524b25c61b7ce3bf375e5951bbe4bc2d8777333 (patch)
treee3709720d343767c0e9c97dc8b7b73b649b9abe0 /git-import-orig
parentd11ea43fdc28730d6aaccf9a3f29b31f48ea5d4e (diff)
update vim modelines and remove whitespaces
Diffstat (limited to 'git-import-orig')
-rwxr-xr-xgit-import-orig6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-import-orig b/git-import-orig
index ee986beb..53db6273 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -126,7 +126,7 @@ def main(argv):
is_empty = False
else:
is_empty = True
-
+
if not repo.has_branch(options.upstream) and not is_empty:
print >>sys.stderr, """
Repository does not have branch '%s' for upstream sources. If there is none see
@@ -170,7 +170,7 @@ create it otherwise use --upstream-branch to specify it.
import_source_tree(repo, orig_dir, version, options.upstream, options.filter)
gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version),
msg="Upstream version %s" % version)
-
+
if options.merge and not is_empty:
print "Merging to %s" % options.debian
gitCheckoutMaster()
@@ -197,4 +197,4 @@ create it otherwise use --upstream-branch to specify it.
if __name__ == "__main__":
sys.exit(main(sys.argv))
-# vim:et:ts=4:sw=4:
+# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: