Merge branch 'sb/submodule-config-cleanup'

diff --git a/builtin/rm.c b/builtin/rm.c
index 3f3e24eb36af03481f4e7b3f4d22d8e4b5904593..7f15a3d7f82a7b610dcb8c6c9f713b485614e2f7 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -292,7 +292,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"));