diff options
Diffstat (limited to 'git-dch')
| -rwxr-xr-x | git-dch | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -295,6 +295,7 @@ def main(argv): parser.add_option_group(commit_group) parser.add_option_group(naming_group) + parser.add_boolean_config_file_option(option_name = "ignore-branch", dest="ignore_branch") naming_group.add_config_file_option(option_name="debian-branch", dest="debian_branch") naming_group.add_config_file_option(option_name="upstream-tag", dest="upstream_tag") naming_group.add_config_file_option(option_name="debian-tag", dest="debian_tag") @@ -341,9 +342,9 @@ def main(argv): raise GbpError, "%s is not a git repository" % (os.path.abspath('.')) branch = repo.get_branch() - if options.debian_branch != branch: + if options.debian_branch != branch and not options.ignore_branch: print >>sys.stderr, "You are not on branch '%s' but on '%s'" % (options.debian_branch, branch) - raise GbpError, "Use --debian-branch to set the branch to pick changes from" + raise GbpError, "Use --ignore-branch to ignore or --debian-branch to set the branch name." cp = parse_changelog(changelog) |