From: Junio C Hamano <gitster@pobox.com>
To: Kirill Smelkov <kirr@mns.spb.ru>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] combine-diff: speed it up, by using multiparent diff tree-walker directly
Date: Thu, 13 Feb 2014 11:55:08 -0800 [thread overview]
Message-ID: <xmqq7g8ylrdv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <f74c494d4afd0f7428288ce1099a91c9d2ae2125.1392299516.git.kirr@mns.spb.ru> (Kirill Smelkov's message of "Thu, 13 Feb 2014 18:02:55 +0400")
Kirill Smelkov <kirr@mns.spb.ru> writes:
> + if (need_generic_pathscan) {
> + /* NOTE generic case also handles --stat, as it computes
> + * diff(sha1,parent_i) for all i to do the job, specifically
> + * for parent0.
> + */
> + paths = find_paths_generic(sha1, parents, &diffopts);
> + }
> + else {
> + paths = find_paths_multitree(sha1, parents, &diffopts);
> +
> + /* show stat against the first parent even
> + * when doing combined diff.
> + */
> + int stat_opt = (opt->output_format &
> + (DIFF_FORMAT_NUMSTAT|DIFF_FORMAT_DIFFSTAT));
/*
* We see decl-after-stmt here.
* Also please have slash-asterisk and asterisk-slash
* at the beginning and the end of a multi-line comment
* block on their own line.
*/
next prev parent reply other threads:[~2014-02-13 19:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-13 14:02 [PATCH 0/2] Multiparent diff tree-walker + combine-diff speedup Kirill Smelkov
2014-02-13 14:02 ` [PATCH 1/2] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well Kirill Smelkov
2014-02-13 19:51 ` Junio C Hamano
2014-02-14 12:15 ` Kirill Smelkov
2014-02-14 17:37 ` Junio C Hamano
2014-02-16 8:08 ` Kirill Smelkov
2014-02-18 21:29 ` Junio C Hamano
2014-02-13 14:02 ` [PATCH 2/2] combine-diff: speed it up, by using multiparent diff tree-walker directly Kirill Smelkov
2014-02-13 19:55 ` Junio C Hamano [this message]
2014-02-14 12:16 ` Kirill Smelkov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7g8ylrdv.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kirr@mns.spb.ru \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.