diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-10-17 15:46:09 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 15:46:09 -0700 |
commit | 9c32cfb49c60fa8173b9666db02efe3b45a8522f (patch) | |
tree | 0f74dce4f7278f25cd61bd87baeb400f127ac1b1 /builtin/clone.c | |
parent | 4732897cf0a255a23dca9e97b65cea40cd06c5a8 (diff) | |
parent | d5b41391a472dcf9486055fd5b8517f893e88daf (diff) | |
download | git-9c32cfb49c60fa8173b9666db02efe3b45a8522f.tar.gz |
Sync with v2.38.1
Diffstat (limited to 'builtin/clone.c')
-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 ed8d44bb6a..547d6464b3 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -320,13 +320,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); @@ -342,6 +340,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; |