summaryrefslogtreecommitdiff
path: root/mergetools/bc
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2017-03-11 22:28:18 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-15 11:00:09 -0700
commitf18f816cb1586e9aab3e30a7144768e0d282d305 (patch)
treeab20ace5a3723ed57b37bb93ca2c36267ca3592f /mergetools/bc
parentGit 2.12 (diff)
downloadtgif-f18f816cb1586e9aab3e30a7144768e0d282d305.tar.xz
hash.h: move SHA-1 implementation selection into a header file
Many developers use functionality in their editors that allows for quick syntax checks, including warning about questionable constructs. This functionality allows rapid development with fewer errors. However, such functionality generally does not allow the specification of project-specific defines or command-line options. Since the SHA1_HEADER include is not defined in such a case, developers see spurious errors when using these tools. Furthermore, there are known implementations of "cc" whose '#include' is unhappy with this construct. Instead of using SHA1_HEADER, create a hash.h header and use #if and #elif to select the desired header. Have the Makefile pass an appropriate option to help the header select the right implementation to use. [jc: make BLK_SHA1 the fallback default as discussed on list, e.g. <20170314201424.vccij5z2ortq4a4o@sigill.intra.peff.net>; also remove SHA1_HEADER and SHA1_HEADER_SQ that are no longer used]. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/bc')
0 files changed, 0 insertions, 0 deletions