[PATCH] Remove COLLISION_CHECK from Makefile since it's not used.

Brian Gernhardt· Dec 20, 2006, 03:25 UTC · lore

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>
---

 Subject: Re: Change in git-svn dcommit semantics?

 On Dec 19, 2006, at 7:38 PM, Brian Gernhardt wrote:

 > On Dec 19, 2006, at 6:57 PM, Johannes Schindelin wrote:
 > 
 >>> Mine also has a few variables like "COLLISION_CHECK=paranoid" and my own
 >>> prefix.
 >> 
 >> Just to wake sleeping tigers: have you done a "grep COLLISION_CHECK *"
 >> recently (where recently means any date after May 3rd, 2005)?
 > 
 > Oh, well, that's cute.  It's a configuration option that doesn't touch any
 > code at all...

 Makefile     |    4 ----
 configure.ac |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

Show changes to 2 files +0 −8

Makefile, configure.ac

diff --git a/Makefile b/Makefile
index 8919dab..7651104 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 34e3478..e153d53 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

-- 
1.4.4.1.GIT

patchRemove COLLISION_CHECK from Makefile since it's not used.