diff options
| author | Doesnot Matter <you@example.com> | 2022-05-26 19:54:15 +0200 |
|---|---|---|
| committer | Doesnot Matter <you@example.com> | 2022-05-26 19:55:26 +0200 |
| commit | a5e6deafbf6460e10e6d21ec7c46dbbcf275c37a (patch) | |
| tree | 5bf7d6593ec2c0ee7f599b905707b727acf272fe | |
| parent | 03348fd156b2bfc1d69197649b471b01a4620238 (diff) | |
pull: Prefix local branch with 'refs/heads/'
This can resolve ambiguity when generating the rev list.
Closes: #966627
| -rwxr-xr-x | gbp/scripts/pull.py | 3 |
1 files changed, 2 insertions, 1 deletions
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) |