Merge branch 'nd/clone-case-smashing-warning'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:47 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:47 +0000 (13:53 -0700)
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

1  2 
builtin/clone.c
cache.h
entry.c
t/t5601-clone.sh
unpack-trees.c
unpack-trees.h
diff --cc builtin/clone.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc entry.c
Simple merge
Simple merge
diff --cc unpack-trees.c
index f25089b878a8b0842a9d6407cb6b1821867a737c,213da8bbb4f90c5e1cbf572bd8640c6093d22e28..cfa88bb6ec8238a6a6a41d32d646610fd2699048
@@@ -413,7 -465,11 +456,11 @@@ static int check_updates(struct unpack_
        stop_progress(&progress);
        errs |= finish_delayed_checkout(&state);
        if (o->update)
 -              git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
 +              git_attr_set_direction(GIT_ATTR_CHECKIN);
+       if (o->clone)
+               report_collided_checkout(index);
        return errs != 0;
  }
  
diff --cc unpack-trees.h
Simple merge