fix: scenario where branchPosition is not in upstream (#162)

Co-authored-by: Alex Schneider <[email protected]>

src/git/remoteNameAndBranch.test.ts

@@ -61,5 +61,15 @@ describe('git', () => {
             assert.strictEqual(remoteName, 'remote-one', 'incorrect remote name')
             assert.strictEqual(branch, 'feature', 'incorrect branch name')
         })
+
+        it('falls back to first remote and branch when branch is not pushed to upstream', async () => {
+            const { remoteName, branch } = await gitRemoteNameAndBranch(
+                '',
+                createMockGitHelpers(['origin'], 'feature', 'origin/master')
+            )
+
+            assert.strictEqual(remoteName, 'origin', 'incorrect remote name')
+            assert.strictEqual(branch, 'feature', 'incorrect branch name')
+        })
     })
 })

src/git/remoteNameAndBranch.ts

@@ -48,7 +48,7 @@ export async function gitRemoteNameAndBranch(
 
         const branchPosition = upstreamAndBranch.lastIndexOf(branch)
         const maybeRemote = upstreamAndBranch.slice(0, branchPosition - 1)
-        if (maybeRemote) {
+        if (branchPosition !== -1 && maybeRemote) {
             remoteName = maybeRemote
         }
     } catch {