From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25261 invoked by alias); 16 Jan 2015 17:45:38 -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 25224 invoked by uid 89); 16 Jan 2015 17:45:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f174.google.com Received: from mail-we0-f174.google.com (HELO mail-we0-f174.google.com) (74.125.82.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 16 Jan 2015 17:45:31 +0000 Received: by mail-we0-f174.google.com with SMTP id k48so21519718wev.5 for ; Fri, 16 Jan 2015 09:45:28 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.194.7.103 with SMTP id i7mr30752916wja.53.1421430328389; Fri, 16 Jan 2015 09:45:28 -0800 (PST) Received: by 10.27.39.198 with HTTP; Fri, 16 Jan 2015 09:45:28 -0800 (PST) In-Reply-To: <83k30m1xvh.fsf@gnu.org> References: <83ppae1zsq.fsf@gnu.org> <20150116161841.GS8167@adacore.com> <83k30m1xvh.fsf@gnu.org> Date: Fri, 16 Jan 2015 17:45:00 -0000 Message-ID: Subject: Re: Commit hook annoyance From: Doug Evans To: Eli Zaretskii Cc: Joel Brobecker , "gdb-patches@sourceware.org" Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00474.txt.bz2 On Fri, Jan 16, 2015 at 8:41 AM, Eli Zaretskii wrote: >> 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? I dunno, let's not rush into a change. Having caught up on the thread, at the moment I'm kinda liking the check.