From 7f44842ac198c8fbf76c513cb69b66bdc54d59e8 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Fri, 21 Jan 2022 09:44:41 -0800 Subject: [PATCH] sparse-checkout: create leading directory When creating the sparse-checkout file, Git does not create the leading directory, "$GIT_DIR/info", if it does not exist. This causes problems if the repository does not have that directory. Therefore, ensure that the leading directory is created. This is the only "open" in builtin/sparse-checkout.c that does not have a leading directory check. (The other one in write_patterns_and_update() does.) Note that the test needs to explicitly specify a template when running "git init" because the default template used in the tests has the "info/" directory included. Helped-by: Jose Lopes Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- builtin/sparse-checkout.c | 3 +++ t/t1091-sparse-checkout-builtin.sh | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index d0f5c4702b..7a2be2a43e 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -450,6 +450,9 @@ static int sparse_checkout_init(int argc, const char **argv) FILE *fp; /* assume we are in a fresh repo, but update the sparse-checkout file */ + if (safe_create_leading_directories(sparse_filename)) + die(_("unable to create leading directories of %s"), + sparse_filename); fp = xfopen(sparse_filename, "w"); if (!fp) die(_("failed to open '%s'"), sparse_filename); diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index 272ba1b566..41b7984c59 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -71,6 +71,12 @@ test_expect_success 'git sparse-checkout init' ' check_files repo a ' +test_expect_success 'git sparse-checkout init in empty repo' ' + test_when_finished rm -rf empty-repo blank-template && + git init --template= empty-repo && + git -C empty-repo sparse-checkout init +' + test_expect_success 'git sparse-checkout list after init' ' git -C repo sparse-checkout list >actual && cat >expect <<-\EOF &&