diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-06 20:00:04 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-06 20:00:04 -0400 |
| commit | f64d4ca8d65bdca39da444d24bde94864ac01bb1 (patch) | |
| tree | edc9055c3dc8e378474c951ad6a3513deaa777d0 /builtin/clone.c | |
| parent | 3dcec76d9df911ed8321007b1d197c1a206dc164 (diff) | |
| parent | 83d5e3341b69b3116675f13d2fab208a12c79e27 (diff) | |
Sync with 2.37.4
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 d269d6fec6..5d7affc29a 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; |