import-upstream was leaving behind a directory from unpacking the
upstream source, which under some circumstances was getting imported
into the upstream branch (if, for instance, the script was run twice
in succession). Make sure it's gone with rm -rf.