git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ye Xiaolong <xiaolong.ye@intel.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, fengguang.wu@intel.com,
	ying.huang@intel.com, philip.li@intel.com, julie.du@intel.com
Subject: Re: [PATCH v5 2/4] format-patch: add '--base' option to record base tree info
Date: Sun, 24 Apr 2016 12:36:14 +0800	[thread overview]
Message-ID: <20160424043614.GC1258@yexl-desktop> (raw)
In-Reply-To: <xmqqfuudnw35.fsf@gitster.mtv.corp.google.com>

On Fri, Apr 22, 2016 at 02:59:42PM -0700, Junio C Hamano wrote:
>Xiaolong Ye <xiaolong.ye@intel.com> writes:
>
>> +test_expect_success 'format-patch --base' '
>> +	git checkout side &&
>> +	git format-patch --stdout --base=HEAD~~~ -1 >patch &&
>> +	grep -e "^base-commit:" -A3 patch >actual &&
>
>The -A3 is GNUism.  To do this portably, perhaps you can do
>
>	sed -n -e "/^base-commit:/,+3p"
>
>or something like that.
>
>But more importantly, grabbing 3 lines (and always 3 lines) will not
>catch a future bug that somebody else may introduce to this code
>that shows extra "prerequisite-patch-id:" after them.

I'll try to improve the testcase to make it more sensible.

Thanks,
Xiaolong
>
>> +	echo "base-commit: $(git rev-parse HEAD~~~)" >expected &&
>> +	echo "prerequisite-patch-id: $(git show --patch HEAD~~ | git patch-id --stable | awk "{print \$1}")" >>expected &&
>> +	echo "prerequisite-patch-id: $(git show --patch HEAD~ | git patch-id --stable | awk "{print \$1}")" >>expected &&
>> +	test_cmp expected actual
>> +'

  reply	other threads:[~2016-04-24  4:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-22  5:42 [PATCH v5 0/4] Add --base option to git-format-patch to record base tree info Xiaolong Ye
2016-04-22  5:42 ` [PATCH v5 1/4] patch-ids: make commit_patch_id() a public helper function Xiaolong Ye
2016-04-22  5:42 ` [PATCH v5 2/4] format-patch: add '--base' option to record base tree info Xiaolong Ye
2016-04-22 21:39   ` Junio C Hamano
2016-04-24  3:05     ` Ye Xiaolong
2016-04-22 21:52   ` Junio C Hamano
2016-04-22 21:59   ` Junio C Hamano
2016-04-24  4:36     ` Ye Xiaolong [this message]
2016-04-22  5:42 ` [PATCH v5 3/4] format-patch: introduce --base=auto option Xiaolong Ye
2016-04-22 21:54   ` Junio C Hamano
2016-04-24  4:32     ` Ye Xiaolong
2016-04-22  5:42 ` [PATCH v5 4/4] format-patch: introduce format.useAutoBase configuration Xiaolong Ye

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160424043614.GC1258@yexl-desktop \
    --to=xiaolong.ye@intel.com \
    --cc=fengguang.wu@intel.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=julie.du@intel.com \
    --cc=philip.li@intel.com \
    --cc=ying.huang@intel.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.
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 NNTP newsgroup(s).