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-Status: No, score=-3.6 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,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 B5AB41F66F for ; Thu, 12 Nov 2020 17:44:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726286AbgKLRn5 (ORCPT ); Thu, 12 Nov 2020 12:43:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726202AbgKLRn5 (ORCPT ); Thu, 12 Nov 2020 12:43:57 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF548C0613D1 for ; Thu, 12 Nov 2020 09:43:56 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id v22so7319812edt.9 for ; Thu, 12 Nov 2020 09:43:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=SCdDgk5l/WGgbNzYj/eJbUkTjLrEslUXFfaQD6qim4w=; b=tX4NIY0mi8DWyrQvBSJ7O35hY8bnX5DEdV1AlsxVZRcoD3zIZzquNB/xFAL/vaW/XO knlmabcDkgqQGLUa1yBSpeYw+dHjbXLD0dpFSwImiam1vDYYm6+Ab9+X3eyFSV3VICym DIHFAqJQiRBsjYnIezY73KoNxtoVY7dBWlyBbms1HOgpi5yYf7yK6enFTAdgxfsDfSUG +OZJQsHWbTlXtvGmP7zLl27HGL3CD2P45J63GartgsqLAqhBfYHu2YIpT1ATZFa48TGc Eb64oqwKQJT4mMz5K4jnMmX9opt1ux9RBbLNW0DxsWj9uq+z4PRzsT0BICEx3Q1wKQZd e1oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=SCdDgk5l/WGgbNzYj/eJbUkTjLrEslUXFfaQD6qim4w=; b=StQeMjyq+j6SoUNANV3TlndPj6NTp2z6GzuwupqCpiyaLn48b3V4tkmX8ZeHpopOEN IZ7ipZdKL0zEPzrSCKX9O6WCqiE9KQC45gYFfNiebHDfbDqBmocKtpe9ZEhnSlMiDOIh 3+/968ZP0ambplNgmoCjVJmg0ARhkbyb3bc+evaOKMjqsF9W0kQhAY0B9HtrPrOYt/8r R/bgSHnzgot9ibjBT0e2u1CiT4ZRLaKTPzI3/qwhiLVM24DHEA3sFetK6rxEAPSZZM5f oOtggMdpQB4qFQbdPRBs5qGUksuQn3kDx57WM3oovAF2aSCwzBpWlFnUB1RacGIk7Ysy 9ixg== X-Gm-Message-State: AOAM531Z9O54HOSl6/lxNeVkkKt/bcGk0nwr9I+LSCSKZwGYMYunEiVI HUtd2WVpvvJD5fxx8/+d+ow7X0pIrMA= X-Google-Smtp-Source: ABdhPJy9nPjTeZ7Fo4eNUC2D5pE79RmcnPF/f2gzCq8lQrBgIqczE+hk97nlHKz3jXmyLRtCcIAqqg== X-Received: by 2002:aa7:c2d7:: with SMTP id m23mr985997edp.230.1605203035432; Thu, 12 Nov 2020 09:43:55 -0800 (PST) Received: from szeder.dev (94-21-58-64.pool.digikabel.hu. [94.21.58.64]) by smtp.gmail.com with ESMTPSA id r20sm2719690edq.6.2020.11.12.09.43.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2020 09:43:54 -0800 (PST) Date: Thu, 12 Nov 2020 18:43:53 +0100 From: SZEDER =?utf-8?B?R8OhYm9y?= To: git@vger.kernel.org Cc: Eric Sunshine Subject: git format-patch --range-diff bug? Message-ID: <20201112174353.GD4270@szeder.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org I've just run into an unexpected looking range-diff generated by 'git format-patch -1 --range-diff=...'. While the 'git range-diff' command correctly pairs up the old and new versions of the commit, 'git format-patch --range-diff' somehow doesn't and reports it in a weird way. The test below demonstrates the issue, though it doesn't fail but only prints the outputs of those commands: --- >8 --- #!/bin/sh test_description='test' . ./test-lib.sh test_expect_success 'test' ' test_tick && printf "%s\n" 0 1 2 3 4 5 6 7 8 9 >file && git add file && git commit -m initial && git checkout -b v1 && echo foo >>file && git commit -m change file && git checkout -b v2 master && echo bar >>file && git commit -m change file && : The output of the range-diff command is what I would expect to be included in the generated patch && git range-diff v1...v2 && : But that is not what we get embedded in the generated patch && git format-patch -1 --range-diff=v1...v2 v2 && sed -n -e "/^Range-diff:$/,/^$/ p" 0001-change.patch && : Adding the range-diff to the cover letter doesnt seem to help && git format-patch -1 --range-diff=v1...v2 --cover-letter v2 && sed -n -e "/^Range-diff:$/,$ p" 0000-cover-letter.patch ' test_done --- 8< --- And here is the relevant part of the output: + : The output of the range-diff command is what I would expect to be included in the generated patch + git range-diff v1...v2 1: f8c2d0b ! 1: 83c34a8 change @@ -9,4 +9,4 @@ 7 8 9 -+foo ++bar + : But that is not what we get embedded in the generated patch + git format-patch -1 --range-diff=v1...v2 v2 0001-change.patch + sed -n -e /^Range-diff:$/,/^$/ p 0001-change.patch Range-diff: 1: 83c34a8 = 1: 83c34a8 change 2: f8c2d0b < -: ------- change + : Adding the range-diff to the cover letter doesnt seem to help + git format-patch -1 --range-diff=v1...v2 --cover-letter v2 0000-cover-letter.patch 0001-change.patch + sed -n -e /^Range-diff:$/,$ p 0000-cover-letter.patch Range-diff: 1: 83c34a8 = 1: 83c34a8 change 2: f8c2d0b < -: ------- change -- 2.18.0.584.g40ce41604d