builtin/fmt-merge-message: convert to struct object_id

diff --git a/builtin/rm.c b/builtin/rm.c
index 20635dca94e874c812461f3aec7c860700d78a62..452170a3ab45d24e03ab11965448572a411c349f 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -265,7 +265,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
        if (!index_only)
                setup_work_tree();
 
-       hold_locked_index(&lock_file, 1);
+       hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
 
        if (read_cache() < 0)
                die(_("index file corrupt"));