Skip to content

Commit 94aa110

Browse files
authored
Fix rare crash in interactive rebase (merge command without comment) (#4872)
This fixes a crash in an interactive rebase when there's a merge command in the rebase-todo file that doesn't have a comment. I don't know under what circumstances this can happen; git itself doesn't produce these, but it is theoretically possible for the user to do this manually by doing `git rebase --edit-todo`, or third-party tools could do it too. We had one user report a crash because of this, so it seems worth fixing it. Closes #4858.
2 parents 2bf2c38 + ffccfd6 commit 94aa110

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/sirupsen/logrus v1.9.3
3333
github.com/spf13/afero v1.9.5
3434
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
35-
github.com/stefanhaller/git-todo-parser v0.0.7-0.20250429125209-dcf39e4641f5
35+
github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304
3636
github.com/stretchr/testify v1.10.0
3737
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
3838
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
284284
github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
285285
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc=
286286
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
287-
github.com/stefanhaller/git-todo-parser v0.0.7-0.20250429125209-dcf39e4641f5 h1:ZCI0NPs0xXd00Ej9lX+wwbHjQDkstJa3kUbX7WCOF8I=
288-
github.com/stefanhaller/git-todo-parser v0.0.7-0.20250429125209-dcf39e4641f5/go.mod h1:HFt9hGqMzgQ+gVxMKcvTvGaFz4Y0yYycqqAp2V3wcJY=
287+
github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304 h1:bg+K3E0GYuqwTGaEfNrsZ0rH0Bw4p3EmPjk9Zjnua+w=
288+
github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304/go.mod h1:HFt9hGqMzgQ+gVxMKcvTvGaFz4Y0yYycqqAp2V3wcJY=
289289
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
290290
github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
291291
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

vendor/github.com/stefanhaller/git-todo-parser/todo/parse.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ github.com/spf13/afero/mem
321321
# github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
322322
## explicit
323323
github.com/spkg/bom
324-
# github.com/stefanhaller/git-todo-parser v0.0.7-0.20250429125209-dcf39e4641f5
324+
# github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304
325325
## explicit; go 1.13
326326
github.com/stefanhaller/git-todo-parser/todo
327327
# github.com/stretchr/testify v1.10.0

0 commit comments

Comments
 (0)