From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Mar 2017 20:50:27 +0000 (-0700)
Subject: Merge branch 'bc/sha1-header-selection-with-cpp-macros'
X-Git-Tag: v2.13.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81944e9b54039f8475d1df5c40e5a1055eae14f6;p=thirdparty%2Fgit.git

Merge branch 'bc/sha1-header-selection-with-cpp-macros'

Our source code has used the SHA1_HEADER cpp macro after "#include"
in the C code to switch among the SHA-1 implementations. Instead,
list the exact header file names and switch among implementations
using "#ifdef BLK_SHA1/#include "block-sha1/sha1.h"/.../#endif";
this helps some IDE tools.

* bc/sha1-header-selection-with-cpp-macros:
  hash.h: move SHA-1 implementation selection into a header file
---

81944e9b54039f8475d1df5c40e5a1055eae14f6