From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 761 invoked by alias); 16 Jan 2015 16:10:59 -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 749 invoked by uid 89); 16 Jan 2015 16:10:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ob0-f171.google.com Received: from mail-ob0-f171.google.com (HELO mail-ob0-f171.google.com) (209.85.214.171) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 16 Jan 2015 16:10:57 +0000 Received: by mail-ob0-f171.google.com with SMTP id va2so9747326obc.2 for ; Fri, 16 Jan 2015 08:10:55 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.202.174.198 with SMTP id x189mr9363750oie.78.1421424655091; Fri, 16 Jan 2015 08:10:55 -0800 (PST) Received: by 10.76.185.7 with HTTP; Fri, 16 Jan 2015 08:10:55 -0800 (PST) In-Reply-To: <83ppae1zsq.fsf@gnu.org> References: <83ppae1zsq.fsf@gnu.org> Date: Fri, 16 Jan 2015 16:10:00 -0000 Message-ID: Subject: Re: Commit hook annoyance From: "H.J. Lu" To: Eli Zaretskii Cc: Joel Brobecker , GDB Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00461.txt.bz2 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? -- H.J.