summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2012-05-29 09:59:55 -0700
committerRussell Belfer <rb@github.com>2012-05-29 09:59:55 -0700
commit1835c51f58a670e23c9546f942259d53fe626fa2 (patch)
treed2e182a4cea2e5e952f66201fa1af2d1af60fc17
parent4c977a61e598f2230e9902aa80cfea8e89d94f88 (diff)
parent2ab9dcbd6228741d31f9e823283030c0b42555b4 (diff)
downloadlibgit2-1835c51f58a670e23c9546f942259d53fe626fa2.tar.gz
Merge pull request #735 from gregier/development
Fix checking for the presence of a flag
-rw-r--r--src/diff_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff_output.c b/src/diff_output.c
index ba7ef8245..5ffa641c4 100644
--- 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);