From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11553 invoked by alias); 16 Jan 2015 16:42:03 -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 11533 invoked by uid 89); 16 Jan 2015 16:42:02 -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,SPF_SOFTFAIL autolearn=no version=3.3.2 X-HELO: mtaout25.012.net.il Received: from mtaout25.012.net.il (HELO mtaout25.012.net.il) (80.179.55.181) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 Jan 2015 16:42:01 +0000 Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NIA0000036BG300@mtaout25.012.net.il> for gdb-patches@sourceware.org; Fri, 16 Jan 2015 18:36:50 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NIA00E683HDA5A0@mtaout25.012.net.il>; Fri, 16 Jan 2015 18:36:50 +0200 (IST) Date: Fri, 16 Jan 2015 16:42:00 -0000 From: Eli Zaretskii Subject: Re: Commit hook annoyance In-reply-to: <20150116161841.GS8167@adacore.com> To: Joel Brobecker Cc: gdb-patches@sourceware.org Reply-to: Eli Zaretskii Message-id: <83k30m1xvh.fsf@gnu.org> References: <83ppae1zsq.fsf@gnu.org> <20150116161841.GS8167@adacore.com> X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00468.txt.bz2 > Date: Fri, 16 Jan 2015 20:18:41 +0400 > From: Joel Brobecker > Cc: gdb-patches@sourceware.org > > There is a commit whose revision log has a line that has "Conflict:" > in its revision log. This usually happens when you cherry-pick > a commit, resolve merge conflicts, and then commit again. Git > decides to append a section at the end off the new revision log > which lists the files where there were some conflicts. Yes, that's what happened. Quite normal. > In our experience at AdaCore, these are useless, and people often > don't even notice them. Hence the check. Being useless doesn't mean harmful. (I do notice that part, but I'm used to leaving it there.) Rejecting a push is an annoyance I'd rather do without. Moreover, that line is a record of the fact that there was a conflict, which might be useful one day. So how about removing that particular reason for rejecting a push? Thanks.