Merge pull request #1047 from wakatime/bugfix/git-detection

Check split lenght when finding git branch

Author: gandarez

.github/workflows/on_push.yml

@@ -170,7 +170,7 @@ jobs:
         name: Build binary
         env:
           VERSION: ${{ env.TEST_VERSION }}
-        run: make build-darwin-amd64
+        run: make build-darwin-arm64
       -
         name: Integration tests
         run: make test-integration

go.mod

@@ -1,6 +1,6 @@
 module github.com/wakatime/wakatime-cli
 
-go 1.22.2
+go 1.22.4
 
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358

pkg/project/git.go

@@ -290,6 +290,13 @@ func findGitBranch(fp string) (string, error) {
 	}
 
 	if len(lines) > 0 && strings.HasPrefix(strings.TrimSpace(lines[0]), "ref: ") {
+		parts := strings.SplitN(lines[0], "/", 3)
+		if len(parts) < 3 {
+			log.Warnf("invalid branch from %q: %s", fp, lines[0])
+
+			return "", nil
+		}
+
 		return strings.TrimSpace(strings.SplitN(lines[0], "/", 3)[2]), nil
 	}
 

pkg/project/git_test.go

@@ -115,6 +115,29 @@ func TestGit_Detect_GitConfigFile_File(t *testing.T) {
 	}
 }
 
+func TestGit_Detect_GitConfigFile_File_MalformedHEAD(t *testing.T) {
+	fp := setupTestGitFile(t)
+
+	// overwrite HEAD file with a malformed content
+	err := os.WriteFile(filepath.Join(fp, "wakatime-cli/.git/HEAD"), []byte("ref: refs/malformed"), os.FileMode(int(0700)))
+	require.NoError(t, err)
+
+	g := project.Git{
+		Filepath: filepath.Join(fp, "wakatime-cli/src/pkg/file.go"),
+	}
+
+	result, detected, err := g.Detect()
+	require.NoError(t, err)
+
+	assert.True(t, detected)
+	assert.Contains(t, result.Folder, filepath.Join(fp, "wakatime-cli"))
+	assert.Equal(t, project.Result{
+		Project: "wakatime-cli",
+		Branch:  "",
+		Folder:  result.Folder,
+	}, result)
+}
+
 func TestGit_Detect_Worktree(t *testing.T) {
 	fp := setupTestGitWorktree(t)