Merge branch 'jc/worktree-add-short-help' into maint

diff --git a/cache-tree.c b/cache-tree.c
index e03e72c34a5c1fc618994ee63f38875d28d91886..0dd6292a94e55baff0a42df89c7006a757f61065 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -608,7 +608,7 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co
 
        hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR);
 
-       entries = read_index_from(index_state, index_path);
+       entries = read_index_from(index_state, index_path, get_git_dir());
        if (entries < 0) {
                ret = WRITE_TREE_UNREADABLE_INDEX;
                goto out;