mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-21 12:16:54 +02:00
fix crash
This commit is contained in:
parent
c47c539e12
commit
5df0fe0765
@ -183,6 +183,10 @@ func (c *CommitListBuilder) getHydratedRebasingCommits(rebaseMode string) ([]*mo
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(commits) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
commitShas := make([]string, len(commits))
|
commitShas := make([]string, len(commits))
|
||||||
for i, commit := range commits {
|
for i, commit := range commits {
|
||||||
commitShas[i] = commit.Sha
|
commitShas[i] = commit.Sha
|
||||||
@ -202,11 +206,11 @@ func (c *CommitListBuilder) getHydratedRebasingCommits(rebaseMode string) ([]*mo
|
|||||||
hydratedCommits := make([]*models.Commit, 0, len(commits))
|
hydratedCommits := make([]*models.Commit, 0, len(commits))
|
||||||
i := 0
|
i := 0
|
||||||
err = oscommands.RunLineOutputCmd(cmd, func(line string) (bool, error) {
|
err = oscommands.RunLineOutputCmd(cmd, func(line string) (bool, error) {
|
||||||
c.Log.Warn(line)
|
|
||||||
if canExtractCommit(line) {
|
if canExtractCommit(line) {
|
||||||
commit := c.extractCommitFromLine(line)
|
commit := c.extractCommitFromLine(line)
|
||||||
commit.Action = commits[i].Action
|
matchingCommit := commits[i]
|
||||||
commit.Status = commits[i].Status
|
commit.Action = matchingCommit.Action
|
||||||
|
commit.Status = matchingCommit.Status
|
||||||
hydratedCommits = append(hydratedCommits, commit)
|
hydratedCommits = append(hydratedCommits, commit)
|
||||||
i++
|
i++
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user