proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 21:44:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix regression in diff with submodule oid

Browse Source
This commit is contained in:
Russell Belfer 2012-11-08 21:58:24 -08:00
parent ad9a921b92
commit a1bf70e4c9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/diff.c
View File

@ -506,16 +506,15 @@ static int maybe_modified(
/* if we got here and decided that the files are modified, but we
* haven't calculated the OID of the new item, then calculate it now
*/
if (status != GIT_DELTA_UNMODIFIED &&
git_oid_iszero(&nitem->oid) && !use_noid)
{
if (git_diff__oid_for_file(diff->repo,
nitem->path, nitem->mode, nitem->file_size, &noid) < 0)
return -1;
if (omode == nmode && git_oid_equal(&oitem->oid, &noid))
if (status != GIT_DELTA_UNMODIFIED && git_oid_iszero(&nitem->oid)) {
if (!use_noid) {
if (git_diff__oid_for_file(diff->repo,
nitem->path, nitem->mode, nitem->file_size, &noid) < 0)
return -1;
use_noid = &noid;
}
if (omode == nmode && git_oid_equal(&oitem->oid, use_noid))
status = GIT_DELTA_UNMODIFIED;
/* store calculated oid so we don't have to recalc later */
use_noid = &noid;
}
return diff_delta__from_two(