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.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,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 8DF3B1F4BE for ; Mon, 7 Oct 2019 09:47:48 +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:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; q=dns; s=default; b=NqJA0 s0LqpzwmHousW9qVwwsAtVnkk6vRAV5TFO1UdJcCdOHr0zXJTRK/OhB8mxKAjiPm +z7lwlP+PQOPB3kqltE5IJVimWQ9/bvDolfrTtzVEySnKLfSxJTwgUMN+ZMhMpNk NmPfgz2joIZ6TACcYOcR8Xd/qToomZuQeHsUok= 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:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=default; bh=eO494IDhBqw 1wl57gorgv2ZyDlE=; b=KFsScM4W/xdFXBoFyi1trtJC7LoVxyxlRvs1nyJCH/x qs+2KSx7B9iQi8de4jHXsOW6tEhirqO+B/570XClgx2n5m/qcoteGWzxgHs6lirJ Uvc8h2qlwOIQ4FgKWrise0EsxmgAL2qsXKY2eRPVolt7cWhVX8n45r7yGlFC+XrI = Received: (qmail 58630 invoked by alias); 7 Oct 2019 09:47:46 -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 58549 invoked by uid 89); 7 Oct 2019 09:47:46 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mx1.redhat.com From: Florian Weimer To: "Maciej W. Rozycki" Cc: Carlos O'Donell , "Gabriel F. T. Gomes" , Siddhesh Poyarekar , Adhemerval Zanella , libc-alpha@sourceware.org Subject: Re: When can we stop writing ChangeLogs? 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> Date: Mon, 07 Oct 2019 11:47:38 +0200 In-Reply-To: (Maciej W. Rozycki's message of "Mon, 7 Oct 2019 10:40:08 +0100 (BST)") Message-ID: <87h84knayt.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain * Maciej W. Rozycki: > 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. Even without --scissors, you can put comments *after* the commit message, after a --- separator. Then the text will be interpreted as a patch by git apply and (usually) ignored. Thanks, Florian