summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2006-12-19 22:25:13 -0500
committerJunio C Hamano <junkio@cox.net>2006-12-19 21:33:35 -0800
commitc17f9f12a4a8d224e5cff6bcfa6191450f90fa0b (patch)
tree4bd753d9c2dcc3f58e333242ccdb1e4a211de510
parent5caf92322303a0942e0cee5a93cb24f2d8d44022 (diff)
downloadgit-c17f9f12a4a8d224e5cff6bcfa6191450f90fa0b.tar.gz
Remove COLLISION_CHECK from Makefile since it's not used.
It's rather misleading to have configuration options that don't do anything. If someone adds collision checking they might also want to restore this option. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile4
-rw-r--r--configure.ac4
2 files changed, 0 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 8919dabc78..76511045a8 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,6 @@ all:
# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
# a missing newline at the end of the file.
#
-# Define COLLISION_CHECK below if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# sufficient guarantee that no collisions between objects will ever happen.
-#
# Define USE_NSEC below if you want git to care about sub-second file mtimes
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
diff --git a/configure.ac b/configure.ac
index 34e34789bd..e153d53823 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,10 +316,6 @@ GIT_PARSE_WITH(iconv))
## --enable-FEATURE[=ARG] and --disable-FEATURE
#
-# Define COLLISION_CHECK below if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# sufficient guarantee that no collisions between objects will ever happen.
-#
# Define USE_NSEC below if you want git to care about sub-second file mtimes
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely