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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 5D6A51F5AE for ; Thu, 10 Jun 2021 15:36:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231674AbhFJPiU (ORCPT ); Thu, 10 Jun 2021 11:38:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbhFJPiU (ORCPT ); Thu, 10 Jun 2021 11:38:20 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04751C061574 for ; Thu, 10 Jun 2021 08:36:24 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id p13so1966477pfw.0 for ; Thu, 10 Jun 2021 08:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DmcVknj6SUVRy2r+Ed32VdkelTPWKVv749Vvwv239sM=; b=iTzeVrXfBy60GAVlC1wi1X9HpLSoR1DvN9XWRCVmuKlf+BDQRwpR0WrdorFUFY1fO9 pPC4NmU5o2ec60GWdDTtCk5wBZkRRSEE1lJBzskNww5LV+84FC5/Zc1F+IqMDTWO5lHb I6afVa21h3Bj4AaMOV1bWQf8nv83dc9mTmlo/HZdB+HLQ+sZK8K/DZvPuQBbPQbFOKg/ CUg3w/rFT94h33lL0H+iIC2Xwiofj5yOlXtzExTs6CEqVLgkoB2TDdiBS5HBnAEM+B/B DHZQ3CttfdBiO+JXFEHqXmbg2dV9+O0Jc1pwPS9gDVLnMSF4TbscUXPR7xw+hyFoXmiU LZjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DmcVknj6SUVRy2r+Ed32VdkelTPWKVv749Vvwv239sM=; b=UIik4cvcG0H8yGr1v+4pnwnmvL7yCgYubp1SjEgnn3Yhdub97QfC5opktXNTVEc1of AzlNti18krmiO5qMxqNBNLNDa7F+hTaFLdcCnjarWoQZEHO6R2ENdkmJlg9dEbuIL6X9 zkFr/HUH5Bz1kGKNjc8JncqOZJR66lQHw79d8YlrNm2CYw/LmdJB2l+c0t7oNuMPlmaJ ESXqwvfl2ww1cRo74rudp4Om69T6EaQqkaoAO4+dmWTtoOk/ufOvTChwL5zLzEN+xeQC 1wr8peo/xHB2OZeYaY7060p3sk7sEwb9XAQWPYPq0J2exRtGqTens3G/RruvP0L16rBI iYBQ== X-Gm-Message-State: AOAM530+28QxoZVQdhnF/qboE6s831c6XEq649OJG9Z+c4eW1dRxv9E0 vvzKMT4GXwYwdPmRk01n7yRUIX5vG4emp4Jdumo= X-Google-Smtp-Source: ABdhPJwO9dUbAWHeoxWoniNEKAdhi8iq0R2pl6Rjj7FHqb0zoFNn875BQOrKAIMIwPDz80vgs6ekyse/HttrW1mvFhQ= X-Received: by 2002:a62:4e86:0:b029:2ea:25ce:b946 with SMTP id c128-20020a624e860000b02902ea25ceb946mr3662399pfb.30.1623339383553; Thu, 10 Jun 2021 08:36:23 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Nikita Bobko Date: Thu, 10 Jun 2021 17:36:43 +0200 Message-ID: Subject: Re: [Bug report] git format-patch + git am doesn't preserve original commit message To: Jeff King Cc: git@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Oh, I see, thank you, it works. But actually, I am not sure that it's "expected" behavior. I would expect git to preserve original message by default without any additional flags. Shouldn't `--keep-non-patch` flag in `git am` be enabled by default then? On Thu, Jun 10, 2021 at 5:11 PM Jeff King wrote: > > On Thu, Jun 10, 2021 at 05:04:58PM +0200, Nikita Bobko wrote: > > > Steps to reproduce: > > ``` > > git init > > git commit --allow-empty -m 'root' > > echo foo > foo > > git add . > > git commit -m '[tag] foo' > > git checkout @~ > > git format-patch master~..master > > cat 0001-tag-foo.patch | git am > > ``` > > Expected: commit message generated by `git am` is `[tag] foo` > > Actual: commit message generated by `git am` is `foo` > > This is working as intended. See the "-k" option of git-am and > git-mailinfo (and also "-b" for mailinfo). > > -Peff