From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id E0AAA1F4BE for ; Mon, 7 Oct 2019 09:40:18 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version:content-type; q=dns; s=default; b=t7/2O TDAOHw3qK6iraMaB+AztbSzi39+puC+EkkcHTZqVROPqtC4jwYgYR/ObARRdpNuH JcxYRjBPGUH0x5si6BfPt4itwWtQHQ8Jh1Jqx81C/joOa38jXlywcZEP1BVfdEPo nLlvWWaPowgP6jnZJ0hXOwTspqtfEYY264eqSw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version:content-type; s=default; bh=rLOaCxaPYuC a6TitAN1QV6J3Nss=; b=RqHmU3U0sIzqGCugNo/pBKtsw2Xdi11leFKubP+Fb6q Uka4F1tFt21G2KDzpYsVSiVLcdZka+YaOkq9xZtp7eHZuyfhU9tzIH1Jwj4z0IgG ppkbc2XGDwhptRzm3MTtUbp9VrIHiF0vr15Qq2iF7+WDsR9yloBkDKAXPbV3ZajI = Received: (qmail 26156 invoked by alias); 7 Oct 2019 09:40:16 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 26147 invoked by uid 89); 7 Oct 2019 09:40:16 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: esa6.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1570441215; x=1601977215; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=GNG+72o47pSoI5c1Q0ysPn+oKH5mSVPU1K8ZQfkTAwE=; b=I6Lrft1n+diWD/lDjB8idse6AhW9GT3qy2YF3BctVWXWSeJDn33s6twM paUA7AFtdqEWD/uPGIY0deUW6hs8qii1BNKFs0MvK+KKJRGkdopsKuRks P9Pwcz3bNPJNVYQJP0xkrhNkXRM41LfHeKRYCdt7KamqOkuilxQcuBoLV IEpc1YamBhen2B6uYbu5ykFDOe9nbBpK8bqLUlGlpvy6tNKPIkkTY6gHr MqJ9kZhpWupPFyNEaeVDxZDH4kDhRm/SFUnjo6+oY3UOeyXQ/pytarMWE Etgi6V8TSDTz6jaNAZkl5Moxuema3yjgWXULHMMYhUMSiYJ2NDK5bQPGx g==; IronPort-SDR: QqjQdtRWb6ThaCgGMfivzbzEojY6CQOsn0BrpZ+HJhwwLEV7v5jzT4WRbSuELEpuJzeRQ16MEQ 8Kb9hzYyzmzhfguXvCO5cn0I9+8phCn8LayqPyhAC5HTdLE+laOWs1kCRelGd54E87Dyl/R8mg Ok6i4ilboOKAXLx4S1+q36taa/MfAIdDOLOJd7h6jCY+mMax1XGnIXnToNqRYV6ify70FII0O9 zG7QjDMo5DU45R4prgpK4czO3Qsh2h4rcfnV0asJsgs0YEfId9GFQfDBzDw/bDxBivTmF2Ozie YUA= IronPort-SDR: RnpLbZXfgf/zfupiYn5NqfVcMOV16llC1IZAs50A1mPi0kSy8HgehVXug4v2oMgodhXAGcqDXN z8iNcS2ETh9fNKa8RV+c0H46jiDkttwmE9aDCKzMujfXXQy3kRTgLTcgkEIfLAs5XCjsk+luRD jdQr4wx1S4V69joB8FTh8rM3B2xbmi1LlYFJLHb0GQGelOQhsQsqfLktBuHqYzOkeuCgFErtPp CvT0Rvq2FiOYKJCkk+9j5gTasuroAWurZ7UGWAS3V8p8IHprWGYZbF6wuubOt39oA9zHIe9ueU 2OGt1fboGZ8SPziKydPlvuzc IronPort-SDR: +Xv0oHf/32JjhgIa634geOiNOiFnFmNMApub0chWyd5i/VEjdjflxu6B7rCPHTpUwMaS8GFxf6 KS5ciQVezTSyr9/j75N/rPpFYXW5kNUoQB96fh8hl/hljIDhzbce3EFqlLR7dJjt9g5bidOr3R mOKJc6EPwHyqS6GCW/MJARXxwY2nWguBU57OjsBDmdinF68VqFdNvLzTVWpK8xLlVSll95Jbtu KdWZsaG8iCw7n1qZRj2jPhXddLIFnJpghm6C7l4mhOPGrPfrJfMlVnZb96Xiu6DmdqrnyZncS1 hsM= WDCIronportException: Internal Date: Mon, 7 Oct 2019 10:40:08 +0100 (BST) From: "Maciej W. Rozycki" To: Florian Weimer cc: Carlos O'Donell , "Gabriel F. T. Gomes" , Siddhesh Poyarekar , Adhemerval Zanella , libc-alpha@sourceware.org Subject: Re: When can we stop writing ChangeLogs? In-Reply-To: <87pnj9lyd3.fsf@oldenburg2.str.redhat.com> Message-ID: References: <6ebd0e52-a18f-15fc-f4ab-cf2c3afc74e9@gotplt.org> <3bd4b069-e16b-af68-fb2f-17d2458bece5@redhat.com> <878sq522xz.fsf@oldenburg2.str.redhat.com> <52634368-ee1e-23d1-1d61-de0057e03829@gotplt.org> <87ftkdzl4v.fsf@oldenburg2.str.redhat.com> <5e38ded2-811f-d5b6-872d-1db24d836576@gotplt.org> <87tv8ty3iv.fsf@oldenburg2.str.redhat.com> <20191003223709.4b6e1c40@tereshkova> <87pnj9lyd3.fsf@oldenburg2.str.redhat.com> User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII On Mon, 7 Oct 2019, Florian Weimer wrote: > > The patch *should* conform to git am --scissors for cutting out non-patch > > parts. > > To be clear here, the problem is not the scissors processing. What I > find very confusing is that scissors does not drop anything. It is just > a boundary between the commit message (taken verbatim) and the part > which is parsed as a patch. This means that the part of the scissors is > not actually ignored by git am; it gets passed to the patch parser in > git apply, and what happens then entirely depends on the patch parser > (which may or may not match what the human eye sees). Hmm, aren't you talking about the three-dash separator by any chance, which has nothing to do with the scissors line? I just made a little test by adding: discussion 8<-------------------------------------------------------------------->8 at the beginning of the message body of a git-am-compliant patch I recently processed and fed it to `git mailinfo --scissors' (which is what `git am' uses under the hood) and it correctly stripped "discussion" and the scissors line in producing the commit message. Maciej