ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Centralize Git identity environment construction

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-21 11:12:54 -07:00
parent 9d0ffb5723
commit ae4cc5d57b
12 changed files with 23 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/git/git.go
+2 -12
View File
@@ -366,12 +366,7 @@ func CommitAll(dir, message, name, email string) (string, error) {
return "", nil
}
env := []string{
"GIT_AUTHOR_NAME=" + name,
"GIT_AUTHOR_EMAIL=" + email,
"GIT_COMMITTER_NAME=" + name,
"GIT_COMMITTER_EMAIL=" + email,
}
env := IdentityEnv(name, email)
_, err = runEnv(dir, env, "add", "--all")
if err != nil {
return "", err
@@ -384,12 +379,7 @@ func CommitAll(dir, message, name, email string) (string, error) {
}
func Merge(dir, rev, message, name, email string) error {
env := []string{
"GIT_AUTHOR_NAME=" + name,
"GIT_AUTHOR_EMAIL=" + email,
"GIT_COMMITTER_NAME=" + name,
"GIT_COMMITTER_EMAIL=" + email,
}
env := IdentityEnv(name, email)
_, err := runEnv(dir, env, "merge", "--no-ff", "--quiet", "--message", message, rev)
return err
}
internal/git/identity.go
+10
View File
@@ -0,0 +1,10 @@
package git
func IdentityEnv(name, email string) []string {
return []string{
"GIT_AUTHOR_NAME=" + name,
"GIT_AUTHOR_EMAIL=" + email,
"GIT_COMMITTER_NAME=" + name,
"GIT_COMMITTER_EMAIL=" + email,
}
}
internal/git/rename.go
+1 -1
View File
@@ -136,7 +136,7 @@ func RewriteNotes(repo string, rewrite func(string) string) error {
return err
}
name, email, _ := strings.Cut(who, "\n")
env := []string{"GIT_AUTHOR_NAME=" + name, "GIT_AUTHOR_EMAIL=" + email, "GIT_COMMITTER_NAME=" + name, "GIT_COMMITTER_EMAIL=" + email}
env := IdentityEnv(name, email)
commit, err := runEnv(repo, env, "commit-tree", "-p", parent, "-m", "Rewrite byre ids in notes", tree)
if err != nil {
return err