Commit `d05948b`

Nick Faro committed on Jul 27, 2026

Match GitHub commit attribution

commit d05948b605179a8e87859496df7b8f1aee26711c parent 05d4b5b

4 changed files +52−38

Modifiedinternal/site/metadata.go +28−17

 }
 func (g *Generator) commits(ctx context.Context, oid string) ([]Commit, error) {
-	out, err := g.Git.Run(ctx, "log", "--format=%H%x00%h%x00%an%x00%ae%x00%aI%x00%s%x00%b%x00%P%x00", oid)
+	out, err := g.Git.Run(ctx, "log", "--format=%H%x00%h%x00%an%x00%ae%x00%aI%x00%cn%x00%ce%x00%cI%x00%s%x00%b%x00%P%x00", oid)
 	if err != nil {
 		return nil, err
 	}
 	if len(fields) > 0 && strings.TrimSpace(fields[len(fields)-1]) == "" {
 		fields = fields[:len(fields)-1]
 	}
-	if len(fields)%8 != 0 {
+	if len(fields)%11 != 0 {
 		return nil, fmt.Errorf("unexpected git log output")
 	}
-	result := make([]Commit, 0, len(fields)/8)
+	result := make([]Commit, 0, len(fields)/11)
-	for i := 0; i < len(fields); i += 8 {
+	for i := 0; i < len(fields); i += 11 {
 		author := strings.TrimSpace(fields[i+2])
 		email := strings.TrimSpace(fields[i+3])
-		dateTime := strings.TrimSpace(fields[i+4])
+		committer := strings.TrimSpace(fields[i+5])
+		committerEmail := strings.TrimSpace(fields[i+6])
+		dateTime := strings.TrimSpace(fields[i+7])
 		result = append(result, Commit{
-			OID:       strings.TrimSpace(fields[i]),
+			OID:                strings.TrimSpace(fields[i]),
-			ShortOID:  strings.TrimSpace(fields[i+1]),
+			ShortOID:           strings.TrimSpace(fields[i+1]),
-			Author:    author,
+			Author:             author,
-			Email:     email,
+			Email:              email,
-			Date:      displayDate(dateTime),
+			Committer:          committer,
-			DateTime:  dateTime,
+			CommitterEmail:     committerEmail,
-			Message:   strings.TrimSpace(fields[i+5]),
+			Date:               displayDate(dateTime),
-			Body:      strings.TrimSpace(fields[i+6]),
+			DateTime:           dateTime,
-			Initials:  initials(author),
+			Message:            strings.TrimSpace(fields[i+8]),
-			AvatarURL: gravatarURL(email, author),
+			Body:               strings.TrimSpace(fields[i+9]),
-			URL:       routeURL(g.BaseURL, path.Join("commit", strings.TrimSpace(fields[i]))),
+			Initials:           initials(author),
-			Parents:   strings.Fields(fields[i+7]),
+			AvatarURL:          gravatarURL(email, author),
+			CommitterAvatarURL: gravatarURL(committerEmail, committer),
+			DistinctCommitter:  !sameCommitIdentity(author, email, committer, committerEmail),
+			URL:                routeURL(g.BaseURL, path.Join("commit", strings.TrimSpace(fields[i]))),
+			Parents:            strings.Fields(fields[i+10]),
 		})
 	}
 	return result, nil
 }
+func sameCommitIdentity(author, authorEmail, committer, committerEmail string) bool {
+	return strings.EqualFold(strings.TrimSpace(author), strings.TrimSpace(committer)) &&
+		strings.EqualFold(strings.TrimSpace(authorEmail), strings.TrimSpace(committerEmail))
+}
 func groupCommits(commits []Commit) []CommitGroup {
 	var groups []CommitGroup
 	for _, commit := range commits {

Modifiedinternal/site/site.go +16−12

`@@ -65,18 +65,22 @@ type Generator struct {`
65	`}`	65	`}`
66		66
67	`type Commit struct {`	67	`type Commit struct {`
68	`OID string`	68	`OID string`
69	`ShortOID string`	69	`ShortOID string`
70	`Author string`	70	`Author string`
71	`Email string`	71	`Email string`
72	`Date string`	72	`Committer string`
73	`DateTime string`	73	`CommitterEmail string`
74	`Message string`	74	`Date string`
75	`Body string`	75	`DateTime string`
76	`Initials string`	76	`Message string`
77	`AvatarURL string`	77	`Body string`
78	`URL string`	78	`Initials string`
79	`Parents []string`	79	`AvatarURL string`
		80	`CommitterAvatarURL string`
		81	`DistinctCommitter bool`
		82	`URL string`
		83	`Parents []string`
80	`}`	84	`}`
81		85
82	`type TreeEntry struct {`	86	`type TreeEntry struct {`

Modifiedinternal/site/style.go +6−5

 .commit-group { margin: 0 0 28px; }
 .commit-group > h2 { margin: 0 0 9px; font-size: 15px; font-weight: 600; }
 .commit-list { overflow: hidden; border: 1px solid var(--border); border-radius: 7px; }
-.commit-list-row { min-height: 67px; display: grid; grid-template-columns: 38px minmax(0,1fr) auto; align-items: center; gap: 11px; padding: 10px 14px; border-top: 1px solid var(--border-muted); }
+.commit-list-row { min-height: 67px; display: grid; grid-template-columns: minmax(0,1fr) auto; align-items: center; gap: 11px; padding: 10px 14px; border-top: 1px solid var(--border-muted); }
 .commit-list-row:first-child { border-top: 0; }
 .commit-list-row:target { background: var(--attention-bg); }
 .commit-list-row:hover { background: var(--canvas); }
 .commit-list-row:target:hover { background: var(--attention-bg); }
-.commit-list-row .commit-avatar { width: 34px; height: 34px; }
 .commit-list-body { min-width: 0; display: flex; flex-direction: column; }
 .commit-list-message { overflow: hidden; color: var(--text); font-weight: 600; text-overflow: ellipsis; white-space: nowrap; }
 .commit-list-message:hover, .commit-list-message:focus { color: var(--text); text-decoration: underline; }
-.commit-list-body > span { color: var(--muted); font-size: 12px; }
+.commit-list-body > span { display: flex; align-items: center; gap: 5px; color: var(--muted); font-size: 12px; }
+.commit-list-avatar { width: 16px; height: 16px; }
 .commit-list-body > span strong { color: var(--text); }
 .commit-list-actions { display: inline-flex; align-items: center; gap: 6px; }
 .commit-sha { padding: 4px 8px; border: 1px solid var(--border); border-radius: 6px; color: var(--text); background: var(--canvas); font: 12px ui-monospace, SFMono-Regular, Consolas, monospace; }
 .commit-copy.is-copied { color: var(--green); background: var(--success-bg); }
 .commit-body { margin: 0; padding: 14px 16px; overflow: auto; border-bottom: 1px solid var(--border-muted); color: var(--text); background: var(--bg); font: 13px/1.55 ui-monospace, SFMono-Regular, Consolas, monospace; white-space: pre-wrap; overflow-wrap: anywhere; }
 .commit-author-row { min-height: 28px; margin: -6px 0 12px; display: flex; align-items: center; gap: 9px; }
-.commit-author-row > span { color: var(--muted); }
+.commit-author-row > span { display: flex; align-items: center; gap: 5px; color: var(--muted); }
+.commit-author-row .commit-avatar { width: 20px; height: 20px; }
 .commit-author-row strong { color: var(--text); }
 .commit-identifiers { min-height: 48px; padding: 8px 12px; display: flex; flex-wrap: wrap; align-items: center; gap: 8px 20px; color: var(--muted); font-size: 12px; }
 .commit-identifiers code { color: var(--text); font-family: ui-monospace, SFMono-Regular, Consolas, monospace; }
   .row-message { display: none; }
   .markdown-body { padding: 22px 18px; }
   .branch-popover, .clone-popover { position: fixed; top: 74px; left: 12px; right: 12px; width: auto; }
-  .commit-list-row { grid-template-columns: 34px minmax(0,1fr); }
+  .commit-list-row { grid-template-columns: minmax(0,1fr); }
   .commit-list-actions { display: none; }
   .commit-summary-title { align-items: center; }
   .commit-page-heading h1 { font-size: 20px; }

Modifiedinternal/site/template.go +2−4

           <h2>Commits on {{.Date}}</h2>
           <div class="commit-list">
             {{range .Commits}}<article class="commit-list-row" id="{{.OID}}">
-              <img class="avatar commit-avatar" src="{{.AvatarURL}}" alt="" loading="lazy" referrerpolicy="no-referrer">
               <div class="commit-list-body">
                 <a class="commit-list-message" href="{{.URL}}">{{.Message}}</a>
-                <span><strong>{{.Author}}</strong> committed on <time datetime="{{.DateTime}}" data-smart-time>{{.Date}}</time></span>
+                <span><img class="avatar commit-list-avatar" src="{{.AvatarURL}}" alt="" loading="lazy" referrerpolicy="no-referrer"><strong>{{.Author}}</strong>{{if .DistinctCommitter}} authored and <img class="avatar commit-list-avatar" src="{{.CommitterAvatarURL}}" alt="" loading="lazy" referrerpolicy="no-referrer"><strong>{{.Committer}}</strong>{{end}} committed on <time datetime="{{.DateTime}}" data-smart-time>{{.Date}}</time></span>
               </div>
               <div class="commit-list-actions">
                 <a class="commit-sha" href="{{.URL}}">{{.ShortOID}}</a>
       <section class="primary full-width commit-view">
         <div class="commit-page-heading"><h1>Commit <code>{{.ViewedCommit.Commit.ShortOID}}</code></h1></div>
         <div class="commit-author-row">
-          <img class="avatar commit-avatar" src="{{.ViewedCommit.Commit.AvatarURL}}" alt="" referrerpolicy="no-referrer">
+          <span><img class="avatar commit-avatar" src="{{.ViewedCommit.Commit.AvatarURL}}" alt="" referrerpolicy="no-referrer"><strong>{{.ViewedCommit.Commit.Author}}</strong>{{if .ViewedCommit.Commit.DistinctCommitter}} authored and <img class="avatar commit-avatar" src="{{.ViewedCommit.Commit.CommitterAvatarURL}}" alt="" referrerpolicy="no-referrer"><strong>{{.ViewedCommit.Commit.Committer}}</strong>{{end}} committed on <time datetime="{{.ViewedCommit.Commit.DateTime}}" data-smart-time>{{.ViewedCommit.Commit.Date}}</time></span>
-          <span><strong>{{.ViewedCommit.Commit.Author}}</strong> committed on <time datetime="{{.ViewedCommit.Commit.DateTime}}" data-smart-time>{{.ViewedCommit.Commit.Date}}</time></span>
         </div>
         <article class="commit-summary-card">
           <div class="commit-summary-title">

Commit d05948b

Commit `d05948b`