Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
git-cola always leaves an extra commit while interactively rebasing #721
The best way to test this is to run the
Create a file called
Then run the
When I do this I'm able to change the "second commit to squash" to "squash" and then hit "Ctrl+Enter" (or click the "Rebase" button) to save the file. After saving it looks like this:
I will note that you cannot make the very first item "squash". That's a property of how
Let me know if this test process is a good way to exhibit the behavior you're seeing, and whether you're seeing a difference in behavior.
This works as expected, I get:
just what I'd do in git.
Maybe the problem is committing? After editing in
It looks like it's a problem with the counter-intuitive UI behavior (and the fact that gvim was not installed on my system, so the editor was not spawned). I expected I should've edited the commit message in
Btw. git-cola should check if gvim exists and abort the rebase then.
Right, a missing editor can do that. We require that the configured editor blocks when called, so that
There should have been error output in the
I'll see if there's a reliable exit code we can check, or if not, maybe check for the editor ourselves (rather than relying on
Checking all the time means doing a