diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-02 20:22:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-02 22:38:01 -0400 |
| commit | 1e044a9bd68220af562cc2d895936ec7cc3e3d6d (patch) | |
| tree | 946aa5cf48d00e014980e0f0c035ba1b417cc0bf /tools/patman/gitutil.py | |
| parent | 97962260cb93e74e3a8cbbb62e7581830503810a (diff) | |
| parent | ae94c3d4ee21ba4dd628d2f463fb3992233963ef (diff) | |
Merge tag 'dm-pull-2nov23' of https://source.denx.de/u-boot/custodians/u-boot-dm
Just various bugfixes, apart from the TI one
Diffstat (limited to 'tools/patman/gitutil.py')
| -rw-r--r-- | tools/patman/gitutil.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index b0a12f2e8c0..10ea5ff39f5 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -147,8 +147,9 @@ def get_upstream(git_dir, branch): if remote == '.': return merge, None elif remote and merge: - leaf = merge.split('/')[-1] - return '%s/%s' % (remote, leaf), None + # Drop the initial refs/heads from merge + leaf = merge.split('/', maxsplit=2)[2:] + return '%s/%s' % (remote, '/'.join(leaf)), None else: raise ValueError("Cannot determine upstream branch for branch " "'%s' remote='%s', merge='%s'" |