Refactor version checking in import-upstream
Always make a commit in rebase (even when empty)
Always run pre/post patch in generate