From 558b71e226c8d29c4797f799e16eea66ded0532d Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Mon, 11 May 2020 17:08:32 -0400 Subject: Make sure to always use the full refname Git will try to helpfully disambiguate, but we just need consistency, so always ask for a full refname. Signed-off-by: Konstantin Ryabitsev --- b4/ty.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b4/ty.py b/b4/ty.py index 02898b0..4271986 100644 --- a/b4/ty.py +++ b/b4/ty.py @@ -567,12 +567,12 @@ def get_wanted_branch(cmdargs): logger.debug('will check branch=%s', wantbranch) else: # Make sure it's a real branch - gitargs = ['branch', '--format=%(refname:short)', '--list', '--all'] + gitargs = ['branch', '--format=%(refname)', '--list', '--all'] lines = b4.git_get_command_lines(gitdir, gitargs) if not len(lines): logger.critical('Not able to get a list of branches (git branch --list --all)') sys.exit(1) - if cmdargs.branch not in lines: + if f'refs/heads/{cmdargs.branch}' not in lines: logger.critical('Requested branch %s not found in git branch --list --all', cmdargs.branch) sys.exit(1) wantbranch = cmdargs.branch -- cgit v1.2.3