Merge branch 'rv/grep-cleanup' into next

Threaded "git grep" has been optimized to avoid allocation in code
section that is covered under a mutex.

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

diff --cc builtin/grep.c
Simple merge