workdir: cleanup after ourselves if branch -d fails