sparse-checkout: create leading directories
The 'git init' command creates the ".git/info" directory and fills it with some default files. However, 'git worktree add' does not create the info directory for that worktree. This causes a problem when running "git sparse-checkout init" inside a worktree. While care was taken to allow the sparse-checkout config to be specific to a worktree, this initialization was untested. Safely create the leading directories for the sparse-checkout file. This is the safest thing to do even without worktrees, as a user could delete their ".git/info" directory and expect Git to recover safely. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Jan 24, 2020 at 21:19 UTC
3c754067a1164ffafd965dcd44a9f004e6100e42
2 files changed
+14
builtin/sparse-checkout.c
+4
@@ -199,6 +199,10 @@ static int write_patterns_and_update(struct pattern_list *pl)
199
int result;
200
201
sparse_filename = get_sparse_checkout_filename();
202
+
203
+ if (safe_create_leading_directories(sparse_filename))
204
+ die(_("failed to create directory for sparse-checkout file"));
205
+
206
fd = hold_lock_file_for_update(&lk, sparse_filename,
207
LOCK_DIE_ON_ERROR);
208
t/t1091-sparse-checkout-builtin.sh
+10
@@ -295,4 +295,14 @@ test_expect_success 'interaction with submodules' '
295
check_files super/modules/child a deep folder1 folder2
296
'
297
298
+test_expect_success 'different sparse-checkouts with worktrees' '
299
+ git -C repo worktree add --detach ../worktree &&
300
+ check_files worktree "a deep folder1 folder2" &&
301
+ git -C worktree sparse-checkout init --cone &&
302
+ git -C repo sparse-checkout set folder1 &&
303
+ git -C worktree sparse-checkout set deep/deeper1 &&
304
+ check_files repo a folder1 &&
305
+ check_files worktree a deep
306
+'
307
+
308
test_done