diff --git a/git_redmine.py b/git_redmine.py index ff44e64..6080396 100644 --- a/git_redmine.py +++ b/git_redmine.py @@ -208,10 +208,10 @@ def take(issue_number, reference): else: new = True default_branch_name = 'wip/%s-%s' % (issue_number, slugify(issue.subject)[:32]) - click.confirm('Do you want to create a branch tracking %s ?' % (reference or 'origin/master'), + click.confirm('Do you want to create a branch tracking %s ?' % (reference or 'origin/main'), default=True, abort=True) branch_name = click.prompt('Branch name', default=default_branch_name) - branch = repo.create_head(branch_name, commit=reference or 'origin/master') + branch = repo.create_head(branch_name, commit=reference or 'origin/main') set_branch_option(repo, branch, 'merge', 'refs/heads/main') set_branch_option(repo, branch, 'remote', '.') if repo.head.reference == branch: @@ -270,7 +270,7 @@ def submit(ctx, issue, no_rebase, number_of_commits): api = get_redmine_api() kwargs = {} repo = get_repo() - for commit in list(get_commits(repo, 'master'))[:number_of_commits]: + for commit in list(get_commits(repo, 'main'))[:number_of_commits]: if ('#%s' % get_current_issue()) not in commit.message: click.echo(click.style('Missing commit number in commit message', fg='red')) click.echo() @@ -351,7 +351,7 @@ def get_commits(repo, ref): @redmine.command(name='merge-and-push') @click.option('--issue', default=None, type=int) @click.option('--validate-msg/--no-validate-msg', default=True) -@click.argument('target_branch', default='master') +@click.argument('target_branch', default='main') def merge_and_push(issue, validate_msg, target_branch): issue = get_issue(issue or None) repo = get_repo() @@ -478,7 +478,7 @@ def merge_and_push(issue, validate_msg, target_branch): @redmine.command(name='rebase') -@click.argument('target_branch', default='master') +@click.argument('target_branch', default='main') def rebase(target_branch): repo = get_repo() origin = repo.remote()