diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-01 22:05:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-03 10:09:37 -0700 |
| commit | cac87dc01d30ed8fc00f5b872a7ee7804f7b9ffa (patch) | |
| tree | b2df54c9096cd60cbede774fd260f12bfd97a92c /Makefile | |
| parent | 86cfd61e6bc12745751c43b4f69886b290cd85cb (diff) | |
| download | git-cac87dc01d30ed8fc00f5b872a7ee7804f7b9ffa.tar.gz | |
sha1collisiondetection: automatically enable when submodule is populatedab/sha1dc
If a user wants to experiment with the version of collision
detecting sha1 from the submodule, the user needed to not just
populate the submodule but also needed to turn the knob.
A Makefile trick is easy enough to do so, so let's do this. When
somebody with a copy of the submodule populated wants not to use it,
that can be done by overriding it in config.mak or from the command
line.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -989,6 +989,10 @@ EXTLIBS = GIT_USER_AGENT = git/$(GIT_VERSION) +ifeq ($(wildcard sha1collisiondetection/lib/sha1.h),sha1collisiondetection/lib/sha1.h) +DC_SHA1_SUBMODULE = auto +endif + include config.mak.uname -include config.mak.autogen -include config.mak |