Merge branch 'jk/test-fixes' into maint

Test fixes. * jk/test-fixes: t7800: don't rely on reuse_worktree_file() t4018: drop "debugging" cat from hunk-header tests

Junio C Hamano committed Feb 14, 2020 at 12:42 UTC 8a17eb7972401244c585f4ad7e33452a767c3617

No changes.