Merge branch 'jk/test-fixes'

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 Jan 30, 2020 at 14:17 UTC 0afeb3fdf4be28189a26df1d9158bc182da637cd

No changes.