Commit cc93ad16502ea09b1923ca9eb1b291ced646cf38
2015-04-15T15:27:59
Removed unnecessary condition The variable noid is guaranteed to be zero at this point of the code path.
diff --git a/src/diff.c b/src/diff.c
index 20f8f74..ba8a1b8 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -806,15 +806,12 @@ static int maybe_modified(
* haven't calculated the OID of the new item, then calculate it now
*/
if (modified_uncertain && git_oid_iszero(&nitem->id)) {
- if (git_oid_iszero(&noid)) {
- const git_oid *update_check =
- DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) ?
- &oitem->id : NULL;
-
- if ((error = git_diff__oid_for_entry(
- &noid, diff, nitem, update_check)) < 0)
- return error;
- }
+ const git_oid *update_check =
+ DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) ?
+ &oitem->id : NULL;
+ if ((error = git_diff__oid_for_entry(
+ &noid, diff, nitem, update_check)) < 0)
+ return error;
/* if oid matches, then mark unmodified (except submodules, where
* the filesystem content may be modified even if the oid still