Merge branch 'bb/unicode-12.1-reiwa' into maint

diff --git a/builtin/rm.c b/builtin/rm.c
index 2cbe89e0ae3b7a4801ac27d25fd37306813104ba..90cbe896c99188130a36a18aa18a57cd080be591 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) Linus Torvalds 2006
  */
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
 #include "config.h"
 #include "lockfile.h"
@@ -109,7 +110,7 @@ static int check_local_mod(struct object_id *head, int index_only)
                const struct cache_entry *ce;
                const char *name = list.entry[i].name;
                struct object_id oid;
-               unsigned mode;
+               unsigned short mode;
                int local_changes = 0;
                int staged_changes = 0;
 
@@ -180,7 +181,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;
 
                /*