git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: git@vger.kernel.org, Stefan Beller <stefanbeller@gmail.com>,
	Jeff King <peff@peff.net>, Johannes Sixt <j6t@kdbg.org>,
	Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH v8 6/8] submodule: refactor show_submodule_summary with helper function
Date: Fri, 19 Aug 2016 13:24:20 -0700	[thread overview]
Message-ID: <xmqqk2fc1p8r.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160819000031.24854-7-jacob.e.keller@intel.com> (Jacob Keller's message of "Thu, 18 Aug 2016 17:00:29 -0700")

Jacob Keller <jacob.e.keller@intel.com> writes:

> @@ -290,12 +289,6 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
>  	add_pending_object(rev, &left->object, path);
>  	add_pending_object(rev, &right->object, path);
>  	merge_bases = get_merge_bases(left, right);
> -	if (merge_bases) {
> -		if (merge_bases->item == left)
> -			*fast_forward = 1;
> -		else if (merge_bases->item == right)
> -			*fast_backward = 1;
> -	}
>  	for (list = merge_bases; list; list = list->next) {
>  		list->item->object.flags |= UNINTERESTING;
>  		add_pending_object(rev, &list->item->object,

Not a new issue with this patch, but I wonder if this commit_list is
leaking here.

> +	/*
> +	 * Warn about missing commits in the submodule project, but only if
> +	 * they aren't null.
> +	 */
> +	if ((!is_null_oid(one) && !*left) ||
> +	     (!is_null_oid(two) && !*right))
> +		message = "(commits not present)";
> +
> +	merge_bases = get_merge_bases(*left, *right);
> +	if (merge_bases) {
> +		if (merge_bases->item == *left)
> +			fast_forward = 1;
> +		else if (merge_bases->item == *right)
> +			fast_backward = 1;
> +	}

And probably merge_bases also leaks here.

It is not cheap to compute merge bases, but show_submodule_summary()
makes two calls to get_merge_bases(), one in show_submodule_header()
and then another inside prepare_submodule_summary() to compute
exactly the same set of merge bases.  We somehow need to reduce it
to just one.


  reply	other threads:[~2016-08-19 20:24 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-19  0:00 [PATCH v8 0/8] submodule show inline diff Jacob Keller
2016-08-19  0:00 ` [PATCH v8 1/8] diff.c: remove output_prefix_length field Jacob Keller
2016-08-19  0:00 ` [PATCH v8 2/8] graph: add support for --line-prefix on all graph-aware output Jacob Keller
2016-08-19  0:00 ` [PATCH v8 3/8] diff: prepare for additional submodule formats Jacob Keller
2016-08-19 19:49   ` Junio C Hamano
2016-08-19  0:00 ` [PATCH v8 4/8] submodule: allow add_submodule_odb to work even if path is not checked out Jacob Keller
2016-08-19 20:06   ` Junio C Hamano
2016-08-19 20:32     ` Jacob Keller
2016-08-19 21:11       ` Junio C Hamano
2016-08-19 22:00         ` Jacob Keller
2016-08-19 22:26           ` Junio C Hamano
2016-08-19 23:25             ` Jacob Keller
2016-08-19  0:00 ` [PATCH v8 5/8] submodule: convert show_submodule_summary to use struct object_id * Jacob Keller
2016-08-19 20:12   ` Junio C Hamano
2016-08-19  0:00 ` [PATCH v8 6/8] submodule: refactor show_submodule_summary with helper function Jacob Keller
2016-08-19 20:24   ` Junio C Hamano [this message]
2016-08-19 20:33     ` Jacob Keller
2016-08-19  0:00 ` [PATCH v8 7/8] cache: add empty_tree_oid object Jacob Keller
2016-08-19 20:31   ` Junio C Hamano
2016-08-19 20:35     ` Jacob Keller
2016-08-19 20:50       ` Junio C Hamano
2016-08-19 21:14         ` Junio C Hamano
2016-08-19 22:02           ` Jacob Keller
2016-08-19 20:58     ` Jeff King
2016-08-23 16:28       ` Junio C Hamano
2016-08-19  0:00 ` [PATCH v8 8/8] diff: teach diff to display submodule difference with an inline diff Jacob Keller
2016-08-19 21:52   ` Junio C Hamano
2016-08-19 22:03     ` Jacob Keller

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqqk2fc1p8r.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=jacob.e.keller@intel.com \
    --cc=jacob.keller@gmail.com \
    --cc=peff@peff.net \
    --cc=stefanbeller@gmail.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).