From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 8 Dec 2017 22:29:59 +0000 (+0000)
Subject: sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
X-Git-Tag: v2.17.0-rc0~102^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa9b3b25c68804a96075b233f5b5e0f17ba3e3e2;p=thirdparty%2Fgit.git

sha1dc_git.h: re-arrange an ifdef chain for a subsequent change

A subsequent change will change the semantics of DC_SHA1_SUBMODULE in
a way that would require moving these checks around, so start by
moving them around without any functional changes to reduce the size
of the subsequent patch.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sha1dc_git.h b/sha1dc_git.h
index a8c2729278..41e1c3fd3f 100644
--- a/sha1dc_git.h
+++ b/sha1dc_git.h
@@ -1,9 +1,9 @@
 /* Plumbing with collition-detecting SHA1 code */
 
-#ifdef DC_SHA1_SUBMODULE
-#include "sha1collisiondetection/lib/sha1.h"
-#elif defined(DC_SHA1_EXTERNAL)
+#ifdef DC_SHA1_EXTERNAL
 #include <sha1dc/sha1.h>
+#elif defined(DC_SHA1_SUBMODULE)
+#include "sha1collisiondetection/lib/sha1.h"
 #else
 #include "sha1dc/sha1.h"
 #endif