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

Re: [PATCH v2 3/4] format-patch: introduce --base=auto option

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 24, 2016, 17:01 UTC
Message-ID
<xmqq37rfajy1.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20160324041925.GB26582@yexl-desktop>
Ye Xiaolong <xiaolong.ye@intel.com> writes:
Show 11 quoted lines
> On Wed, Mar 23, 2016 at 11:25:41AM -0700, Junio C Hamano wrote:
>>I also do not see the point of showing "parent id" which as far as I
>>can see is just a random commit object name and show different
>>output that is not even described what it is.  It would be better to
>
> Here is our consideration:
> There is high chance that branch_get_upstream will retrun NULL(thus we
> are not able to get exact base commit), since developers may checkout
> branch from a local branch or a commit and haven't set "--set-upstream-to"
> to track a remote branch, in this case, we want to provide likely useful
> info(here is parent commit id and patch id)

I do not agree with that reasoning at all, primarily because your "likely useful" is not justfied.

Could you explain what makes you think that it is "likely" that the commit that matches "parent commit id" is available to the recipient of the patch?

Whatever the reason is, if it _is_ likely, then I do not see a point in spending cycle to do get-upstream and merge-base, or giving an option to the user to explicitly specify the base. Given that this series does these things, I'd have to conclude your "likely useful" is "might possibly turn out to be useful in some cases if you are lucky but is no way reliable" at best.

Rather than throwing an unreliable information in the output and blindly proceeding, I'd think you would want to error out and tell the user to explicitly give the base without producing the patch output. That way, you will not get patches with unreliable information.

Suggesting to use set-upstream-to when you give that error message may also be helpful.

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