Merge pull request #735 from gregier/development

Fix checking for the presence of a flag
This commit is contained in:
Russell Belfer 2012-05-29 09:59:55 -07:00
commit 1835c51f58

View File

@ -387,7 +387,7 @@ int git_diff_foreach(
if (error < 0) if (error < 0)
goto cleanup; goto cleanup;
if ((delta->new_file.flags | GIT_DIFF_FILE_VALID_OID) == 0) { if ((delta->new_file.flags & GIT_DIFF_FILE_VALID_OID) == 0) {
error = git_odb_hash( error = git_odb_hash(
&delta->new_file.oid, new_data.data, new_data.len, GIT_OBJ_BLOB); &delta->new_file.oid, new_data.data, new_data.len, GIT_OBJ_BLOB);