From: Junio C Hamano Date: Fri, 02 Jun 2017 01:31:07 GMT Subject: Re: [PATCH 30/33] tree-diff: convert diff_tree_paths to struct object_id Message-ID: In-Reply-To: <20170530173109.54904-31-bmwill@google.com> Brandon Williams writes: > @@ -220,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, sha1); > + p = path_appendnew(p, nparent, base, path, pathlen, mode, oid ? oid->hash : NULL); This is a correct conversion, but it shows that "struct oid" that has "hash" sometimes makes things a bit cumbersome. Perhaps path_appendnew() and friends need to learn to take a pointer to "struct oid" next.