Brandon Williams [off-list ref] writes:
quoted hunk
@@ -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.