X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=diff.c;h=1010d806f50dac47927f6f70125647e9bf8276ef;hb=784ce03d5566194880b022f849bb58711c479ef3;hp=f2cfbf2214a29fc9ddf0e356230df7625d3d1139;hpb=0df82d99dae85dbd4f667e95020a146ea0167975;p=thirdparty%2Fgit.git diff --git a/diff.c b/diff.c index f2cfbf2214..1010d806f5 100644 --- a/diff.c +++ b/diff.c @@ -4062,6 +4062,9 @@ static void prep_temp_blob(struct index_state *istate, struct strbuf tempfile = STRBUF_INIT; char *path_dup = xstrdup(path); const char *base = basename(path_dup); + struct checkout_metadata meta; + + init_checkout_metadata(&meta, NULL, NULL, oid); /* Generate "XXXXXX_basename.ext" */ strbuf_addstr(&tempfile, "XXXXXX_"); @@ -4071,7 +4074,7 @@ static void prep_temp_blob(struct index_state *istate, if (!temp->tempfile) die_errno("unable to create temp-file"); if (convert_to_working_tree(istate, path, - (const char *)blob, (size_t)size, &buf)) { + (const char *)blob, (size_t)size, &buf, &meta)) { blob = buf.buf; size = buf.len; }