From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id CF3431F42D for ; Thu, 24 May 2018 17:11:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034162AbeEXRLZ (ORCPT ); Thu, 24 May 2018 13:11:25 -0400 Received: from cloud.peff.net ([104.130.231.41]:51622 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1031530AbeEXRLW (ORCPT ); Thu, 24 May 2018 13:11:22 -0400 Received: (qmail 5130 invoked by uid 109); 24 May 2018 17:11:22 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Thu, 24 May 2018 17:11:22 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 27296 invoked by uid 111); 24 May 2018 17:11:31 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with (ECDHE-RSA-AES256-GCM-SHA384 encrypted) SMTP; Thu, 24 May 2018 13:11:31 -0400 Authentication-Results: peff.net; auth=none Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Thu, 24 May 2018 13:11:20 -0400 Date: Thu, 24 May 2018 13:11:20 -0400 From: Jeff King To: Michal Hocko Cc: git@vger.kernel.org Subject: Re: unexpected "unresolved merge conflict" for a new file Message-ID: <20180524171120.GC14876@sigill.intra.peff.net> References: <20180524113657.GD20441@dhcp22.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180524113657.GD20441@dhcp22.suse.cz> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, May 24, 2018 at 01:36:57PM +0200, Michal Hocko wrote: > `git commit' fails on a newly added file with the following > * > * You have some suspicious patch lines: > * > * In Documentation/core-api/gfp_mask-from-fs-io.rst > * unresolved merge conflict (line 27) > Documentation/core-api/gfp_mask-from-fs-io.rst:27:======= This message isn't generated by git itself, but rather by a pre-commit hook. You can skip the hook by running "git commit --no-verify". As for the false positive in the hook logic, I can't say more without having seen the hook source. :) Do you know where you got it from? (Googling for "suspicious patch lines" turns up some hits, but with varying provenance). -Peff