diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:43:37 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:43:37 -0400 |
| commit | ac8a1db86793292dfc7055eeef2fe90459e771aa (patch) | |
| tree | b2bfe2c51a837c8efb73b7b52c749d9127e6b646 /builtin | |
| parent | ef374dd9b8eecaf84458677865732b89948c19be (diff) | |
| parent | be85cfc4dbef9ffa177770f8607fd4a85445565e (diff) | |
| download | git-ac8a1db86793292dfc7055eeef2fe90459e771aa.tar.xz | |
Sync with 2.34.5
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 727e16e0ae..ef6f46b389 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -310,13 +310,11 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, int src_len, dest_len; struct dir_iterator *iter; int iter_status; - unsigned int flags; struct strbuf realpath = STRBUF_INIT; mkdir_if_missing(dest->buf, 0777); - flags = DIR_ITERATOR_PEDANTIC | DIR_ITERATOR_FOLLOW_SYMLINKS; - iter = dir_iterator_begin(src->buf, flags); + iter = dir_iterator_begin(src->buf, DIR_ITERATOR_PEDANTIC); if (!iter) die_errno(_("failed to start iterator over '%s'"), src->buf); @@ -332,6 +330,10 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, strbuf_setlen(dest, dest_len); strbuf_addstr(dest, iter->relative_path); + if (S_ISLNK(iter->st.st_mode)) + die(_("symlink '%s' exists, refusing to clone with --local"), + iter->relative_path); + if (S_ISDIR(iter->st.st_mode)) { mkdir_if_missing(dest->buf, 0777); continue; |