aboutsummaryrefslogtreecommitdiff
path: root/git-import-orig
diff options
context:
space:
mode:
Diffstat (limited to 'git-import-orig')
-rwxr-xr-xgit-import-orig22
1 files changed, 7 insertions, 15 deletions
diff --git a/git-import-orig b/git-import-orig
index fac26b3..1a91738 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -109,25 +109,17 @@ def main(argv):
help="Upstream Version")
parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
help="verbose command execution")
+ parser.add_config_file_option(option_name="debian-branch", dest="debian_branch")
+ parser.add_config_file_option(option_name="upstream-branch", dest="upstream_branch")
parser.add_option("--no-merge", dest='merge', action="store_false", default=True,
help="after import dont do any merging to another branch")
parser.add_config_file_option(option_name="no-dch", dest='no_dch',
help="don't call dch after the import", action="store_true")
- parser.add_config_file_option(option_name="debian-branch", dest='debian_branch',
- help="branch the debian patch is being developed on, default is '%(debian-branch)s'")
- parser.add_config_file_option(option_name="upstream-branch", dest="upstream_branch",
- help="upstream branch, default is '%(upstream-branch)s'")
- parser.add_config_file_option(option_name="sign-tags", dest="sign_tags",
- help="sign git tags", action="store_true")
- parser.add_config_file_option(option_name="keyid", dest="keyid",
- help="GPG keyid to sign tags with")
- parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag",
- help="format string for upstream tags, default is '%(upstream-tag)s'")
- parser.add_config_file_option(option_name="filter", dest="filters",
- help="files to filter out during import (can be given multiple times)",
- action="append")
- parser.add_config_file_option(option_name="pristine-tar", dest="pristine_tar",
- help="run pristine-tar to import the tarball", action="store_true")
+ parser.add_config_file_option(option_name="sign-tags", dest="sign_tags", action="store_true")
+ parser.add_config_file_option(option_name="keyid", dest="keyid")
+ parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag")
+ parser.add_config_file_option(option_name="filter", dest="filters", action="append")
+ parser.add_config_file_option(option_name="pristine-tar", dest="pristine_tar", action="store_true")
(options, args) = parser.parse_args(argv[1:])
if options.verbose: