Re: [PATCH v5 2/4] format-patch: add '--base' option to record base tree info

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 22, 2016, 21:59 UTC
Message-ID: <xmqqfuudnw35.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1461303756-25975-3-git-send-email-xiaolong.ye@intel.com>

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.

Show 5 quoted lines

> +	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
> +'