Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59244 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 45334 invoked from network); 30 Mar 2012 18:10:55 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 30 Mar 2012 18:10:55 -0000 Authentication-Results: pb1.pair.com header.from=dsoria@gmx.net; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=dsoria@gmx.net; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmx.net designates 213.165.64.23 as permitted sender) X-PHP-List-Original-Sender: dsoria@gmx.net X-Host-Fingerprint: 213.165.64.23 mailout-de.gmx.net Received: from [213.165.64.23] ([213.165.64.23:45422] helo=mailout-de.gmx.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 0D/51-38423-D27F57F4 for ; Fri, 30 Mar 2012 13:10:54 -0500 Received: (qmail invoked by alias); 30 Mar 2012 18:10:50 -0000 Received: from p4FE3A20F.dip.t-dialin.net (EHLO Shedir.local) [79.227.162.15] by mail.gmx.net (mp001) with SMTP; 30 Mar 2012 20:10:50 +0200 X-Authenticated: #235172 X-Provags-ID: V01U2FsdGVkX19wBlowkcBwJs1ODp35Y76byqYlyWylNFrVSj0xDk GcfYurVlT/zGz4 Message-ID: <4F75F728.6090006@gmx.net> Date: Fri, 30 Mar 2012 20:10:48 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:11.0) Gecko/20120313 Thunderbird/11.0 MIME-Version: 1.0 To: Laruence CC: dsp@php.net, irker@php.net, PHP Internals References: In-Reply-To: X-Enigmail-Version: 1.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Subject: Re: Pre-receive-hook doesn't accept a empty diff commit From: dsoria@gmx.net (David Soria Parra) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 alex fixed that Am 30.03.12 15:08, schrieb Laruence: > Hi: Today I make a fix which is only affect 5.3's test . after > fix, I pushed it. > > then I do a fake merge(merge -s ours) in 5.4, then when I try to > push it.. > > I got an error: > > remote: We cannot figure out what you comitted! To > git@git.php.net:php-src.git ! [remote rejected] PHP-5.4 -> PHP-5.4 > (pre-receive hook declined) > > then I have to make a trivial change to avoid this.. > > is this a bug? or what should I do in such case? :) > > > thanks -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPdfcoAAoJEAT0aMuPE7Z1aokP/i8/q5860XgBFJRLQfx3QQT6 Z5WbQGbnixllQrSKV6ywPZ8/ccM2j0KmT3Ei3d3jycfb8CMcwcJIiTX6UHwbBKxk dnI7/ZlOPW/6LNMn4aw/JW+kTi7CzJRDdox3J/C8aWOyurXUOGnR6sj8xuxKlAjK ivJVaag0TRRYENA9VQodA2wzOMUWAMCTPh6CXevnv577tAana3U+qAgS6IjH8V9G zJTsLf6m+wYjhAEyRDig9Ha/10Ty/kgtwmYo0lqU4UT60Zq5870by08j7vtODatk XtYzHGK88+59VHEQpNLBOiVCutPgTIVdYGC+UEtuwSqi5nOB4dRdMZxxm4kwqiEk pGgMfmG6WDrJCb2P4hkzkqcjDDobDt4WdjEzScqDqvJKWSmVncBJkDag+EkAuM2Q uKFq9By2xaQyDsQ4qqFd4AJl7srZ8l1m+Ge5HrCthflGQKYaJ21tQzlUQ7dhKJrl LvnwfSyIivFIcu+CY4vPqCZmtcyGpB9QWNycFLszn7A4mKNtfFpZCzWPKtu1dOn4 6dreVmZcZ0tBZgD9hytZtv1oQypEB+4A4foKV5jhdNciZ6/fJxBjFQ4pDf64M6Ic 6hDvhixWJSjQzQSDVcuJbDngmGDn5yKMEkwPr3nynlWfH/Ndwy/bEGc9hdqU2ZXh DIdAPzFAwAo7EXb6g39O =Pl9S -----END PGP SIGNATURE-----