summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:47 (GMT)
commitc2407322b6f248955d8ce8d1d453f2dc1b03e618 (patch)
treebb7e887651dc1023ebc3ab432fd7b678ed8549e0 /builtin/clone.c
parent660946196c521d270daef531a65a9b626d0a642c (diff)
parentb878579ae755e3a9d200093ced59ada3eaafb08c (diff)
downloadgit-c2407322b6f248955d8ce8d1d453f2dc1b03e618.zip
git-c2407322b6f248955d8ce8d1d453f2dc1b03e618.tar.gz
git-c2407322b6f248955d8ce8d1d453f2dc1b03e618.tar.bz2
Merge branch 'nd/clone-case-smashing-warning'
Running "git clone" against a project that contain two files with pathnames that differ only in cases on a case insensitive filesystem would result in one of the files lost because the underlying filesystem is incapable of holding both at the same time. An attempt is made to detect such a case and warn. * nd/clone-case-smashing-warning: clone: report duplicate entries on case-insensitive filesystems
Diffstat (limited to 'builtin/clone.c')
-rw-r--r--builtin/clone.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index fd2c3ef..15b142d 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -748,6 +748,7 @@ static int checkout(int submodule_progress)
memset(&opts, 0, sizeof opts);
opts.update = 1;
opts.merge = 1;
+ opts.clone = 1;
opts.fn = oneway_merge;
opts.verbose_update = (option_verbosity >= 0);
opts.src_index = &the_index;