Add tests

conn/command.go

@@ -81,7 +81,7 @@ func (conn *Connection) GetMergedBranchNames(ctx context.Context, remoteName str
 
 func (conn *Connection) GetRemoteHeadOid(ctx context.Context, remoteName string, branchName string) (string, error) {
 	args := []string{
-		"rev-parse", fmt.Sprintf("%s/%s", remoteName, branchName), "--",
+		"rev-parse", fmt.Sprintf("%s/%s", remoteName, branchName),
 	}
 	return conn.run(ctx, "git", args, None)
 }

conn/command_test.go

@@ -79,7 +79,7 @@ func Test_RepoBasic(t *testing.T) {
 	t.Run("GetConfig", func(t *testing.T) {
 		actual, _ := conn.GetConfig(context.Background(), "branch.main.merge")
 		assert.Equal(t,
-			stub.readFile("git", "configMerge", "main"),
+			stub.readFile("git", "config", "mergeMain"),
 			actual,
 		)
 	})

conn/fixtures/git/config_remote.txt

@@ -0,0 +1 @@
+git@github.com:owner/repo.git

conn/fixtures/git/lsRemoteHead_issue1.txt

@@ -0,0 +1 @@
+a97e9630426df5d34ca9ee77ae1159bdfd5ff8f0	refs/heads/issue1

conn/fixtures/git/remoteHead_issue1.txt

@@ -0,0 +1 @@
+a97e9630426df5d34ca9ee77ae1159bdfd5ff8f0

conn/stub.go

@@ -23,6 +23,16 @@ type (
 		Times *Times
 	}
 
+	RemoteHeadStub struct {
+		BranchName string
+		Filename   string
+	}
+
+	LsRemoteHeadStub struct {
+		BranchName string
+		Filename   string
+	}
+
 	AssociatedBranchNamesStub struct {
 		Oid      string
 		Filename string
@@ -124,25 +134,47 @@ func (s *Stub) GetMergedBranchNames(filename string, err error, conf *Conf) *Stu
 	return s
 }
 
-func (s *Stub) GetRemoteHeadOid(err error, conf *Conf) *Stub {
+func (s *Stub) GetRemoteHeadOid(stubs []RemoteHeadStub, err error, conf *Conf) *Stub {
 	s.t.Helper()
-	configure(
-		s.Conn.EXPECT().
-			GetRemoteHeadOid(gomock.Any(), gomock.Any(), gomock.Any()).
-			Return("", err),
-		conf,
-	)
+	if stubs == nil {
+		configure(
+			s.Conn.EXPECT().
+				GetRemoteHeadOid(gomock.Any(), gomock.Any(), gomock.Any()).
+				Return("", err),
+			conf,
+		)
+	} else {
+		for _, stub := range stubs {
+			configure(
+				s.Conn.EXPECT().
+					GetRemoteHeadOid(gomock.Any(), gomock.Any(), stub.BranchName).
+					Return(s.readFile("git", "remoteHead", stub.Filename), err),
+				conf,
+			)
+		}
+	}
 	return s
 }
 
-func (s *Stub) GetLsRemoteHeadOid(err error, conf *Conf) *Stub {
+func (s *Stub) GetLsRemoteHeadOid(stubs []LsRemoteHeadStub, err error, conf *Conf) *Stub {
 	s.t.Helper()
-	configure(
-		s.Conn.EXPECT().
-			GetLsRemoteHeadOid(gomock.Any(), gomock.Any(), gomock.Any()).
-			Return("", err),
-		conf,
-	)
+	if stubs == nil {
+		configure(
+			s.Conn.EXPECT().
+				GetLsRemoteHeadOid(gomock.Any(), gomock.Any(), gomock.Any()).
+				Return("", err),
+			conf,
+		)
+	} else {
+		for _, stub := range stubs {
+			configure(
+				s.Conn.EXPECT().
+					GetLsRemoteHeadOid(gomock.Any(), gomock.Any(), stub.BranchName).
+					Return(s.readFile("git", "lsRemoteHead", stub.Filename), err),
+				conf,
+			)
+		}
+	}
 	return s
 }
 
@@ -203,7 +235,7 @@ func (s *Stub) GetConfig(stubs []ConfigStub, err error, conf *Conf) *Stub {
 			s.Conn.
 				EXPECT().
 				GetConfig(gomock.Any(), stub.BranchName).
-				Return(s.readFile("git", "configMerge", stub.Filename), err),
+				Return(s.readFile("git", "config", stub.Filename), err),
 			conf,
 		)
 	}

poi.go

@@ -299,14 +299,14 @@ func applyCommits(ctx context.Context, remote Remote, branches []Branch, default
 		}
 
 		if remoteHeadOid, err := connection.GetRemoteHeadOid(ctx, remote.Name, branch.Name); err == nil {
-			branch.RemoteHeadOid = remoteHeadOid
+			branch.RemoteHeadOid = splitLines(remoteHeadOid)[0]
 		} else {
 			result, _ := connection.GetConfig(ctx, fmt.Sprintf("branch.%s.remote", branch.Name))
 			splitResults := splitLines(result)
 			if len(splitResults) > 0 {
 				remoteUrl := splitResults[0]
 				if result, err := connection.GetLsRemoteHeadOid(ctx, remoteUrl, branch.Name); err == nil {
-					splitResults := strings.Split(result, " ")
+					splitResults := strings.Fields(result)
 					if len(splitResults) > 0 {
 						branch.RemoteHeadOid = splitResults[0]
 					}