diff options
author | Ryooooooga <eial5q265e5@gmail.com> | 2022-05-06 23:04:58 +0900 |
---|---|---|
committer | Ryooooooga <eial5q265e5@gmail.com> | 2022-05-10 19:47:10 +0900 |
commit | 490a964432542536fdebc1d8e88d4d37df35d368 (patch) | |
tree | d12b76ad8909ceda66aee46d73632c9b5b76119e /pkg/commands/loaders/commits.go | |
parent | f789e213770880e30a9d3f891c034d75b718e1ce (diff) |
chore(loaders): add `-c log.showSignature=false` flag to the rebasing commit loader
Diffstat (limited to 'pkg/commands/loaders/commits.go')
-rw-r--r-- | pkg/commands/loaders/commits.go | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/pkg/commands/loaders/commits.go b/pkg/commands/loaders/commits.go index c21b622d8..e38fbe21d 100644 --- a/pkg/commands/loaders/commits.go +++ b/pkg/commands/loaders/commits.go @@ -212,7 +212,7 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode // I suspect that will cause some damage cmdObj := self.cmd.New( fmt.Sprintf( - "git show %s --no-patch --oneline %s --abbrev=%d", + "git -c log.showSignature=false show %s --no-patch --oneline %s --abbrev=%d", strings.Join(commitShas, " "), prettyFormat, 20, @@ -222,14 +222,12 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode hydratedCommits := make([]*models.Commit, 0, len(commits)) i := 0 err = cmdObj.RunAndProcessLines(func(line string) (bool, error) { - if canExtractCommit(line) { - commit := self.extractCommitFromLine(line) - matchingCommit := commits[i] - commit.Action = matchingCommit.Action - commit.Status = matchingCommit.Status - hydratedCommits = append(hydratedCommits, commit) - i++ - } + commit := self.extractCommitFromLine(line) + matchingCommit := commits[i] + commit.Action = matchingCommit.Action + commit.Status = matchingCommit.Status + hydratedCommits = append(hydratedCommits, commit) + i++ return false, nil }) if err != nil { @@ -456,7 +454,3 @@ var prettyFormat = fmt.Sprintf( ) const NULL_CODE = "%x00" - -func canExtractCommit(line string) bool { - return line != "" && strings.Split(line, " ")[0] != "gpg:" -} |