Merge branch 'jh/trace2'
A few embarrassing bugfixes.* jh/trace2: trace2: fix up a missing "leave" entry point trace2: fix incorrect function pointer check
Junio C Hamano 6 years ago 49bc8ce5 40bef499