From 0707276e119b05391cf486bb437414bf83850c1f Mon Sep 17 00:00:00 2001 From: James Cote <3276350+Coteh@users.noreply.github.com> Date: Sat, 6 Apr 2024 19:03:04 -0400 Subject: [PATCH] Fixes #3218 - fix bitbucket-server splitPath "scm/" regression --- CHANGELOG.md | 1 + README.md | 1 + src/git/remotes/bitbucket-server.ts | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9241fc6ecbd5..13a02ef328b26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#3180](https://github.com/gitkraken/vscode-gitlens/issues/3180) - Focus View feedback button is not working - Fixes [#3179](https://github.com/gitkraken/vscode-gitlens/issues/3179) - The checkmarks in cherry pick are not displayed +- Fixes [#3218](https://github.com/gitkraken/vscode-gitlens/issues/3218) - Bitbucket Server remote provider's splitPath method splits on path with "scm/" prefix instead of transformed path without "scm/" prefix ## [14.9.0] - 2024-03-06 diff --git a/README.md b/README.md index c47dc8486b746..617b0017c43ef 100644 --- a/README.md +++ b/README.md @@ -429,6 +429,7 @@ A big thanks to the people that have contributed to this project 🙏❤️: - Ian Chamberlain ([@ian-h-chamberlain](https://github.com/ian-h-chamberlain)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=ian-h-chamberlain) - Brandon Cheng ([@gluxon](https://github.com/gluxon)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gluxon) - yutotnh ([@yutotnh](https://github.com/yutotnh)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=yutotnh) +- James Cote ([@Coteh](https://github.com/Coteh)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=Coteh) Also special thanks to the people that have provided support, testing, brainstorming, etc: diff --git a/src/git/remotes/bitbucket-server.ts b/src/git/remotes/bitbucket-server.ts index a0eb0a6948013..4173bad908a45 100644 --- a/src/git/remotes/bitbucket-server.ts +++ b/src/git/remotes/bitbucket-server.ts @@ -51,7 +51,7 @@ export class BitbucketServerRemote extends RemoteProvider { if (this.path.startsWith('scm/')) { const path = this.path.replace('scm/', ''); const index = path.indexOf('/'); - return [this.path.substring(0, index), this.path.substring(index + 1)]; + return [path.substring(0, index), path.substring(index + 1)]; } return super.splitPath();