clone: copy hidden paths at local clone

Make the copy_or_link_directory function no longer skip hidden
directories. This function, used to copy .git/objects, currently skips
all hidden directories but not hidden files, which is an odd behaviour.
The reason for that could be unintentional: probably the intention was
to skip '.' and '..' only but it ended up accidentally skipping all
directories starting with '.'. Besides being more natural, the new
behaviour is more permissive to the user.

Also adjust tests to reflect this behaviour change.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Co-authored-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/clone.c b/builtin/clone.c
index 5956b1c8e6bce0dc43ef0cc39014feb18c69bdcb..541f0e1be333a35b47e7b8ad69042c46ec7724c4 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -427,7 +427,7 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
                        continue;
                }
                if (S_ISDIR(buf.st_mode)) {
                        continue;
                }
                if (S_ISDIR(buf.st_mode)) {

-                       if (de->d_name[0] != '.')
+                       if (!is_dot_or_dotdot(de->d_name))

                                copy_or_link_directory(src, dest,
                                                       src_repo, src_baselen);
                        continue;
                                copy_or_link_directory(src, dest,
                                                       src_repo, src_baselen);
                        continue;

diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 459ad8a20b19d9260e43b014283758d1932cd23b..4894237ab8059c83aea8aae50a0803ebf9df6831 100755 (executable)
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -247,16 +247,25 @@ test_expect_success 'clone a repo with garbage in objects/*' '
        done &&
        find S-* -name "*some*" | sort >actual &&
        cat >expected <<-EOF &&
        done &&
        find S-* -name "*some*" | sort >actual &&
        cat >expected <<-EOF &&

+       S--dissociate/.git/objects/.some-hidden-dir
+       S--dissociate/.git/objects/.some-hidden-dir/.some-dot-file
+       S--dissociate/.git/objects/.some-hidden-dir/some-file

        S--dissociate/.git/objects/.some-hidden-file
        S--dissociate/.git/objects/some-dir
        S--dissociate/.git/objects/some-dir/.some-dot-file
        S--dissociate/.git/objects/some-dir/some-file
        S--dissociate/.git/objects/some-file
        S--dissociate/.git/objects/.some-hidden-file
        S--dissociate/.git/objects/some-dir
        S--dissociate/.git/objects/some-dir/.some-dot-file
        S--dissociate/.git/objects/some-dir/some-file
        S--dissociate/.git/objects/some-file

+       S--local/.git/objects/.some-hidden-dir
+       S--local/.git/objects/.some-hidden-dir/.some-dot-file
+       S--local/.git/objects/.some-hidden-dir/some-file

        S--local/.git/objects/.some-hidden-file
        S--local/.git/objects/some-dir
        S--local/.git/objects/some-dir/.some-dot-file
        S--local/.git/objects/some-dir/some-file
        S--local/.git/objects/some-file
        S--local/.git/objects/.some-hidden-file
        S--local/.git/objects/some-dir
        S--local/.git/objects/some-dir/.some-dot-file
        S--local/.git/objects/some-dir/some-file
        S--local/.git/objects/some-file

+       S--no-hardlinks/.git/objects/.some-hidden-dir
+       S--no-hardlinks/.git/objects/.some-hidden-dir/.some-dot-file
+       S--no-hardlinks/.git/objects/.some-hidden-dir/some-file

        S--no-hardlinks/.git/objects/.some-hidden-file
        S--no-hardlinks/.git/objects/some-dir
        S--no-hardlinks/.git/objects/some-dir/.some-dot-file
        S--no-hardlinks/.git/objects/.some-hidden-file
        S--no-hardlinks/.git/objects/some-dir
        S--no-hardlinks/.git/objects/some-dir/.some-dot-file