Merge branch 'js/grep-mutex' into next
commit6fac2d64191d3ca19e7d16d40b0fc18aeeed373b
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:55:26 +0000 (26 16:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:55:26 +0000 (26 16:55 -0700)
treef6f4a9f6a8bd2f65916033508f140260b15936cd
parent8662ed6af6b3f9bf0f20961c6622b37da5ae5c31
parent764161391f2dd3fc12a5bec1385e0ab40dd90fd6
Merge branch 'js/grep-mutex' into next

* js/grep-mutex:
  builtin/grep: simplify lock_and_read_sha1_file()
  builtin/grep: make lock/unlock into static inline functions
  git grep: be careful to use mutexes only when they are initialized