Re: [PATCH 2/2] combine-diff: speed it up, by using multiparent diff tree-walker directly

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Kirill Smelkov <kirr@xxxxxxxxxx> 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.
 */
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]