// Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. package vcs import ( "bufio" "bytes" "errors" "fmt" "net/mail" "os" "os/exec" "regexp" "sort" "strings" "time" "github.com/google/syzkaller/pkg/debugtracer" "github.com/google/syzkaller/pkg/hash" "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/osutil" ) type gitRepo struct { *Git } func newGitRepo(dir string, ignoreCC map[string]bool, opts []RepoOpt) *gitRepo { git := &gitRepo{ Git: &Git{ Dir: dir, Sandbox: true, Env: filterEnv(), ignoreCC: ignoreCC, }, } for _, opt := range opts { switch opt { case OptPrecious: git.precious = true case OptDontSandbox: git.Sandbox = false } } return git } func filterEnv() []string { // We have to filter various git environment variables - if // these variables are set (e.g. if a test is being run as // part of a rebase) we're going to be acting on some other // repository (e.g the syzkaller tree itself) rather than the // intended repo. env := os.Environ() for i := 0; i < len(env); i++ { if strings.HasPrefix(env[i], "GIT_DIR") || strings.HasPrefix(env[i], "GIT_WORK_TREE") || strings.HasPrefix(env[i], "GIT_INDEX_FILE") || strings.HasPrefix(env[i], "GIT_OBJECT_DIRECTORY") { env = append(env[:i], env[i+1:]...) i-- } } return env } func (git *gitRepo) Poll(repo, branch string) (*Commit, error) { git.Reset() origin, err := git.Run("remote", "get-url", "origin") if err != nil || strings.TrimSpace(string(origin)) != repo { // The repo is here, but it has wrong origin (e.g. repo in config has changed), re-clone. if err := git.clone(repo, branch); err != nil { return nil, err } } // Use origin/branch for the case the branch was force-pushed, // in such case branch is not the same is origin/branch and we will // stuck with the local version forever (git checkout won't fail). if _, err := git.Run("checkout", "origin/"+branch); err != nil { // No such branch (e.g. branch in config has changed), re-clone. if err := git.clone(repo, branch); err != nil { return nil, err } } if output, err := git.Run("fetch", "--force"); err != nil { if git.isNetworkError(output) { // The clone operation will fail as well, so no sense to re-clone. return nil, err } if err := git.clone(repo, branch); err != nil { return nil, err } } if _, err := git.Run("checkout", "origin/"+branch); err != nil { return nil, err } if _, err := git.Run("submodule", "update", "--init"); err != nil { return nil, err } return git.Commit(HEAD) } func (git *gitRepo) isNetworkError(output []byte) bool { // The list is not exhaustive and is meant to be extended over time. return bytes.Contains(output, []byte("fatal: read error: Connection reset by peer")) } func (git *gitRepo) CheckoutBranch(repo, branch string) (*Commit, error) { if err := git.repair(); err != nil { return nil, err } repoHash := hash.String([]byte(repo)) // Because the HEAD is detached, submodules assumes "origin" to be the default // remote when initializing. // This sets "origin" to be the current remote. // Ignore errors as we can double add or remove the same remote and that will fail. git.Run("remote", "rm", "origin") git.Run("remote", "add", "origin", repo) git.Run("remote", "add", repoHash, repo) _, err := git.Run("fetch", "--force", repoHash, branch) if err != nil { return nil, err } if _, err := git.Run("checkout", "FETCH_HEAD", "--force"); err != nil { return nil, err } if _, err := git.Run("submodule", "update", "--init"); err != nil { return nil, err } // If the branch checkout had to be "forced" the directory may // contain remaining untracked files. // Clean again to ensure the new branch is in a clean state. if err := git.repair(); err != nil { return nil, err } return git.Commit(HEAD) } func (git *gitRepo) CheckoutCommit(repo, commit string) (*Commit, error) { if err := git.repair(); err != nil { return nil, err } if err := git.fetchRemote(repo, commit); err != nil { return nil, err } return git.SwitchCommit(commit) } func (git *gitRepo) fetchRemote(repo, commit string) error { repoHash := hash.String([]byte(repo)) // Ignore error as we can double add the same remote and that will fail. git.Run("remote", "add", repoHash, repo) fetchArgs := []string{"fetch", "--force", "--tags", repoHash} if commit != "" && gitFullHashRe.MatchString(commit) { // This trick only works with full commit hashes. fetchArgs = append(fetchArgs, commit) } _, err := git.Run(fetchArgs...) if err != nil { var verbose *osutil.VerboseError if errors.As(err, &verbose) && bytes.Contains(verbose.Output, []byte("error: cannot lock ref")) { // It can happen that the fetched repo has tags names that conflict // with the ones already present in the repository. // Try to fetch more, but this time prune tags, it should help. // The --prune-tags option will remove all tags that are not present // in this remote repo, so don't do it always. Only when necessary. _, err = git.Run("fetch", "--force", "--tags", "--prune", "--prune-tags", repoHash) } } return err } func (git *gitRepo) SwitchCommit(commit string) (*Commit, error) { if !git.precious { git.Run("reset", "--hard") git.Run("clean", "-fdx") } if _, err := git.Run("checkout", commit); err != nil { return nil, err } if _, err := git.Run("submodule", "update", "--init"); err != nil { return nil, err } return git.Commit(HEAD) } func (git *gitRepo) clone(repo, branch string) error { if git.precious { return fmt.Errorf("won't reinit precious repo") } if err := git.initRepo(nil); err != nil { return err } if _, err := git.Run("remote", "add", "origin", repo); err != nil { return err } if _, err := git.Run("fetch", "origin", branch); err != nil { return err } return nil } func (git *gitRepo) repair() error { if err := git.Reset(); err != nil { return git.initRepo(err) } return nil } func (git *gitRepo) initRepo(reason error) error { if reason != nil { log.Logf(1, "git: initializing repo at %v: %v", git.Dir, reason) } if err := os.RemoveAll(git.Dir); err != nil { return fmt.Errorf("failed to remove repo dir: %w", err) } if err := osutil.MkdirAll(git.Dir); err != nil { return fmt.Errorf("failed to create repo dir: %w", err) } if git.Sandbox { if err := osutil.SandboxChown(git.Dir); err != nil { return err } } if _, err := git.Run("init"); err != nil { return err } return nil } func (git *gitRepo) Contains(commit string) (bool, error) { return git.containedIn(HEAD, commit) } const gitDateFormat = "Mon Jan 2 15:04:05 2006 -0700" func gitParseCommit(output, user, domain []byte, ignoreCC map[string]bool) (*Commit, error) { lines := bytes.Split(output, []byte{'\n'}) if len(lines) < 8 || len(lines[0]) != 40 { return nil, fmt.Errorf("unexpected git log output: %q", output) } date, err := time.Parse(gitDateFormat, string(lines[4])) if err != nil { return nil, fmt.Errorf("failed to parse date in git log output: %w\n%q", err, output) } commitDate, err := time.Parse(gitDateFormat, string(lines[6])) if err != nil { return nil, fmt.Errorf("failed to parse date in git log output: %w\n%q", err, output) } recipients := make(map[string]bool) recipients[strings.ToLower(string(lines[2]))] = true var tags []string // Use summary line + all description lines. for _, line := range append([][]byte{lines[1]}, lines[7:]...) { if user != nil { userPos := bytes.Index(line, user) if userPos != -1 { domainPos := bytes.Index(line[userPos+len(user)+1:], domain) if domainPos != -1 { startPos := userPos + len(user) endPos := userPos + len(user) + domainPos + 1 tag := string(line[startPos:endPos]) present := false for _, tag1 := range tags { if tag1 == tag { present = true break } } if !present { tags = append(tags, tag) } } } } for _, re := range ccRes { matches := re.FindSubmatchIndex(line) if matches == nil { continue } addr, err := mail.ParseAddress(string(line[matches[2]:matches[3]])) if err != nil { break } email := strings.ToLower(addr.Address) if ignoreCC[email] { continue } recipients[email] = true break } } sortedRecipients := make(Recipients, 0, len(recipients)) for addr := range recipients { sortedRecipients = append(sortedRecipients, RecipientInfo{mail.Address{Address: addr}, To}) } sort.Sort(sortedRecipients) parents := strings.Split(string(lines[5]), " ") com := &Commit{ Hash: string(lines[0]), Title: string(lines[1]), Author: string(lines[2]), AuthorName: string(lines[3]), Parents: parents, Recipients: sortedRecipients, Tags: tags, Date: date, CommitDate: commitDate, } return com, nil } func (git *gitRepo) GetCommitByTitle(title string) (*Commit, error) { commits, _, err := git.GetCommitsByTitles([]string{title}) if err != nil || len(commits) == 0 { return nil, err } return commits[0], nil } const ( fetchCommitsMaxAgeInYears = 5 ) func (git *gitRepo) GetCommitsByTitles(titles []string) ([]*Commit, []string, error) { var greps []string m := make(map[string]string) for _, title := range titles { canonical := CanonicalizeCommit(title) greps = append(greps, canonical) m[canonical] = title } since := time.Now().Add(-time.Hour * 24 * 365 * fetchCommitsMaxAgeInYears).Format("01-02-2006") commits, err := git.fetchCommits(since, HEAD, "", "", greps, true) if err != nil { return nil, nil, err } var results []*Commit for _, com := range commits { canonical := CanonicalizeCommit(com.Title) if orig := m[canonical]; orig != "" { delete(m, canonical) results = append(results, com) com.Title = orig } } var missing []string for _, orig := range m { missing = append(missing, orig) } return results, missing, nil } func (git *gitRepo) LatestCommits(afterCommit string, afterDate time.Time) ([]CommitShort, error) { args := []string{"log", "--pretty=format:%h:%cd"} if !afterDate.IsZero() { args = append(args, "--since", afterDate.Format(time.RFC3339)) } if afterCommit != "" { args = append(args, afterCommit+"..") } output, err := git.Run(args...) if err != nil { return nil, err } if len(output) == 0 { return nil, nil } var ret []CommitShort for _, line := range strings.Split(string(output), "\n") { hash, date, _ := strings.Cut(line, ":") commitDate, err := time.Parse(gitDateFormat, date) if err != nil { return nil, fmt.Errorf("failed to parse date in %q: %w", line, err) } ret = append(ret, CommitShort{Hash: hash, CommitDate: commitDate}) } return ret, nil } func (git *gitRepo) ExtractFixTagsFromCommits(baseCommit, email string) ([]*Commit, error) { user, domain, err := splitEmail(email) if err != nil { return nil, fmt.Errorf("failed to parse email %q: %w", email, err) } grep := user + "+.*" + domain since := time.Now().Add(-time.Hour * 24 * 365 * fetchCommitsMaxAgeInYears).Format("01-02-2006") return git.fetchCommits(since, baseCommit, user, domain, []string{grep}, false) } func splitEmail(email string) (user, domain string, err error) { addr, err := mail.ParseAddress(email) if err != nil { return "", "", err } at := strings.IndexByte(addr.Address, '@') if at == -1 { return "", "", fmt.Errorf("no @ in email address") } user = addr.Address[:at] domain = addr.Address[at:] if plus := strings.IndexByte(user, '+'); plus != -1 { user = user[:plus] } return } func (git *gitRepo) Bisect(bad, good string, dt debugtracer.DebugTracer, pred func() (BisectResult, error)) ([]*Commit, error) { git.Reset() firstBad, err := git.Commit(bad) if err != nil { return nil, err } output, err := git.Run("bisect", "start", bad, good) if err != nil { return nil, err } defer git.Reset() dt.Log("# git bisect start %v %v\n%s", bad, good, output) current, err := git.Commit(HEAD) if err != nil { return nil, err } var bisectTerms = [...]string{ BisectBad: "bad", BisectGood: "good", BisectSkip: "skip", } for { res, err := pred() // Linux EnvForCommit may cherry-pick some fixes, reset these before the next step. git.Run("reset", "--hard") if err != nil { return nil, err } if res == BisectBad { firstBad = current } output, err = git.Run("bisect", bisectTerms[res]) dt.Log("# git bisect %v %v\n%s", bisectTerms[res], current.Hash, output) if err != nil { if bytes.Contains(output, []byte("There are only 'skip'ped commits left to test")) { return git.bisectInconclusive(output) } return nil, err } next, err := git.Commit(HEAD) if err != nil { return nil, err } if current.Hash == next.Hash { return []*Commit{firstBad}, nil } current = next } } var gitFullHashRe = regexp.MustCompile("[a-f0-9]{40}") func (git *gitRepo) bisectInconclusive(output []byte) ([]*Commit, error) { // For inconclusive bisection git prints the following message: // // There are only 'skip'ped commits left to test. // The first bad commit could be any of: // 1f43f400a2cbb02f3d34de8fe30075c070254816 // 4d96e13ee9cd1f7f801e8c7f4b12f09d1da4a5d8 // 5cd856a5ef9aa189df757c322be34ad735a5b17f // We cannot bisect more! // // For conclusive bisection: // // 7c3850adbcccc2c6c9e7ab23a7dcbc4926ee5b96 is the first bad commit var commits []*Commit for _, hash := range gitFullHashRe.FindAll(output, -1) { com, err := git.Commit(string(hash)) if err != nil { return nil, err } commits = append(commits, com) } return commits, nil } func (git *gitRepo) ReleaseTag(commit string) (string, error) { tags, err := git.previousReleaseTags(commit, true, true, true) if err != nil { return "", err } if len(tags) == 0 { return "", fmt.Errorf("no release tags found for commit %v", commit) } return tags[0], nil } func (git *gitRepo) previousReleaseTags(commit string, self, onlyTop, includeRC bool) ([]string, error) { var tags []string if self { output, err := git.Run("tag", "--list", "--points-at", commit, "--merged", commit, "v*.*") if err != nil { return nil, err } tags = gitParseReleaseTags(output, includeRC) if onlyTop && len(tags) != 0 { return tags, nil } } output, err := git.Run("tag", "--no-contains", commit, "--merged", commit, "v*.*") if err != nil { return nil, err } tags1 := gitParseReleaseTags(output, includeRC) tags = append(tags, tags1...) if len(tags) == 0 { return nil, fmt.Errorf("no release tags found for commit %v", commit) } return tags, nil } func (git *gitRepo) IsRelease(commit string) (bool, error) { tags1, err := git.previousReleaseTags(commit, true, false, false) if err != nil { return false, err } tags2, err := git.previousReleaseTags(commit, false, false, false) if err != nil { return false, err } return len(tags1) != len(tags2), nil } func (git *gitRepo) Object(name, commit string) ([]byte, error) { return git.Run("show", fmt.Sprintf("%s:%s", commit, name)) } func (git *gitRepo) MergeBases(firstCommit, secondCommit string) ([]*Commit, error) { output, err := git.Run("merge-base", firstCommit, secondCommit) if err != nil { return nil, err } ret := []*Commit{} for _, hash := range strings.Fields(string(output)) { commit, err := git.Commit(hash) if err != nil { return nil, err } ret = append(ret, commit) } return ret, nil } // CommitExists relies on 'git cat-file -e'. // If object exists its exit status is 0. // If object doesn't exist its exit status is 1 (not documented). // Otherwise, the exit status is 128 (not documented). func (git *gitRepo) CommitExists(commit string) (bool, error) { _, err := git.Run("cat-file", "-e", commit) var vErr *osutil.VerboseError if errors.As(err, &vErr) && vErr.ExitCode == 1 { return false, nil } if err != nil { return false, err } return true, nil } func (git *gitRepo) PushCommit(repo, commit string) error { tagName := "tag-" + commit // assign tag to guarantee remote persistence git.Run("tag", tagName) // ignore errors on re-tagging if _, err := git.Run("push", repo, "tag", tagName); err != nil { return fmt.Errorf("git push %s tag %s: %w", repo, tagName, err) } return nil } var ( fileNameRe = regexp.MustCompile(`^diff.* b\/([^\s]+)$`) indexRe = regexp.MustCompile(`^index (\w+)\.\.(?:\w+)(?:\s\d+)?$`) ) type ModifiedFile struct { Name string LeftHash string } // ParseGitDiff extracts the files modified in the git patch. func ParseGitDiff(patch []byte) []ModifiedFile { var ret []ModifiedFile scanner := bufio.NewScanner(bytes.NewReader(patch)) for scanner.Scan() { line := scanner.Text() indexMatch := indexRe.FindStringSubmatch(line) if indexMatch != nil && len(ret) > 0 { ret[len(ret)-1].LeftHash = indexMatch[1] } else { fileNameMatch := fileNameRe.FindStringSubmatch(line) if fileNameMatch != nil { ret = append(ret, ModifiedFile{Name: fileNameMatch[1]}) } } } return ret } type Git struct { Dir string Sandbox bool Env []string precious bool ignoreCC map[string]bool } func (git Git) Run(args ...string) ([]byte, error) { cmd, err := git.command(args...) if err != nil { return nil, err } return osutil.Run(3*time.Hour, cmd) } func (git Git) command(args ...string) (*exec.Cmd, error) { cmd := osutil.Command("git", args...) cmd.Dir = git.Dir cmd.Env = git.Env if git.Sandbox { if err := osutil.Sandbox(cmd, true, false); err != nil { return nil, err } } return cmd, nil } // Apply invokes git apply for a series of git patches. // It is different from Patch() in that it normally handles raw patch emails. func (git Git) Apply(patch []byte) error { cmd, err := git.command("apply", "-") if err != nil { return err } stdin, err := cmd.StdinPipe() if err != nil { return err } go func() { stdin.Write(patch) stdin.Close() }() _, err = osutil.Run(3*time.Hour, cmd) return err } // Reset resets the git repo to a known clean state. func (git Git) Reset() error { if git.precious { return nil } git.Run("reset", "--hard", "--recurse-submodules") git.Run("clean", "-xfdf") git.Run("submodule", "foreach", "--recursive", "git", "clean", "-xfdf") git.Run("bisect", "reset") _, err := git.Run("reset", "--hard", "--recurse-submodules") return err } // Commit extracts the information about the particular git commit. func (git Git) Commit(hash string) (*Commit, error) { const patchSeparator = "---===syzkaller-patch-separator===---" output, err := git.Run("log", "--format=%H%n%s%n%ae%n%an%n%ad%n%P%n%cd%n%b"+patchSeparator, "-n", "1", "-p", "-U0", hash) if err != nil { return nil, err } pos := bytes.Index(output, []byte(patchSeparator)) if pos == -1 { return nil, fmt.Errorf("git log output does not contain patch separator") } commit, err := gitParseCommit(output[:pos], nil, nil, git.ignoreCC) if err != nil { return nil, err } commit.Patch = output[pos+len(patchSeparator):] for len(commit.Patch) != 0 && commit.Patch[0] == '\n' { commit.Patch = commit.Patch[1:] } return commit, nil } func (git Git) fetchCommits(since, base, user, domain string, greps []string, fixedStrings bool) ([]*Commit, error) { const commitSeparator = "---===syzkaller-commit-separator===---" args := []string{"log", "--since", since, "--format=%H%n%s%n%ae%n%an%n%ad%n%P%n%cd%n%b%n" + commitSeparator} if fixedStrings { args = append(args, "--fixed-strings") } for _, grep := range greps { args = append(args, "--grep", grep) } args = append(args, base) cmd := exec.Command("git", args...) cmd.Dir = git.Dir cmd.Env = filterEnv() if git.Sandbox { if err := osutil.Sandbox(cmd, true, false); err != nil { return nil, err } } stdout, err := cmd.StdoutPipe() if err != nil { return nil, err } if err := cmd.Start(); err != nil { return nil, err } defer cmd.Wait() defer cmd.Process.Kill() var ( s = bufio.NewScanner(stdout) buf = new(bytes.Buffer) separator = []byte(commitSeparator) commits []*Commit userBytes []byte domainBytes []byte ) if user != "" { userBytes = []byte(user + "+") domainBytes = []byte(domain) } for s.Scan() { ln := s.Bytes() if !bytes.Equal(ln, separator) { buf.Write(ln) buf.WriteByte('\n') continue } com, err := gitParseCommit(buf.Bytes(), userBytes, domainBytes, git.ignoreCC) if err != nil { return nil, err } if user == "" || len(com.Tags) != 0 { commits = append(commits, com) } buf.Reset() } return commits, s.Err() } type BaseCommit struct { *Commit Branches []string } // BaseForDiff returns a list of commits that could have been the base commit // for the specified git patch. // The returned list is minimized to only contain the commits that are represented in different // subsets of branches. func (git Git) BaseForDiff(diff []byte, tracer debugtracer.DebugTracer) ([]*BaseCommit, error) { // We can't just query git log with --find-object=HASH because that will only return // the revisions where the hashed content was introduced or removed, while what we actually // want is the latest revision(s) where the content modified in the diff is still in place. // So we build a set of potential commits of interest: // 1) Tips of the branches. // 2) Parents of the commit that in any way mention the modified blob hashes. // Then these commits are verified. args := []string{ "log", "--all", "--no-renames", // Note that we cannot accelerate it by specifying "--since" "-n", "100", `--format=%H:%P`, } var fileNames []string nameToHash := map[string]string{} for _, file := range ParseGitDiff(diff) { if strings.Trim(file.LeftHash, "0") == "" { // Newly created file are not of any help here. continue } if ok, err := git.verifyHash(file.LeftHash); err != nil { return nil, fmt.Errorf("hash verification failed: %w", err) } else if !ok { // The object is not known in this repository. // Ignore it, or otherwise the command will fail. continue } if _, ok := nameToHash[file.Name]; !ok { // If the diff is actually a concatenation of several diffs, we only // want to remember the first left side hash for each file. fileNames = append(fileNames, file.Name) nameToHash[file.Name] = file.LeftHash } args = append(args, "--find-object="+file.LeftHash) } tracer.Log("extracted %d left blob hashes", len(nameToHash)) output, err := git.Run(args...) if err != nil { return nil, err } commitBranches := map[string]map[string]struct{}{} record := func(commit string, branch string) { if commitBranches[commit] == nil { commitBranches[commit] = map[string]struct{}{} } commitBranches[commit][branch] = struct{}{} } s := bufio.NewScanner(bytes.NewReader(output)) for s.Scan() { // TODO: we can further reduce the search space by adding "--raw" to args // and only considering the commits that introduce the blobs from the diff. commit, parents, _ := strings.Cut(s.Text(), ":") // Focus on the first parent. candidate, _, _ := strings.Cut(parents, " ") if candidate == "" { // For the first commit, there's no parent. candidate = commit } // Only focus on branches that are still alive. const cutOffDays = 60 list, err := git.branchesThatContain(candidate, time.Now().Add(-time.Hour*24*cutOffDays)) if err != nil { return nil, fmt.Errorf("failed to query branches: %w", err) } for _, info := range list { record(candidate, info.Branch) record(info.Commit, info.Branch) } } var ret []*BaseCommit for commit, branches := range commitBranches { tracer.Log("considering %q [%q]", commit, branches) fileHashes, err := git.fileHashes(commit, fileNames) if err != nil { return nil, fmt.Errorf("failed to extract hashes for %s: %w", commit, err) } var noMatch []string for _, name := range fileNames { if !strings.HasPrefix(fileHashes[name], nameToHash[name]) { noMatch = append(noMatch, name) } } if len(noMatch) != 0 { tracer.Log("hashes don't match for %q", noMatch) continue } var branchList []string for branch := range branches { branchList = append(branchList, branch) } sort.Strings(branchList) info, err := git.Commit(commit) if err != nil { return nil, fmt.Errorf("failed to extract commit info: %w", err) } tracer.Log("hashes match, commit date is %v, branches %v", info.CommitDate, branchList) ret = append(ret, &BaseCommit{Commit: info, Branches: branchList}) } return git.minimizeBaseCommits(ret) } func (git Git) minimizeBaseCommits(list []*BaseCommit) ([]*BaseCommit, error) { // We want to preserve commits that are present in different subsets of branches. // Then, we want to sort them topologically and break ties by date. lastCommit := map[string]*BaseCommit{} for _, item := range list { key := strings.Join(item.Branches, ":") prev, ok := lastCommit[key] if !ok { lastCommit[key] = item continue } isNewer, err := git.containedIn(item.Hash, prev.Hash) if err != nil { return nil, fmt.Errorf("topological sort step failed: %w", err) } if isNewer { lastCommit[key] = item } } var filtered []*BaseCommit for _, item := range lastCommit { filtered = append(filtered, item) } sort.Slice(filtered, func(i, j int) bool { return filtered[i].CommitDate.After(filtered[j].CommitDate) }) return filtered, nil } // fileHashes returns the blob SHA hashes for a particular list of files on a particular commit. func (git Git) fileHashes(commit string, files []string) (map[string]string, error) { output, err := git.Run(append([]string{"ls-tree", commit}, files...)...) if err != nil { return nil, err } ret := map[string]string{} s := bufio.NewScanner(bytes.NewReader(output)) for s.Scan() { line := s.Text() fields := strings.Fields(line) if len(fields) != 4 { return nil, fmt.Errorf("invalid output: %q", line) } ret[fields[3]] = fields[2] } return ret, nil } type branchCommit struct { Branch string Commit string } func (git Git) branchesThatContain(commit string, since time.Time) ([]branchCommit, error) { output, err := git.Run( "branch", "-a", "--contains", commit, `--format=%(committerdate);%(objectname);%(refname:short)`, ) if err != nil { return nil, err } var ret []branchCommit s := bufio.NewScanner(bytes.NewReader(output)) for s.Scan() { dateString, branchInfo, _ := strings.Cut(s.Text(), ";") commit, branch, _ := strings.Cut(branchInfo, ";") date, err := time.Parse(gitDateFormat, dateString) if err != nil { return nil, fmt.Errorf("failed to parse git date: %w\n%q", err, dateString) } if date.Before(since) { continue } ret = append(ret, branchCommit{Branch: branch, Commit: commit}) } return ret, nil } func (git Git) verifyHash(hash string) (bool, error) { _, err := git.Run("rev-parse", "--quiet", "--verify", hash) if err != nil { var verboseErr *osutil.VerboseError if errors.As(err, &verboseErr) && verboseErr.ExitCode == 1 { return false, nil } return false, err } return true, nil } func (git Git) containedIn(parent, commit string) (bool, error) { _, err := git.Run("merge-base", "--is-ancestor", commit, parent) return err == nil, nil } func (git Git) Diff(commitA, commitB string) ([]byte, error) { return git.Run("diff", commitA+".."+commitB) }