-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Thu, 2 Apr 2009 10:54:21 +0200
Jan Pazdziora <jpazdzi...@redhat.com> wrote:
> On Thu, Mar 12, 2009 at 09:33:44AM -0300, Devan Goodwin wrote:
> >
> > Works for me. Yeah I'd be in favor of the commit hook.
>
> My first attempt at the hook which would catch commits that seems to
> be automatic merges done during git pull is in the attachment.
>
I did a merge master to pgsql merge yesterday, I used the default
commit msg at first and this was rejected by your script. I did a git
commit --amend and changed the message to not match the regex:
if ($msg =~ /^Merge branch \S+ of \S+\n*$/s) {
}
But I still get:
$ git push origin pgsql
Counting objects: 204, done.
Compressing objects: 100% (68/68), done.
Writing objects: 100% (74/74), 8.92 KiB, done.
Total 74 (delta 61), reused 0 (delta 0)
Commit [d1c65b572d1b9e1ccd863cce3104a853acc9ad9f] looks like automatic
merge when you did not rebase after pull.
To ssh://dgood...@git.fedorahosted.org/git/spacewalk.git
error: hooks/pre-receive exited with error code 1
! [remote rejected] pgsql -> pgsql (pre-receive hook declined)
error: failed to push some refs to
'ssh://dgood...@git.fedorahosted.org/git/spacewalk.git'
The commit it's complaining about is not my most recent:
$ git show d1c65b572d1b9e1ccd863cce3104a853acc9ad9f
commit d1c65b572d1b9e1ccd863cce3104a853acc9ad9f
Merge: ef29cde... 1e0d837...
Author: Jan Pazdziora <jpazdzi...@redhat.com>
Date: Tue Apr 21 10:39:27 2009 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/spacewalk
Jan, is there something I can do to edit that message and get this push
to work?
Devan
- --
Devan Goodwin <dgood...@redhat.com>
Software Engineer Spacewalk / RHN Satellite
Halifax, Canada 650.567.9039x79267
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (GNU/Linux)
iEYEARECAAYFAkoJbFYACgkQAyHWaPV9my6vuQCg5tqxUh7i5yU1B/HZvSoA63iP
3v8AoOjm7VdubbEbr5RKBEyWNlQnCgJA
=UVe5
-----END PGP SIGNATURE-----
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
