Bug Fix: Replace lstrip with replace function (#849)

* Replace lstrip with replace function * replace only first occurrence of remote * add unit test * make formatter happy
jupyterlab · Dec 23, 2020 · 80f359f · 80f359f
1 parent e3cae9e
commit 80f359f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/jupyterlab_git/git.py b/jupyterlab_git/git.py
@@ -1104,7 +1104,7 @@ async def get_upstream_branch(self, current_path, branch_name):
             return {"code": code, "command": " ".join(command), "message": error}
 
         remote_name = output.strip()
-        remote_branch = rev_parse_output.strip().lstrip(remote_name + "/")
+        remote_branch = rev_parse_output.strip().replace(remote_name + "/", "", 1)
         return {
             "code": code,
             "remote_short_name": remote_name,

diff --git a/jupyterlab_git/tests/test_branch.py b/jupyterlab_git/tests/test_branch.py
@@ -408,6 +408,8 @@ async def test_get_current_branch_detached_failure():
         ("feature-foo", "master", "origin/withslash"),
         ("master", "master", "origin"),
         ("feature/bar", "feature-foo", ""),
+        # Test upstream branch name starts with a letter contained in remote name
+        ("rbranch", "rbranch", "origin"),
     ],
 )
 async def test_get_upstream_branch_success(branch, upstream, remotename):