refactor: Add gitutil.GetHEADRepository()

Author: tyru

cmd/builder/copy.go

@@ -148,8 +148,14 @@ func (builder *copyBuilder) copyReposList(buildReposMap map[pathutil.ReposPath]*
 func (builder *copyBuilder) copyReposGit(repos *lockjson.Repos, buildRepos *buildinfo.Repos, vimExePath string, done chan actionReposResult) (int, error) {
 	src := pathutil.FullReposPath(repos.Path)
 
+	// Open ~/volt/repos/{repos}
+	r, err := git.PlainOpen(src)
+	if err != nil {
+		return 0, errors.New("failed to open repository: " + err.Error())
+	}
+
 	// Show warning when HEAD and locked revision are different
-	head, err := gitutil.GetHEAD(repos.Path)
+	head, err := gitutil.GetHEADRepository(r)
 	if err != nil {
 		return 0, fmt.Errorf("failed to get HEAD revision of %q: %s", src, err.Error())
 	}
@@ -160,12 +166,6 @@ func (builder *copyBuilder) copyReposGit(repos *lockjson.Repos, buildRepos *buil
 		logger.Warn("  Please run 'volt get -l' to update locked revision.")
 	}
 
-	// Open ~/volt/repos/{repos}
-	r, err := git.PlainOpen(src)
-	if err != nil {
-		return 0, errors.New("failed to open repository: " + err.Error())
-	}
-
 	cfg, err := r.Config()
 	if err != nil {
 		return 0, errors.New("failed to get repository config: " + err.Error())

cmd/builder/symlink.go

@@ -107,8 +107,17 @@ func (builder *symlinkBuilder) installRepos(repos *lockjson.Repos, vimExePath st
 
 	copied := false
 	if repos.Type == lockjson.ReposGitType {
+		// Open a repository to determine it is bare repository or not
+		r, err := git.PlainOpen(src)
+		if err != nil {
+			done <- actionReposResult{
+				err: fmt.Errorf("repository %q: %s", src, err.Error()),
+			}
+			return
+		}
+
 		// Show warning when HEAD and locked revision are different
-		head, err := gitutil.GetHEAD(repos.Path)
+		head, err := gitutil.GetHEADRepository(r)
 		if err != nil {
 			done <- actionReposResult{
 				err: fmt.Errorf("failed to get HEAD revision of %q: %s", src, err.Error()),
@@ -122,14 +131,6 @@ func (builder *symlinkBuilder) installRepos(repos *lockjson.Repos, vimExePath st
 			logger.Warn("  Please run 'volt get -l' to update locked revision.")
 		}
 
-		// Open a repository to determine it is bare repository or not
-		r, err := git.PlainOpen(src)
-		if err != nil {
-			done <- actionReposResult{
-				err: fmt.Errorf("repository %q: %s", src, err.Error()),
-			}
-			return
-		}
 		cfg, err := r.Config()
 		if err != nil {
 			done <- actionReposResult{
@@ -150,6 +151,7 @@ func (builder *symlinkBuilder) installRepos(repos *lockjson.Repos, vimExePath st
 			copied = true
 		}
 	}
+
 	if !copied {
 		// Make symlinks under vim dir
 		if err := builder.symlink(src, dst); err != nil {

gitutil/gitutil.go

@@ -22,7 +22,10 @@ func GetHEAD(reposPath pathutil.ReposPath) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	return GetHEADRepository(repos)
+}
 
+func GetHEADRepository(repos *git.Repository) (string, error) {
 	head, err := repos.Head()
 	if err != nil {
 		return "", err