git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Ye Xiaolong <xiaolong.ye@intel.com>
Date
Apr 24, 2016, 04:36 UTC
Message-ID
<20160424043614.GC1258@yexl-desktop>
In-Reply-To
<xmqqfuudnw35.fsf@gitster.mtv.corp.google.com>
On Fri, Apr 22, 2016 at 02:59:42PM -0700, Junio C Hamano wrote:
Show 16 quoted lines
>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

Show 6 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
>> +'
Previous: Junio C HamanoNext: Xiaolong Ye
Message 8 of 12 in “Add --base option to git-format-patch to record base tree info”
  1. 0/4 Add --base option to git-format-patch to record base tree infoXiaolong Ye, Apr 22, 2016
  2. 1/4 patch-ids: make commit_patch_id() a public helper functionXiaolong Ye, Apr 22, 2016
  3. 2/4 format-patch: add '--base' option to record base tree infoXiaolong Ye, Apr 22, 2016
  4. Junio C HamanoApr 22, 2016
  5. Ye XiaolongApr 24, 2016
  6. Junio C HamanoApr 22, 2016
  7. Junio C HamanoApr 22, 2016
  8. Ye XiaolongApr 24, 2016
  9. 3/4 format-patch: introduce --base=auto optionXiaolong Ye, Apr 22, 2016
  10. Junio C HamanoApr 22, 2016
  11. Ye XiaolongApr 24, 2016
  12. 4/4 format-patch: introduce format.useAutoBase configurationXiaolong Ye, Apr 22, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.