Merge branch 'nd/travis-gcc-8'

diff --git a/builtin/rm.c b/builtin/rm.c
index 0fcb952e9b1dd8a40c62c4bd2f8538a03e00b0f7..65b448ef8ee91079194841762d4b7a2193eec9a9 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -178,7 +178,7 @@ static int check_local_mod(struct object_id *head, int index_only)
                 * way as changed from the HEAD.
                 */
                if (no_head
-                    || get_tree_entry(head->hash, name, oid.hash, &mode)
+                    || get_tree_entry(head, name, &oid, &mode)
                     || ce->ce_mode != create_ce_mode(mode)
                     || oidcmp(&ce->oid, &oid))
                        staged_changes = 1;