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

Merge pull request #3047 from git-up/diff_fixes

Browse Source 
Diff fixes
This commit is contained in:
Edward Thomson 2015-04-17 12:32:39 -05:00
commit a5bf599c9d
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/diff.c
View File

@ -621,7 +621,7 @@ int git_diff__oid_for_entry(
git_index *idx; git_index *idx;
if (!(error = git_repository_index__weakptr(&idx, diff->repo))) { if (!(error = git_repository_index__weakptr(&idx, diff->repo))) {
memcpy(&entry.id, out, sizeof(entry.id)); git_oid_cpy(&entry.id, out);
error = git_index_add(idx, &entry); error = git_index_add(idx, &entry);
} }
} }
@ -806,15 +806,12 @@ static int maybe_modified(
* haven't calculated the OID of the new item, then calculate it now * haven't calculated the OID of the new item, then calculate it now
*/ */
if (modified_uncertain && git_oid_iszero(&nitem->id)) { if (modified_uncertain && git_oid_iszero(&nitem->id)) {
if (git_oid_iszero(&noid)) { const git_oid *update_check =
const git_oid *update_check = DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) && omode == nmode ?
DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) ? &oitem->id : NULL;
&oitem->id : NULL; if ((error = git_diff__oid_for_entry(
&noid, diff, nitem, update_check)) < 0)
if ((error = git_diff__oid_for_entry( return error;
&noid, diff, nitem, update_check)) < 0)
return error;
}
/* if oid matches, then mark unmodified (except submodules, where /* if oid matches, then mark unmodified (except submodules, where
* the filesystem content may be modified even if the oid still * the filesystem content may be modified even if the oid still