Re: [SCM] GNU Libtool branch, master, updated. v2.2.4-43-gcbe0c8e

[Gary V. Vaughan]

On 7 Sep 2008, at 06:34, Ralf Wildenhues wrote:
> [ moving from libtool-commit ]
>
> Hi Gary,
>
> 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.

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.

> > @@ -303,27 +289,9 @@ set -e
> > # func_check_conflicts
> > func_check_conflicts ()
> > {
>
> > +    # 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?

Cheers,
        Gary
--
Email me:          address@hidden                          ._(()
Read my blog:      http://blog.azazil.net                 \' )
And my other blog: http://www.machaxor.net                =( \
...and my book:    http://sources.redhat.com/autobook     _(~_)'