PJ Weisberg <[email protected]> writes: > On Friday, February 24, 2012, Miles Bader <[email protected]> wrote: > >> It's not entirely trivial though, right? Unlike commit, for instance, >> merge only _sometimes_ wants a log message, and you can't easily tell >> beforehand when that is... > > It's when HEAD is not an ancestor of the commit being merged. I'm sure > there's a git command that answers that question, though I can't recall it > at the moment.
I've made a test branch for this (https://github.com/magit/magit/pull/381). For now this code as two problem: - I haven't tested it for when the merge failed - I haven't tested it for fast-forward merge. The first feature was trivial to add, but I don't have the time to look at it now (and I won't have it in the next two week), feel free to ignore it and rewrite it all, or add the necessary code for those two case (I believe that the first one is in fact already covered by way of signal, but this should be tested). -- Rémi Vanicat
