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

Merge pull request #3931 from libgit2/ethomson/checkout_dont_calculate_oid_for_dirs

Browse Source 
checkout: don't try to calculate oid for directories
This commit is contained in:
Edward Thomson 2016-10-01 19:32:16 -05:00 committed by GitHub
commit 9fbbb0eec5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/checkout.c
View File

@ -212,6 +212,10 @@ static bool checkout_is_workdir_modified(
if (baseitem->size && wditem->file_size != baseitem->size)
return true;
/* if the workdir item is a directory, it cannot be a modified file */
if (S_ISDIR(wditem->mode))
return false;
if (git_diff__oid_for_entry(&oid, data->diff, wditem, wditem->mode, NULL) < 0)
return false;