X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=read-cache.c;h=eb4919e77fa248e379408b8e0f62dfc0a0e5dbbb;hb=4a7e27e95797c0a094f8ee300a260777ddd7eec9;hp=7b1354d7590a70ecbd6e508bdd95eafd4793efcc;hpb=14438c4497c3ab3988cf50ebd504acef3735953c;p=thirdparty%2Fgit.git diff --git a/read-cache.c b/read-cache.c index 7b1354d759..eb4919e77f 100644 --- a/read-cache.c +++ b/read-cache.c @@ -767,7 +767,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, /* It was suspected to be racily clean, but it turns out to be Ok */ was_same = (alias && !ce_stage(alias) && - !oidcmp(&alias->oid, &ce->oid) && + oideq(&alias->oid, &ce->oid) && ce->ce_mode == alias->ce_mode); if (pretend)