projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0955895 2236960)
Merge branch 'bc/sha1-header-selection-with-cpp-macros' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Mar 2017 22:37:32 +0000 (15:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Mar 2017 22:37:32 +0000 (15:37 -0700)
commit60bf8c5822dd8b3d073e998f03a7ed7f730d1428
treea3ba0fae556f888a18fdf4fee43e54c0ac811f6atree | snapshot
parent09558958255da78c9b85dbc3e46de3eff875d968commit | diff
parent22369609570e6329e079b5d7f37a7c32063f336ccommit | 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.