Merge branch 'pw/rebase-progress-test-cleanup'

diff --git a/builtin/rm.c b/builtin/rm.c
index be8edc6d1e1185fa0224b516c0e4f73ceb590aa3..2eacda42b4a8fff746e846891fce0107d80efbe1 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -179,7 +179,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, name, &oid, &mode)
+                    || get_tree_entry(the_repository, head, name, &oid, &mode)
                     || ce->ce_mode != create_ce_mode(mode)
                     || !oideq(&ce->oid, &oid))
                        staged_changes = 1;