Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Can't squash commit in interactive rebase editor #1197

Closed
roblourens opened this issue Nov 21, 2020 · 7 comments
Closed

Can't squash commit in interactive rebase editor #1197

roblourens opened this issue Nov 21, 2020 · 7 comments
Assignees
Labels
bug Something isn't working

Comments

@roblourens
Copy link

Nov-21-2020 11-03-05

git log

image

The first commit should have squash as an option in the menu, I can set it using the keyboard but not the dropdown.

v11.0.2

@roblourens roblourens added the potential-bug Seems like something isn't working label Nov 21, 2020
@eamodio
Copy link
Member

eamodio commented Nov 22, 2020

Git rebase doesn't let you squash/fixup the last commit (because you would be then modifying a commit outside of your rebase target). If you want to squash into that last commit you need to rebase to its parent.

Its a bug that it even shows up in the dropdown as an option.

@roblourens
Copy link
Author

Yeah I understand that, I think it should not show up in the last commit's dropdown, and it should show up in the first one, right?

@eamodio eamodio added bug Something isn't working and removed potential-bug Seems like something isn't working labels Nov 22, 2020
@eamodio eamodio self-assigned this Nov 22, 2020
@eamodio eamodio added this to the Soon™ milestone Nov 22, 2020
@eamodio
Copy link
Member

eamodio commented Nov 22, 2020

Yup for some reason those 2 are reversed.

@eamodio
Copy link
Member

eamodio commented Nov 22, 2020

@roblourens I can't seem to reproduce this -- but something else looks wrong in that screenshot. The base commit is missing. Are those the only 2 commits on that branch?

@eamodio
Copy link
Member

eamodio commented Nov 22, 2020

So it looks like it is caused by the missing base commit. But not exactly sure how you are hitting that. Is this a repo I have access to that I can try it?

@roblourens
Copy link
Author

roblourens commented Nov 22, 2020

Sorry, the repo was in /tmp and it's gone now. It was a fairly straightforward setup, but I just tried to set up the same situation, and now it seems to work fine...

image

@eamodio eamodio removed this from the Soon™ milestone Dec 2, 2020
@github-actions
Copy link

github-actions bot commented Jan 2, 2021

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants