Merge branch 'jk/sha1-loose-object-info-fix' into maint

diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index d5948826c8b2c4c4e6c2dbd4f036d0f814a7b8c2..25eded1399a8c3ae1532074ccdd388b24e660071 100644 (file)
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -962,7 +962,7 @@ static void sha1recompress_fast_ ## t (uint32_t ihvin[5], uint32_t ihvout[5], co
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4127)  /* Complier complains about the checks in the above macro being constant. */
+#pragma warning(disable: 4127)  /* Compiler complains about the checks in the above macro being constant. */
 #endif
 
 #ifdef DOSTORESTATE0