pkg/vcs: change HeadCommit to Commit

Currently we have HeadCommit function that returns info
about the HEAD commit. Change it to a more flexible Commit
function that can return info about any commit.
This will be used in future changes.

1 files changed, 12 insertions, 16 deletions

diff --git a/pkg/vcs/git.go b/pkg/vcs/git.go
index f8362dfb2..dd1681157 100644
--- a/pkg/vcs/git.go
+++ b/pkg/vcs/git.go
@@ -96,7 +96,7 @@ func (git *git) Poll(repo, branch string) (*Commit, error) {
 	if _, err := git.git("submodule", "update", "--init"); err != nil {
 		return nil, err
 	}
-	return git.HeadCommit()
+	return git.Commit(HEAD)
 }
 
 func (git *git) CheckoutBranch(repo, branch string) (*Commit, error) {
@@ -127,7 +127,7 @@ func (git *git) CheckoutBranch(repo, branch string) (*Commit, error) {
 	if err := git.repair(); err != nil {
 		return nil, err
 	}
-	return git.HeadCommit()
+	return git.Commit(HEAD)
 }
 
 func (git *git) CheckoutCommit(repo, commit string) (*Commit, error) {
@@ -176,7 +176,7 @@ func (git *git) SwitchCommit(commit string) (*Commit, error) {
 	if _, err := git.git("submodule", "update", "--init"); err != nil {
 		return nil, err
 	}
-	return git.HeadCommit()
+	return git.Commit(HEAD)
 }
 
 func (git *git) clone(repo, branch string) error {
@@ -237,16 +237,12 @@ func (git *git) initRepo(reason error) error {
 }
 
 func (git *git) Contains(commit string) (bool, error) {
-	_, err := git.git("merge-base", "--is-ancestor", commit, "HEAD")
+	_, err := git.git("merge-base", "--is-ancestor", commit, HEAD)
 	return err == nil, nil
 }
 
-func (git *git) HeadCommit() (*Commit, error) {
-	return git.getCommit("HEAD")
-}
-
-func (git *git) getCommit(commit string) (*Commit, error) {
-	output, err := git.git("log", "--format=%H%n%s%n%ae%n%an%n%ad%n%P%n%cd%n%b", "-n", "1", commit)
+func (git *git) Commit(com string) (*Commit, error) {
+	output, err := git.git("log", "--format=%H%n%s%n%ae%n%an%n%ad%n%P%n%cd%n%b", "-n", "1", com)
 	if err != nil {
 		return nil, err
 	}
@@ -351,7 +347,7 @@ func (git *git) GetCommitsByTitles(titles []string) ([]*Commit, []string, error)
 		m[canonical] = title
 	}
 	since := time.Now().Add(-time.Hour * 24 * 365 * fetchCommitsMaxAgeInYears).Format("01-02-2006")
-	commits, err := git.fetchCommits(since, "HEAD", "", "", greps, true)
+	commits, err := git.fetchCommits(since, HEAD, "", "", greps, true)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -479,7 +475,7 @@ func splitEmail(email string) (user, domain string, err error) {
 func (git *git) Bisect(bad, good string, dt debugtracer.DebugTracer, pred func() (BisectResult,
 	error)) ([]*Commit, error) {
 	git.reset()
-	firstBad, err := git.getCommit(bad)
+	firstBad, err := git.Commit(bad)
 	if err != nil {
 		return nil, err
 	}
@@ -489,7 +485,7 @@ func (git *git) Bisect(bad, good string, dt debugtracer.DebugTracer, pred func()
 	}
 	defer git.reset()
 	dt.Log("# git bisect start %v %v\n%s", bad, good, output)
-	current, err := git.HeadCommit()
+	current, err := git.Commit(HEAD)
 	if err != nil {
 		return nil, err
 	}
@@ -516,7 +512,7 @@ func (git *git) Bisect(bad, good string, dt debugtracer.DebugTracer, pred func()
 			}
 			return nil, err
 		}
-		next, err := git.HeadCommit()
+		next, err := git.Commit(HEAD)
 		if err != nil {
 			return nil, err
 		}
@@ -544,7 +540,7 @@ func (git *git) bisectInconclusive(output []byte) ([]*Commit, error) {
 	//	7c3850adbcccc2c6c9e7ab23a7dcbc4926ee5b96 is the first bad commit
 	var commits []*Commit
 	for _, hash := range gitFullHashRe.FindAll(output, -1) {
-		com, err := git.getCommit(string(hash))
+		com, err := git.Commit(string(hash))
 		if err != nil {
 			return nil, err
 		}
@@ -611,7 +607,7 @@ func (git *git) MergeBases(firstCommit, secondCommit string) ([]*Commit, error)
 	}
 	ret := []*Commit{}
 	for _, hash := range strings.Fields(string(output)) {
-		commit, err := git.getCommit(hash)
+		commit, err := git.Commit(hash)
 		if err != nil {
 			return nil, err
 		}