-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Description
Describe the bug
When we're filtering commits based on whether they contain a file, we can get conflicts upon trying to remove a file from a given commit via the custom patch builder.
I assume this is because it decides which commits need rebasing based on what's in the commits panel, which causes problems given that they're filtered.
To Reproduce
No time to come up with repro steps atm, but can do later.
Expected behavior
Rebases happen exactly the same as they would if you had not filtered by file.
As a stopgap we could disable the custom patch rebase functionality when in file-filter mode.
Version info:
commit=4ca52373b6c660a93fbe19dc104d1d7a815ea555, build date=2023-04-15T04:36:33Z, build source=unknown, version=4ca52373, os=darwin, arch=amd64, git version=2.33.0