Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint

* jc/apply-ws-fix-tab-in-indent:
  test: resurrect q_to_tab
  apply --whitespace=fix: avoid running over the postimage buffer

diff --cc builtin/apply.c
Simple merge

diff --cc t/t4124-apply-ws-rule.sh
Simple merge

diff --cc t/test-lib-functions.sh
Simple merge