From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6358 invoked by alias); 16 Jan 2015 16:38:33 -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 6295 invoked by uid 89); 16 Jan 2015 16:38:31 -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 autolearn=no version=3.3.2 X-HELO: mtaout20.012.net.il Received: from mtaout20.012.net.il (HELO mtaout20.012.net.il) (80.179.55.166) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 Jan 2015 16:38:29 +0000 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NIA00I003DHNJ00@a-mtaout20.012.net.il> for gdb-patches@sourceware.org; Fri, 16 Jan 2015 18:38:27 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NIA00ICD3K2EY70@a-mtaout20.012.net.il>; Fri, 16 Jan 2015 18:38:27 +0200 (IST) Date: Fri, 16 Jan 2015 16:38:00 -0000 From: Eli Zaretskii Subject: Re: Commit hook annoyance In-reply-to: To: "H.J. Lu" Cc: brobecker@adacore.com, gdb-patches@sourceware.org Reply-to: Eli Zaretskii Message-id: <83lhl21y0b.fsf@gnu.org> References: <83ppae1zsq.fsf@gnu.org> X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00467.txt.bz2 > Date: Fri, 16 Jan 2015 08:10:55 -0800 > From: "H.J. Lu" > Cc: Joel Brobecker , GDB > > On Fri, Jan 16, 2015 at 8:00 AM, Eli Zaretskii wrote: > > 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? > > Do you have a commit which has a conflict and is fixed by another > commit? No, it was a cherry-pick that created a conflict, whih I resolved before committing. But I didn't bother to remove the "Conflicts:" part from the automatic commit message that Git lets me edit, when I invoke "git cherry-pick -e".