Always prompted to revert buffer when committing

[Mike Crowe]

I've suffered from an annoyance with magit ever since it switched to
using emacsclient to edit commit messages.

I start Emacs24 on Linux once and use it via various tty and X
windows. After a while of using it, each time I wish to commit (or even
amend an existing commit message) I am prompted with:

Revert buffer from file /path/to/.git/COMMIT_EDITMSG? (yes or no)

and must type "yes" to continue.

If I start a new Emacs session and try and reproduce the problem I cannot.

Does anyone have any suggestions as to where I should start looking for a
solution?

Thanks.

Mike.

[Phil Jackson]

Hey, Mike,

Are you mixing the command line (or another Git tool) and Magit to
commit? Are you deciding against a commit and simply switching away from
a the commit buffer?

Cheers,
Phil

[Mike Crowe]

Mike Crowe <m...@mcrowe.com> writes:
> > I've suffered from an annoyance with magit ever since it switched to
> > using emacsclient to edit commit messages.
> >
> > I start Emacs24 on Linux once and use it via various tty and X
> > windows. After a while of using it, each time I wish to commit (or even
> > amend an existing commit message) I am prompted with:
> >
> > Revert buffer from file /path/to/.git/COMMIT_EDITMSG? (yes or no)
> >
> > and must type "yes" to continue.
> >
> > If I start a new Emacs session and try and reproduce the problem I cannot.
> >
> > Does anyone have any suggestions as to where I should start looking for a
> > solution?

On Saturday 05 July 2014 at 01:36:57 +0100, Phil Jackson wrote:
> Are you mixing the command line (or another Git tool) and Magit to
> commit?

Hi Phil,

Yes, occasionally. That may be the cause.

I can now reproduce the problem a single time quite easily. My EDITOR is a
script that runs "emacsclient --tty --new-frame". If I commit from the
command line then I always save the buffer and exit (from that client) so
that Git can continue. The buffer remains open in Emacs and causes the
"revert buffer" query the next time I try and commit from within Emacs or
from the command line.

If I exit the command-line emacsclient With C-c C-c then I don't see the
"revert buffer" query the next time. The COMMIT_EDITMSG buffer is no longer
open.

What I can't find a reliable way to reproduce is the "revert buffer" query
occurring on _every_ subsequent commit from within Magit. I have an Emacs
instance that's been running for a week or so which does this. I can
repeatedly amend the top commit with Magit and I see the "revert buffer"
prompt every time. This is without doing anything from the command line in
between. In this case after I complete the commit with C-c C-c the
COMMIT_EDITMSG buffer remains open. I suspect that if I kill the buffer
then the problem will go away.

I'll see if I can find a good way to reproduce this.

Thanks for your help.

Mike.