From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 02 Jun 2017 01:32:13 GMT
Subject: Re: [PATCH 31/33] tree-diff: convert path_appendnew to object_id
Message-ID: <xmqq4lvz2mzm.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170530173109.54904-32-bmwill@google.com>

Brandon Williams <bmwill@google.com> writes:

> @@ -221,7 +221,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
>  	if (emitthis) {
>  		int keep;
>  		struct combine_diff_path *pprev = p;
> -		p = path_appendnew(p, nparent, base, path, pathlen, mode, oid ? oid->hash : NULL);
> +		p = path_appendnew(p, nparent, base, path, pathlen, mode, oid);
>  
>  		for (i = 0; i < nparent; ++i) {
>  			/*

Ahh, it happens here ;-)

And of course, the order of these two patches cannot be swapped, so
this is the best organization of the series.