Merge pull request #111 from garethjevans/bug-on-rebas

chore: fix on rebase when remote endswith .git

pkg/domain/git.go

@@ -186,6 +186,9 @@ func ExtractURLFromRemote(reader io.Reader, name string) (string, error) {
 }
 
 func ExtractOrgAndRepoURL(urlString string) (string, string, error) {
+	if strings.HasSuffix(urlString, ".git") {
+		urlString = strings.TrimSuffix(urlString, ".git")
+	}
 	url, err := url2.Parse(urlString)
 	if err != nil {
 		return "", "", err

pkg/domain/rebase_test.go

@@ -106,6 +106,22 @@ upstream https://github.com/upstream/repo (push)`,
 				"https://api.github.com/repos/upstream/repo",
 			},
 		},
+		{
+			name: "simple rebase on main with .git extension",
+			remotes: `origin https://github.com/origin/clone.git (fetch)
+origin https://github.com/origin/clone.git (push)`,
+			originDefaultBranch: "main",
+			expectedCommands: []string{
+				"git remote -v",
+				"git remote -v",
+				"git status --porcelain",
+				"git branch --show-current",
+				"git pull --tags origin main",
+			},
+			expectedRequests: []string{
+				"https://api.github.com/repos/origin/clone",
+			},
+		},
 	}
 
 	for _, tc := range tests {