Brandon Williams <bmwill@xxxxxxxxxx> 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.
