From: Ye Xiaolong <xiaolong.ye@intel.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Subject: Re: [PATCH] format-patch: clear UNINTERESTING flag before prepare_bases
Date: Tue, 19 Jun 2018 10:40:54 +0800 [thread overview]
Message-ID: <20180619024054.GD17789@yexl-desktop> (raw)
In-Reply-To: <20180604150543.7304-1-xiaolong.ye@intel.com>
Hi, Junio
Could you help review this patch?
Thanks,
Xiaolong
On 06/04, Xiaolong Ye wrote:
>When users specify the commit range with 'Z..C' pattern for format-patch, all
>the parents of Z (including Z) would be marked as UNINTERESTING which would
>prevent revision walk in prepare_bases from getting the prerequisite commits,
>thus `git format-patch --base <base_commit_sha> Z..C` won't be able to generate
>the list of prerequisite patch ids. Clear UNINTERESTING flag with
>clear_object_flags solves this issue.
>
>Reported-by: Eduardo Habkost <ehabkost@redhat.com>
>Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
>---
> builtin/log.c | 1 +
> t/t4014-format-patch.sh | 6 ++++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/builtin/log.c b/builtin/log.c
>index 4686f68594..01993de6fe 100644
>--- a/builtin/log.c
>+++ b/builtin/log.c
>@@ -1746,6 +1746,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
> if (base_commit || base_auto) {
> struct commit *base = get_base_commit(base_commit, list, nr);
> reset_revision_walk();
>+ clear_object_flags(UNINTERESTING);
> prepare_bases(&bases, base, list, nr);
> }
>
>diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
>index 028d5507a6..53880da7bb 100755
>--- a/t/t4014-format-patch.sh
>+++ b/t/t4014-format-patch.sh
>@@ -1554,13 +1554,15 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
>
> test_expect_success 'format-patch --base' '
> git checkout side &&
>- git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual &&
>+ git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual1 &&
>+ git format-patch --stdout --base=HEAD~3 HEAD~.. | tail -n 7 >actual2 &&
> echo >expected &&
> echo "base-commit: $(git rev-parse HEAD~3)" >>expected &&
> echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected &&
> echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected &&
> signature >> expected &&
>- test_cmp expected actual
>+ test_cmp expected actual1 &&
>+ test_cmp expected actual2
> '
>
> test_expect_success 'format-patch --base errors out when base commit is in revision list' '
>--
>2.16.GIT
>
next prev parent reply other threads:[~2018-06-19 2:44 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
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 [this message]
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=20180619024054.GD17789@yexl-desktop \
--to=xiaolong.ye@intel.com \
--cc=ehabkost@redhat.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).