Correct logic from merge to fix t1020-subdirectory.sh.