Fix bugs in git-extract

@kevgo please review

1. The created branch was not being deleted if aborted the cherry-pick
2. When passing in multiple SHAs, only the first was being used.
These two statements don't seem to belong together. I would put them on separate lines.