From cc13ae252a819ae4e36a28c12929bafd43b8ef18 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Apr 2020 11:21:20 +1000 Subject: totally screwed up the last commit --- pkg/commands/commit_list_builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg') diff --git a/pkg/commands/commit_list_builder.go b/pkg/commands/commit_list_builder.go index 0038d169b..6506d3f26 100644 --- a/pkg/commands/commit_list_builder.go +++ b/pkg/commands/commit_list_builder.go @@ -215,7 +215,7 @@ func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*Commit, error) { if line == "" || line == "noop" { return commits, nil } - if strings.HasPrefix("#", line) { + if strings.HasPrefix(line, "#") { continue } splitLine := strings.Split(line, " ") @@ -227,7 +227,7 @@ func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*Commit, error) { }}, commits...) } - return nil, nil + return commits, nil } // assuming the file starts like this: -- cgit v1.2.3