diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:47 -0700 |
| commit | c2407322b6f248955d8ce8d1d453f2dc1b03e618 (patch) | |
| tree | bb7e887651dc1023ebc3ab432fd7b678ed8549e0 /unpack-trees.h | |
| parent | 660946196c521d270daef531a65a9b626d0a642c (diff) | |
| parent | b878579ae755e3a9d200093ced59ada3eaafb08c (diff) | |
| download | git-c2407322b6f248955d8ce8d1d453f2dc1b03e618.tar.gz git-c2407322b6f248955d8ce8d1d453f2dc1b03e618.tar.xz | |
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 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 847f217db..0135080a7 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -45,6 +45,7 @@ struct unpack_trees_options { unsigned int reset, merge, update, + clone, index_only, nontrivial_merge, trivial_merges_only, |