Pre-receive-hook doesn't accept a empty diff commit

From: Date: Fri, 30 Mar 2012 13:08:04 +0000
Subject: Pre-receive-hook doesn't accept a empty diff commit
Groups: php.internals 
Request: Send a blank email to [email protected] to get a copy of this message 
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 [email protected]: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
-- 
Laruence  Xinchen Hui
http://www.laruence.com/

Thread (2 messages)

« previous php.internals (#59239) next »