* Gary V. Vaughan wrote on Sun, Sep 07, 2008 at 09:15:10AM CEST: > On 7 Sep 2008, at 06:34, Ralf Wildenhues wrote: >> >> a couple of nits. Note that I currently don't feel the need for >> a commit script, as we have commit messages enabled through git >> anyway. But if it suits you... > > Peter asked for it to be fixed, since it grabs the commit message from > the ChangeLog automatically.
Sure. > I have a wrapper script that I currently use for automatically sending > the 'FYI' or 'Okay to commit?' messages with the patch in question > pasted into the body which I'd like to push too. Cool. >>> + # HELP?!? How to check for git push conflicts? >> >> Not sure why needed. git push will not, unless you force it, push >> something that is not a fast-forward of the remote tree. > > The original cvs commit script used to "cvs -nq update | grep '^C'" > and diagnose an impending conflict and bail out before doing anything > else. I don't know if there is some way to dry-run the push and see > whether it is doomed before actually trying it too, or even whether > that makes sense for git? Doesn't `git push --dry-run' provide this information (untested)? Cheers, Ralf
