Merge branch 'sb/submodule-config-cleanup'

diff --git a/builtin/clone.c b/builtin/clone.c
index e3cb8082f7e83b4f233d55bfba78417ebdada114..5ef81927a629985aa4f0de6acba326f79747e7aa 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -711,7 +711,7 @@ static int checkout(int submodule_progress)
        setup_work_tree();
 
        lock_file = xcalloc(1, sizeof(struct lock_file));
-       hold_locked_index(lock_file, 1);
+       hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
 
        memset(&opts, 0, sizeof opts);
        opts.update = 1;