From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21874 invoked by alias); 16 Jan 2015 15:59:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 21864 invoked by uid 89); 16 Jan 2015 15:59:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_SOFTFAIL,T_HDRS_LCASE autolearn=no version=3.3.2 X-HELO: mtaout27.012.net.il Received: from mtaout27.012.net.il (HELO mtaout27.012.net.il) (80.179.55.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 Jan 2015 15:59:50 +0000 Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NIA00N001ANK200@mtaout27.012.net.il> for gdb-patches@sourceware.org; Fri, 16 Jan 2015 17:52:24 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NIA00FQC1FCP470@mtaout27.012.net.il>; Fri, 16 Jan 2015 17:52:24 +0200 (IST) Date: Fri, 16 Jan 2015 15:59:00 -0000 From: Eli Zaretskii Subject: Commit hook annoyance To: Joel Brobecker Cc: gdb-patches@sourceware.org Reply-to: Eli Zaretskii Message-id: <83ppae1zsq.fsf@gnu.org> X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00460.txt.bz2 Is this really necessary? $ git push Counting objects: 94, done. Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 742 bytes | 0 bytes/s, done. Total 4 (delta 3), reused 0 (delta 0) remote: *** Pattern "Conflicts:" has been detected. remote: *** (in commit 7fa8e2a29c9357024d21bdf09faa5cb930a4ffe5) remote: *** remote: *** This usually indicates a merge commit where some merge conflicts remote: *** had to be resolved, but where the "Conflicts:" section has not remote: *** been deleted from the revision history. remote: *** remote: *** Please edit the commit's revision history to either delete remote: *** the section, or to avoid using the pattern above by itself. remote: error: hook declined to update refs/heads/gdb-7.9-branch To git+ssh://sourceware.org/git/binutils-gdb.git ! [remote rejected] gdb-7.9-branch -> gdb-7.9-branch (hook declined) error: failed to push some refs to 'git+ssh://sourceware.org/git/binutils-gdb.git' There was no unresolved conflicts in the commit I tried to push. Why does the hook insist on forcing me to remove the "Conflicts:" part, instead of looking for the merge-commit conflict markers? Why do we care about leaving the reference to original conflicts in the log?