From a5e6deafbf6460e10e6d21ec7c46dbbcf275c37a Mon Sep 17 00:00:00 2001 From: Doesnot Matter Date: Thu, 26 May 2022 19:54:15 +0200 Subject: pull: Prefix local branch with 'refs/heads/' This can resolve ambiguity when generating the rev list. Closes: #966627 --- gbp/scripts/pull.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py index c9bea152..d8ece701 100755 --- a/gbp/scripts/pull.py +++ b/gbp/scripts/pull.py @@ -49,7 +49,8 @@ def fast_forward_branch(rem_repo, branch, repo, options): gbp.log.warn("No branch tracking '%s' found - skipping." % branch) return False - can_fast_forward, up_to_date = repo.is_fast_forward(branch, remote) + can_fast_forward, up_to_date = repo.is_fast_forward(repo.ensure_refs_heads(branch), + remote) if up_to_date: # Great, we're done gbp.log.info("Branch '%s' is already up to date." % branch) -- cgit v1.2.3