From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17432 invoked by alias); 16 Jan 2015 16:26:05 -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 17414 invoked by uid 89); 16 Jan 2015 16:26:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.2 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 16 Jan 2015 16:26:03 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 5968C1166BF; Fri, 16 Jan 2015 11:26:01 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id JuKxEId72xwq; Fri, 16 Jan 2015 11:26:01 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id F24BD11664B; Fri, 16 Jan 2015 11:26:00 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id B934948E8B; Fri, 16 Jan 2015 20:25:56 +0400 (RET) Date: Fri, 16 Jan 2015 16:26:00 -0000 From: Joel Brobecker To: Eli Zaretskii Cc: gdb-patches@sourceware.org Subject: Re: Commit hook annoyance Message-ID: <20150116162556.GT8167@adacore.com> References: <83ppae1zsq.fsf@gnu.org> <20150116161841.GS8167@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150116161841.GS8167@adacore.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2015-01/txt/msg00463.txt.bz2 > > 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? Sorry - re-reading your question, I am now realizing that I was not really answering what you asked. So, let me try it again. I think we do care, IMO, because the information is really useless. And also, as I said, users often don't even realize that git does that for them. I'd rather have a little hassle right now, in favor of sanitized revision logs forever. I don't think it's a big hassle to have to remove them, myself. But if the consensus to remove the check, we can enhance the hooks to make it optional. -- Joel