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

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

From
Ye Xiaolong <xiaolong.ye@intel.com>
Date
Apr 14, 2016, 14:23 UTC
Message-ID
<20160414142333.GA31621@yexl-desktop>
In-Reply-To
<xmqq7fg2r6fi.fsf@gitster.mtv.corp.google.com>
On Tue, Apr 12, 2016 at 12:08:33PM -0700, Junio C Hamano wrote:
Show 38 quoted lines
>> +static void prepare_bases(struct base_tree_info *bases,
>> +			  const char *base_commit,
>> +			  struct commit **list,
>> +			  int total)
>> +{
>> +	struct commit *base = NULL, *commit;
>> +	struct rev_info revs;
>> +	struct diff_options diffopt;
>> +	unsigned char sha1[20];
>> +	int i;
>> +
>> +	diff_setup(&diffopt);
>> +	DIFF_OPT_SET(&diffopt, RECURSIVE);
>> +	diff_setup_done(&diffopt);
>> +
>> +	base = lookup_commit_reference_by_name(base_commit);
>> +	if (!base)
>> +		die(_("Unknown commit %s"), base_commit);
>> +	oidcpy(&bases->base_commit, &base->object.oid);
>> +
>> +	init_revisions(&revs, NULL);
>> +	revs.max_parents = 1;
>> +	revs.topo_order = 1;
>> +	for (i = 0; i < total; i++) {
>> +		if (!in_merge_bases(base, list[i]) || base == list[i])
>> +			die(_("base commit should be the ancestor of revision list"));
>
>This check looks overly expensive, but I do not think of a more
>efficient way to do this, given that "All the commits from our
>series must reach the specified base" is what you seem to want.
>
>My understanding is that if base=P is given and you are doing
>"format-patch Z..C" in this picture:
>
>    Q---P---Z---B---*---C
>     \             /
>      .-----------A
>

How about we compute the merge base of the specified rev list in cmdline (it should be Q in above case), then check whether specified base (P in this case) could be reachable from it, if it couldn't, we just error out.

Show 10 quoted lines
>your list would become A, B and C, and you want to detect that P is
>not an ancestor of A.  merge_bases_many() computes a wrong thing for
>this use case, and you'd need to go one-by-one.
>
>Unless there is some clever trick to take advantage of the previous
>traversal you made in order to find out A, B and C are the commits
>that are part of your series somehow.
>
>Anybody with clever ideas?
>
Previous: Ye XiaolongNext: Junio C Hamano
Message 6 of 11 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 11, 2016
  2. 1/4 patch-ids: make commit_patch_id() a public helper functionXiaolong Ye, Apr 11, 2016
  3. 2/4 format-patch: add '--base' option to record base tree infoXiaolong Ye, Apr 11, 2016
  4. Junio C HamanoApr 12, 2016
  5. Ye XiaolongApr 13, 2016
  6. Ye XiaolongApr 14, 2016
  7. Junio C HamanoApr 14, 2016
  8. 3/4 format-patch: introduce --base=auto optionXiaolong Ye, Apr 11, 2016
  9. 4/4 format-patch: introduce format.base configurationXiaolong Ye, Apr 11, 2016
  10. Junio C HamanoApr 12, 2016
  11. Ye XiaolongApr 13, 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.