cherry-pick/revert: reject --rerere-autoupdate when continuing

diff --git a/hash.h b/hash.h
index a11fc9233fc9bb7d876e2e97a1a149260d7a633c..bef3e630a093b508e78419c5f4e228e836ecb88c 100644 (file)
--- a/hash.h
+++ b/hash.h
@@ -8,7 +8,11 @@
 #elif defined(SHA1_OPENSSL)
 #include <openssl/sha.h>
 #elif defined(SHA1_DC)
+#ifdef DC_SHA1_SUBMODULE
+#include "sha1collisiondetection/lib/sha1.h"
+#else
 #include "sha1dc/sha1.h"
+#endif
 #else /* SHA1_BLK */
 #include "block-sha1/sha1.h"
 #endif