Merge pull request #735 from gregier/development

Fix checking for the presence of a flag

Merge pull request #735 from gregier/development
Fix checking for the presence of a flag
1835c51f · Russell Belfer · 4c977a61 · 2ab9dcbd · 1835c51f
Commit 1835c51f authored May 29, 2012 by Russell Belfer
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/diff_output.c
+1 -1

No files found.
--- a/src/diff_output.c
+++ b/src/diff_output.c
@@ -387,7 +387,7 @@ int git_diff_foreach(
 			if (error < 0)
 				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(
 					&delta->new_file.oid, new_data.data, new_data.len, GIT_OBJ_BLOB);