projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01d5fc0 f18f816)
Merge branch 'bc/sha1-header-selection-with-cpp-macros' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Mar 2017 18:01:21 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Mar 2017 18:01:21 +0000 (11:01 -0700)
commit71c3a4f4ba376658589b3a1ab0ef85fab57c3094
treedc9ba46191126d1f26975490d97f66606813b3e9tree | snapshot
parent01d5fc03a1311c5a764aa63be7784369bbf8c650commit | diff
parentf18f816cb1586e9aab3e30a7144768e0d282d305commit | diff
Merge branch 'bc/sha1-header-selection-with-cpp-macros' into next

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
Makefile diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.