]> git.ipfire.org Git - thirdparty/git.git/blobdiff - builtin/update-index.c
convert "oidcmp() == 0" to oideq()
[thirdparty/git.git] / builtin / update-index.c
index fe84003b4fa05c377bb4ab1de04a7cd1c9ae4d5d..e7fab78b3b9cf2433342e195a206d8ff3087f9b9 100644 (file)
@@ -669,7 +669,7 @@ static int unresolve_one(const char *path)
                ret = -1;
                goto free_return;
        }
-       if (!oidcmp(&ce_2->oid, &ce_3->oid) &&
+       if (oideq(&ce_2->oid, &ce_3->oid) &&
            ce_2->ce_mode == ce_3->ce_mode) {
                fprintf(stderr, "%s: identical in both, skipping.\n",
                        path);
@@ -754,7 +754,7 @@ static int do_reupdate(int ac, const char **av,
                        old = read_one_ent(NULL, &head_oid,
                                           ce->name, ce_namelen(ce), 0);
                if (old && ce->ce_mode == old->ce_mode &&
-                   !oidcmp(&ce->oid, &old->oid)) {
+                   oideq(&ce->oid, &old->oid)) {
                        discard_cache_entry(old);
                        continue; /* unchanged */
                }