Hey, in the light of this recent change I discovered another problem.
My setup is that I have 'EDITOR' and 'VISUAL' environment variables set to a shell script that invokes emacsclient. Now when I have a rebase in progress and a conflict occurs magit behaves OK: I can stage the items, hit 'R', then 'C'. However, when I hit 'C' git tries to read the commit message by invoking the $EDITOR which is emacsclient. Unfortunately my Emacs is running git synchronously via magit-run-git causing emacsclient to hang. My analysis so far is that magit-rebase-step can simply be changed from 'magit-run-git' to 'magit-run-git-async' in order to fix this problem. However, I haven't used magit's rebase step stuff a lot and am unsure whether or not there are drawbacks with that change. Has anybody else experienced such a problem? If so, what were your solutions (probably running 'git rebase --continue' from the command line)? Regards, Mosu
signature.asc
Description: This is a digitally signed message part.
