On Mon Jul 27/2009 @ 3:07:P -0400 asdasd, Joshua Roys wrote: > Hello all, > > I believe this is caused by your pre-receive hook: > https://fedorahosted.org/fedora-infrastructure/attachment/ticket/1342/pre-receive > https://fedorahosted.org/fedora-infrastructure/ticket/1342 > > I just set up a test repo with that hook and pushed a few tags and it > gave the same error: > > [jro...@sis-jrr foo]$ git push --tags > Counting objects: 1, done. > Writing objects: 100% (1/1), 174 bytes, done. > Total 1 (delta 0), reused 0 (delta 0) > + read old_sha1 new_sha1 refname > + git rev-list --parents > 0000000000000000000000000000000000000000..35f792639eb4ddcef04ba65f940fca8d3086921b > + read sha1 parents > fatal: Invalid revision range > 0000000000000000000000000000000000000000..35f792639eb4ddcef04ba65f940fca8d3086921b > + '[' 0 -ne 0 ']' > + : > + read old_sha1 new_sha1 refname > + exit 0 > refs/tags/project-0.0.3: 0000000000000000000000000000000000000000 -> > 35f792639eb4ddcef04ba65f940fca8d3086921b > To ssh://production-ps/~/foo.git > * [new tag] project-0.0.3 -> project-0.0.3 > > > Maybe add something like... > while read old_sha1 new_sha1 refname ; do > + if expr "$old_sha1" : '0*$' > /dev/null ; then > + continue > + fi > > Joshua Roys > > _______________________________________________ > Spacewalk-devel mailing list > Spacewalk-devel@redhat.com > https://www.redhat.com/mailman/listinfo/spacewalk-devel
Aha, so we were on the wrong track to begin with. Thanks for this info Joshua. Jan, I had to go to infra team again yesterday for a separate incident to get this merge blocking hook disabled. It still blocks legit merges even after you ammend the message on the top most commit as merge commits within that merge still get blocked. (i.e. we have several merges from master into pgsql branch which the hook does not catch, when we merge back it then blocks it) Not positive but this is what I think is going on. I'm going to have infra team keep it disabled, I think the only time it does anything for us is when someone needs to do a legit merge. I'm getting no complaints about commits being blocked which I expect I would, so I suspect the team is doing well with remembering --rebase. If we start seeing a problem with unecessary merge commits then we should address the scripts problems and re-enable. Cheers, Devan
pgpNxfCaKoqP6.pgp
Description: PGP signature
_______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
