diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:48:57 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-06 19:58:16 -0400 |
| commit | f2798aa404c32a7ba4a10c1e8657dcacff5188db (patch) | |
| tree | 87d322406df8ad787cd75ba15a61e9482dbab64c /builtin/clone.c | |
| parent | 9a167cb7860d7ae7cd5685434d0194c934800128 (diff) | |
| parent | fcdaa211e6127eeba69a121844e08aec67da2131 (diff) | |
| download | git-f2798aa404c32a7ba4a10c1e8657dcacff5188db.tar.gz | |
Sync with 2.36.3
Signed-off-by: Taylor Blau <me@ttaylorr.com>
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 9e0b2b45ca..3af7dc01bd 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -316,13 +316,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); @@ -338,6 +336,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; |