Merge branch 'jk/save-getenv-result'

diff --git a/builtin/rm.c b/builtin/rm.c
index 2cbe89e0ae3b7a4801ac27d25fd37306813104ba..17086d3d97c536522720c589ea8f35d366536ea8 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -180,7 +180,7 @@ static int check_local_mod(struct object_id *head, int index_only)
                if (no_head
                     || get_tree_entry(head, name, &oid, &mode)
                     || ce->ce_mode != create_ce_mode(mode)
-                    || oidcmp(&ce->oid, &oid))
+                    || !oideq(&ce->oid, &oid))
                        staged_changes = 1;
 
                /*