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=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 00E7A1F48A for ; Wed, 12 Feb 2020 02:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727671AbgBLCYn (ORCPT ); Tue, 11 Feb 2020 21:24:43 -0500 Received: from cloud.peff.net ([104.130.231.41]:58136 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1727600AbgBLCYm (ORCPT ); Tue, 11 Feb 2020 21:24:42 -0500 Received: (qmail 11181 invoked by uid 109); 12 Feb 2020 02:24:43 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Wed, 12 Feb 2020 02:24:43 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 3896 invoked by uid 111); 12 Feb 2020 02:33:35 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Tue, 11 Feb 2020 21:33:35 -0500 Authentication-Results: peff.net; auth=none Date: Tue, 11 Feb 2020 21:24:41 -0500 From: Jeff King To: =?utf-8?B?UmVuw6k=?= Scharfe Cc: Junio C Hamano , "Michael S. Tsirkin" , git@vger.kernel.org Subject: Re: bug? illegal text in commit log Message-ID: <20200212022441.GA2963695@coredump.intra.peff.net> References: <20200204010524-mutt-send-email-mst@kernel.org> <3cd137fa-b879-9850-0b81-5f907623ee6d@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3cd137fa-b879-9850-0b81-5f907623ee6d@web.de> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Feb 07, 2020 at 09:30:59PM +0100, René Scharfe wrote: > My problem with the situation is that innocent-looking commits that > can be diffed, pushed and pulled suddenly fall apart when used in a > mail-based workflow or with rebase am. Maybe we could automatically write ">diff" in such mails? :) Speaking of which, try this: git init echo base >file git add file git commit -m base echo change >file { echo subject echo echo "From fc4ee3386d6db204b00b45889ef42400b9e18eed Mon Sep 17 00:00:00 2001" } | git commit -a -F - git format-patch --stdout -1 >patch git reset --hard HEAD^ git am patch mboxrd fixes this, but it's not the default. -Peff