Support SHA-256 attribution object IDs

Author: suhaanthayyil

cmd/entire/cli/attribution.go

@@ -274,8 +274,8 @@ func resolveFileAttribution(ctx context.Context, file string, fetchOnMiss bool)
 				}
 				continue
 			}
-			if ctx, ok := resolver.checkpointCache[candidate.CheckpointID]; ok {
-				result.Checkpoints[candidate.CheckpointID] = ctx
+			if checkpointCtx, ok := resolver.checkpointCache[candidate.CheckpointID]; ok {
+				result.Checkpoints[candidate.CheckpointID] = checkpointCtx
 			}
 		}
 	}
@@ -545,7 +545,7 @@ func runGitBlame(ctx context.Context, repoRoot, file string) ([]rawBlameLine, er
 	return parseBlamePorcelain(string(out))
 }
 
-var blameHeaderRe = regexp.MustCompile(`^([0-9a-f]{40})\s+\d+\s+(\d+)(?:\s+\d+)?$`)
+var blameHeaderRe = regexp.MustCompile(`^([0-9a-f]{40}|[0-9a-f]{64})\s+\d+\s+(\d+)(?:\s+\d+)?$`)
 
 func parseBlamePorcelain(output string) ([]rawBlameLine, error) {
 	scanner := bufio.NewScanner(strings.NewReader(output))
@@ -1061,7 +1061,7 @@ func appendUniqueString(values []string, value string) []string {
 }
 
 func isZeroCommit(sha string) bool {
-	return sha == "" || sha == plumbing.ZeroHash.String()
+	return sha == "" || strings.Trim(sha, "0") == ""
 }
 
 func writeJSON(w io.Writer, value any) error {

cmd/entire/cli/attribution_test.go

@@ -49,6 +49,30 @@ func TestParseBlamePorcelain(t *testing.T) {
 	require.Equal(t, 2, lines[1].LineNumber)
 }
 
+func TestParseBlamePorcelainSupportsSHA256ObjectIDs(t *testing.T) {
+	sha256ID := strings.Repeat("a", 64)
+	output := strings.Join([]string{
+		fmt.Sprintf("%s 1 1 1", sha256ID),
+		"author Ada Lovelace",
+		"author-time 1700000000",
+		"\tprint('hello')",
+		"",
+	}, "\n")
+
+	lines, err := parseBlamePorcelain(output)
+	require.NoError(t, err)
+	require.Len(t, lines, 1)
+	require.Equal(t, sha256ID, lines[0].CommitSHA)
+	require.Equal(t, 1, lines[0].LineNumber)
+	require.Equal(t, "print('hello')", lines[0].Content)
+}
+
+func TestIsZeroCommitSupportsSHA256ObjectIDs(t *testing.T) {
+	require.True(t, isZeroCommit(strings.Repeat("0", 40)))
+	require.True(t, isZeroCommit(strings.Repeat("0", 64)))
+	require.False(t, isZeroCommit(strings.Repeat("0", 63)+"1"))
+}
+
 func TestParseAttributionLineRange(t *testing.T) {
 	got, err := parseAttributionLineRange("12-20")
 	require.NoError(t, err)