When in detached HEAD, send current commit (#254)

Author: jmsanders

internal/git/client.go

@@ -26,6 +26,18 @@ func (c *Client) GetBranch() string {
 }
 
 func (c *Client) GetCommit() string {
+	if c.GetBranch() == "" {
+		cmd := exec.Command(c.Binary, "rev-parse", "HEAD")
+		cmd.Dir = c.Dir
+
+		out, err := cmd.Output()
+		if err != nil {
+			return ""
+		}
+
+		return strings.TrimSpace(string(out))
+	}
+
 	// Map known commits to their remote ref
 	cmd := exec.Command(c.Binary, "for-each-ref", "--format=%(objectname) %(refname)", "refs/remotes/origin")
 	cmd.Dir = c.Dir

internal/git/client_test.go

@@ -112,22 +112,12 @@ func TestGetCommit(t *testing.T) {
 		require.Equal(t, "", commit)
 	})
 
-	t.Run("when we're in detatched HEAD state", func(t *testing.T) {
-		t.Run("returns the common ancestor if we have the same HEAD", func(t *testing.T) {
-			repo, expected := repoFixture(t, "testdata/GetCommit-detached-head")
-
-			client := &git.Client{Binary: "git", Dir: filepath.Join(repo, "repo")}
-			commit := client.GetCommit()
-			require.Equal(t, expected, commit)
-		})
-
-		t.Run("returns the common ancestor if we've diverged", func(t *testing.T) {
-			repo, expected := repoFixture(t, "testdata/GetCommit-detached-head-diverged")
+	t.Run("returns HEAD when in detached HEAD state", func(t *testing.T) {
+		repo, expected := repoFixture(t, "testdata/GetCommit-detached-head-diverged")
 
-			client := &git.Client{Binary: "git", Dir: filepath.Join(repo, "repo")}
-			commit := client.GetCommit()
-			require.Equal(t, expected, commit)
-		})
+		client := &git.Client{Binary: "git", Dir: filepath.Join(repo, "repo")}
+		commit := client.GetCommit()
+		require.Equal(t, expected, commit)
 	})
 
 	t.Run("when we have a branch checked out", func(t *testing.T) {

internal/git/testdata/GetCommit-detached-head-diverged

@@ -5,13 +5,11 @@ mkdir origin
 pushd origin > /dev/null
 git init > /dev/null
 git commit --allow-empty -m "Initial commit" > /dev/null
-
-# Expected common ancestor: 
-git rev-parse HEAD
-
 popd > /dev/null
 
 git clone origin repo > /dev/null 2>&1
 pushd repo > /dev/null
 git commit --allow-empty -m "Diverge" > /dev/null
 git checkout $(git rev-parse HEAD) > /dev/null 2>&1
+
+git rev-parse HEAD