fix: Fix handling of default refs in LiveRepoProvider

kluctl · May 24, 2022 · 8e181c3 · 8e181c3
1 parent 501b628
commit 8e181c3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/pkg/git/mirrored_repo.go b/pkg/git/mirrored_repo.go
@@ -55,6 +55,10 @@ func NewMirroredGitRepo(ctx context.Context, u git_url.GitUrl) (*MirroredGitRepo
 	return o, nil
 }
 
+func (g *MirroredGitRepo) Url() git_url.GitUrl {
+	return g.url
+}
+
 func (g *MirroredGitRepo) HasUpdated() bool {
 	return g.hasUpdated
 }

diff --git a/pkg/git/repoprovider/live.go b/pkg/git/repoprovider/live.go
@@ -110,12 +110,7 @@ func (rp *LiveRepoProvider) getEntry(url git_url.GitUrl, allowCreate bool, lockR
 	return e, nil
 }
 
-func (rp *LiveRepoProvider) GetRepoInfo(url git_url.GitUrl) (RepoInfo, error) {
-	e, err := rp.getEntry(url, true, true, true)
-	if err != nil {
-		return RepoInfo{}, err
-	}
-
+func (e *entry) getRepoInfo() (RepoInfo, error) {
 	remoteRefs, err := e.mr.RemoteRefHashesMap()
 	if err != nil {
 		return RepoInfo{}, err
@@ -127,20 +122,37 @@ func (rp *LiveRepoProvider) GetRepoInfo(url git_url.GitUrl) (RepoInfo, error) {
 	}
 
 	info := RepoInfo{
-		Url:        url,
+		Url:        e.mr.Url(),
 		RemoteRefs: remoteRefs,
 		DefaultRef: defaultRef,
 	}
 
 	return info, nil
 }
 
+func (rp *LiveRepoProvider) GetRepoInfo(url git_url.GitUrl) (RepoInfo, error) {
+	e, err := rp.getEntry(url, true, true, true)
+	if err != nil {
+		return RepoInfo{}, err
+	}
+
+	return e.getRepoInfo()
+}
+
 func (rp *LiveRepoProvider) GetClonedDir(url git_url.GitUrl, ref string) (string, git.CheckoutInfo, error) {
 	e, err := rp.getEntry(url, true, true, true)
 	if err != nil {
 		return "", git.CheckoutInfo{}, err
 	}
 
+	if ref == "" {
+		ref, err = e.mr.DefaultRef()
+		if err != nil {
+			return "", git.CheckoutInfo{}, err
+		}
+		ref = path.Base(ref)
+	}
+
 	e.updateMutex.Lock()
 	defer e.updateMutex.Unlock()