From: Ye Xiaolong <xiaolong.ye@intel.com>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>,
git@vger.kernel.org, Stefan Beller <sbeller@google.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: format-patch: no 'prerequisite-patch-id' info when specifying commit range
Date: Wed, 30 May 2018 15:04:48 +0800 [thread overview]
Message-ID: <20180530070448.GC27396@yexl-desktop> (raw)
In-Reply-To: <20180529184651.GB14525@localhost.localdomain>
Hi, Eduardo
On 05/29, Eduardo Habkost wrote:
>Hi,
>
>I'm trying to use git-format-patch --base to generate the list of
>prerequisite patches for a series, but the behavior of git
>doesn't seem to match the documentation:
>
>When using a commit count (e.g.: "-2"), git-format-patch generates the
>prerequisite-patch-id lines as expected. But when using a commit range like
>"Z..C", the prerequisite-patch-id lines are missing.
>
>Is this intentional, or it is a bug?
Thanks for reporting, it seems an unexpected behavior, I'll look into it.
Thanks,
Xiaolong
>
>Example using git.git commits:
>
> $ git format-patch --stdout --cover-letter --stdout --base b7b1fca17~5 -2 b7b1fca17 | egrep 'base-commit|prereq'
> base-commit: 2738744426c161a98c2ec494d41241a4c5eef9ef
> prerequisite-patch-id: 080ac2faf21a6a7f9b23cb68286866d026a92930
> prerequisite-patch-id: e3ee77500c9aa70248e7ee814662d01f79d0dcdb
> prerequisite-patch-id: 6d831e23e33075681e6b74553151a32b73092013
> (ehabkost@localhost:~/rh/proj/git (ok) 1j)
> $ git format-patch --stdout --cover-letter --stdout --base b7b1fca17~5 b7b1fca17~2..b7b1fca17 | egrep 'base-commit|prereq'
> base-commit: 2738744426c161a98c2ec494d41241a4c5eef9ef
> $ git --version
> git version 2.17.1
> $ git log --graph --pretty=oneline -6 b7b1fca17
> * b7b1fca175f1ed7933f361028c631b9ac86d868d fsck: complain when .gitmodules is a symlink
> * 73c3f0f704a91b6792e0199a3f3ab6e3a1971675 index-pack: check .gitmodules files with --strict
> * 6e328d6caef218db320978e3e251009135d87d0e unpack-objects: call fsck_finish() after fscking objects
> * 1995b5e03e1cc97116be58cdc0502d4a23547856 fsck: call fsck_finish() after fscking objects
> * ed8b10f631c9a71df3351d46187bf7f3fa4f9b7e fsck: check .gitmodules content
> * 2738744426c161a98c2ec494d41241a4c5eef9ef fsck: handle promisor objects in .gitmodules check
> $
>
>If I understand the documentation correctly, both "-3 C" or "Z..C" were
>supposed to be equivalent:
>
>> With `git format-patch --base=P -3 C` (or variants thereof, e.g. with
>> `--cover-letter` or using `Z..C` instead of `-3 C` to specify the
>> range), the base tree information block is shown at the end of the
>> first message the command outputs (either the first patch, or the
>> cover letter), like this:
>>
>> ------------
>> base-commit: P
>> prerequisite-patch-id: X
>> prerequisite-patch-id: Y
>> prerequisite-patch-id: Z
>> ------------
>
>--
>Eduardo
next prev parent reply other threads:[~2018-05-30 7:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 18:46 format-patch: no 'prerequisite-patch-id' info when specifying commit range Eduardo Habkost
2018-05-30 7:04 ` Ye Xiaolong [this message]
2018-06-03 6:07 ` Ye Xiaolong
2018-06-04 2:15 ` Junio C Hamano
2018-06-04 2:41 ` Ye Xiaolong
2018-06-04 15:05 ` [PATCH] format-patch: clear UNINTERESTING flag before prepare_bases Xiaolong Ye
2018-06-04 19:42 ` Eduardo Habkost
2018-06-19 2:40 ` Ye Xiaolong
2018-06-19 18:18 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180530070448.GC27396@yexl-desktop \
--to=xiaolong.ye@intel.com \
--cc=ehabkost@redhat.com \
--cc=fengguang.wu@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).