Merge branch 'cb/diff-fname-optim' into maint

* cb/diff-fname-optim: diff: avoid repeated scanning while looking for funcname do not search functions for patch ID add rebase patch id tests