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

Interactive rebase won't halt to let you do the editing #445

Closed
Mailaender opened this Issue May 1, 2015 · 4 comments

Comments

Projects
None yet
2 participants
@Mailaender
Contributor

Mailaender commented May 1, 2015

This seems to be a regression in version 2.1.2

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid May 30, 2015

Member

What's does git config gui.editor print? If the command you have configured doesn't block in the foreground then git will think that it's finished (e.g. when using the "reword" action) and continue on with the rebase, despite the file being unchanged.

I have gvim -o -f set as my gui.editor. Does setting yours to the same work for you?

I tried reproducing it but the git cola rebase origin/master seemed to do the right thing for me. Let me know what you find.

Member

davvid commented May 30, 2015

What's does git config gui.editor print? If the command you have configured doesn't block in the foreground then git will think that it's finished (e.g. when using the "reword" action) and continue on with the rebase, despite the file being unchanged.

I have gvim -o -f set as my gui.editor. Does setting yours to the same work for you?

I tried reproducing it but the git cola rebase origin/master seemed to do the right thing for me. Let me know what you find.

@Mailaender

This comment has been minimized.

Show comment
Hide comment
@Mailaender

Mailaender May 30, 2015

Contributor
git config gui.editor
kwrite
Contributor

Mailaender commented May 30, 2015

git config gui.editor
kwrite

davvid added a commit that referenced this issue May 30, 2015

cmds: move GIT_EDITOR into GitXBaseContext
Set GIT_EDITOR unconditionally so that it's always present.

Related-to: #445
Signed-off-by: David Aguilar <davvid@gmail.com>

@davvid davvid closed this in b9f556c May 30, 2015

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid May 30, 2015

Member

How about git config core.editor? I just fixed a bug where we were not always using gui.editor, specifically in the skip and continue commands, so Git may have fallen back to the non-gui editor.

I installed kwrite and it seems to do the right thing, so I think it was probably the hole I just patched. Let me know if that fixed it for you.

Member

davvid commented May 30, 2015

How about git config core.editor? I just fixed a bug where we were not always using gui.editor, specifically in the skip and continue commands, so Git may have fallen back to the non-gui editor.

I installed kwrite and it seems to do the right thing, so I think it was probably the hole I just patched. Let me know if that fixed it for you.

@Mailaender

This comment has been minimized.

Show comment
Hide comment
@Mailaender

Mailaender May 30, 2015

Contributor

git config core.editor was empty.

Contributor

Mailaender commented May 30, 2015

git config core.editor was empty.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment