summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-04-22 11:21:20 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-04-22 11:21:20 +1000
commitcc13ae252a819ae4e36a28c12929bafd43b8ef18 (patch)
tree9bd88c06099f6c48397f514a89b51d7bad577017
parentb97f844a3e63fd4cb5973aa374e358ce83611b37 (diff)
totally screwed up the last commitv0.20.2
-rw-r--r--pkg/commands/commit_list_builder.go4
1 files changed, 2 insertions, 2 deletions
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: