Merge pull request #109 from fluxcd/fix-git-semver

Fix Git semver checkout

Author: stefanprodan

pkg/git/checkout.go

@@ -212,23 +212,28 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, auth tr
 	semver.Sort(svers)
 	v := svers[len(svers)-1]
 	t := svTags[v.String()]
-	commitRef := tags[t]
 
 	w, err := repo.Worktree()
 	if err != nil {
 		return nil, "", fmt.Errorf("git worktree error: %w", err)
 	}
 
-	commit, err := repo.CommitObject(plumbing.NewHash(commitRef))
-	if err != nil {
-		return nil, "", fmt.Errorf("git commit '%s' not found: %w", commitRef, err)
-	}
 	err = w.Checkout(&git.CheckoutOptions{
-		Hash: commit.Hash,
+		Branch: plumbing.NewTagReferenceName(t),
 	})
 	if err != nil {
 		return nil, "", fmt.Errorf("git checkout error: %w", err)
 	}
 
-	return commit, fmt.Sprintf("%s/%s", t, commitRef), nil
+	head, err := repo.Head()
+	if err != nil {
+		return nil, "", fmt.Errorf("git resolve HEAD error: %w", err)
+	}
+
+	commit, err := repo.CommitObject(head.Hash())
+	if err != nil {
+		return nil, "", fmt.Errorf("git commit '%s' not found: %w", head.Hash(), err)
+	}
+
+	return commit, fmt.Sprintf("%s/%s", t, head.Hash().String()), nil
 }

pkg/git/checkout_test.go

@@ -0,0 +1,36 @@
+package git
+
+import (
+	"context"
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+func TestCheckoutTagSemVer_Checkout(t *testing.T) {
+	tag := CheckoutTag{
+		tag: "v1.7.0",
+	}
+	tmpDir, _ := ioutil.TempDir("", "test")
+	defer os.RemoveAll(tmpDir)
+
+	cTag, _, err := tag.Checkout(context.TODO(), tmpDir, "https://github.com/projectcontour/contour", nil)
+	if err != nil {
+		t.Error(err)
+	}
+
+	semVer := CheckoutSemVer{
+		semVer: ">=1.0.0 <=1.7.0",
+	}
+	tmpDir2, _ := ioutil.TempDir("", "test")
+	defer os.RemoveAll(tmpDir2)
+
+	cSemVer, _, err := semVer.Checkout(context.TODO(), tmpDir2, "https://github.com/projectcontour/contour", nil)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if cTag.Hash.String() != cSemVer.Hash.String() {
+		t.Errorf("expected semver hash %s, got %s", cTag.Hash.String(), cSemVer.Hash.String())
+	}
+}