Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59239 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 99282 invoked from network); 30 Mar 2012 13:08:29 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 30 Mar 2012 13:08:29 -0000 Authentication-Results: pb1.pair.com header.from=laruence@gmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=laruence@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.220.170 as permitted sender) X-PHP-List-Original-Sender: laruence@gmail.com X-Host-Fingerprint: 209.85.220.170 mail-vx0-f170.google.com Received: from [209.85.220.170] ([209.85.220.170:45793] helo=mail-vx0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 23/40-31655-B40B57F4 for ; Fri, 30 Mar 2012 08:08:28 -0500 Received: by vcbfo14 with SMTP id fo14so397565vcb.29 for ; Fri, 30 Mar 2012 06:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:x-google-sender-auth:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=NrHJj//7yBgg0pYBy0Pu4myqXCsHVKpSN+KMsyGPKAA=; b=TZtJVV5gmQNoo71PJNl2dRu14PCyeUPmLPaIqd2XSGj1GD9kJiCxAzN2nz9Vrd3FAb AspLS70ugPkl8OgGs5c2Zc9LfclWC1Oc0hYcdg7zR+DrbSSti3/FcKM4NqgvxZUDkadK OtS9GxlUFWKJ9/d8aME+vrffkCvsEb6GWzFdx0z5EccE3PcKgyvuZagkbZsqKrhuaR6k cuasiQypJJdX//oHkE+WQziHGXP9oHGO/TJkmsYhk1v8O1HF/g4GJu13E/eelcx6Xlbn m/8yQ2uMvC+2gN39MpfwKp9NyZg2hE3uR7LVRkS2MAHFZEea5fmjRJ4TFn5BHcKOUbkZ 6TWw== Received: by 10.52.15.233 with SMTP id a9mr908643vdd.34.1333112904794; Fri, 30 Mar 2012 06:08:24 -0700 (PDT) MIME-Version: 1.0 Sender: laruence@gmail.com Received: by 10.220.18.194 with HTTP; Fri, 30 Mar 2012 06:08:04 -0700 (PDT) Date: Fri, 30 Mar 2012 06:08:04 -0700 X-Google-Sender-Auth: Y7Te_4mJBo03Gvqi5pLyIpu588U Message-ID: To: dsp@php.net, irker@php.net Cc: PHP Internals Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Pre-receive-hook doesn't accept a empty diff commit From: laruence@php.net (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 --=20 Laruence =C2=A0Xinchen Hui http://www.laruence.com/