resolve #150: optimize git-ship checkouts

@kevgo please review
I like it as local. Keeps the call to `ensure_is_feature_branch` nice and readable