Merge branch 'rv/grep-cleanup' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Feb 2018 21:27:58 +0000 (13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Feb 2018 21:27:58 +0000 (13:27 -0800)
commit8437687ec0998c101e97efb239fc3a7afdad35a9
tree032f9e03e8563fe3ee5a6eea3923d8d9bda15d41
parent68014981a8ad4eb47e165d8a0ae3f02be5fc5e57
parent38ef24dccfb696393d2e8e701bf2f81c9e6275e2
Merge branch 'rv/grep-cleanup' into jch

* rv/grep-cleanup:
  grep: simplify grep_oid and grep_file
  grep: move grep_source_init outside critical section
builtin/grep.c