Fixed error switching remote branch, fixes #741 (#1066)

Co-authored-by: Piyush Jain <[email protected]>

Author: 3coins

jupyterlab_git/git.py

@@ -935,7 +935,8 @@ async def checkout_branch(self, branchname, path):
             is_remote_branch = self._is_remote_branch(reference_name)
 
         if is_remote_branch:
-            cmd = ["git", "checkout", "--track", branchname]
+            local_branchname = branchname.split("/")[-1]
+            cmd = ["git", "checkout", "-B", local_branchname, branchname]
         else:
             cmd = ["git", "checkout", branchname]
 

jupyterlab_git/tests/test_branch.py

@@ -120,7 +120,8 @@ async def test_checkout_branch_noref_failure():
 
 @pytest.mark.asyncio
 async def test_checkout_branch_remoteref_success():
-    branch = "test-branch"
+    branch = "origin/test-branch"
+    local_branch = "test-branch"
     curr_path = str(Path("/bin/test_curr_path"))
     stdout_message = "checkout output from git"
     stderr_message = ""
@@ -145,7 +146,7 @@ async def test_checkout_branch_remoteref_success():
             # Then
             mock__get_branch_reference.assert_has_calls([call(branch, curr_path)])
 
-            cmd = ["git", "checkout", "--track", branch]
+            cmd = ["git", "checkout", "-B", local_branch, branch]
             mock_execute.assert_called_once_with(
                 cmd,
                 cwd=str(Path("/bin") / "test_curr_path"),
@@ -229,7 +230,8 @@ async def test_checkout_branch_headsref_success():
 
 @pytest.mark.asyncio
 async def test_checkout_branch_remoteref_failure():
-    branch = "test-branch"
+    branch = "origin/test-branch"
+    local_branch = "test-branch"
     stdout_message = ""
     stderr_message = (
         "error: pathspec '{}' did not match any file(s) known to git".format(branch)
@@ -253,7 +255,7 @@ async def test_checkout_branch_remoteref_failure():
             )
 
             # Then
-            cmd = ["git", "checkout", "--track", branch]
+            cmd = ["git", "checkout", "-B", local_branch, branch]
             mock_execute.assert_called_once_with(
                 cmd,
                 cwd=str(Path("/bin") / "test_curr_path"),