tree d6bbbba535e08a7df89bc92101c77db872e5e577
parent bae8fecfea07cdc262e0a4560389404fd5f820c5
author James E. Blair <jeblair@redhat.com> 1511973898 -0800
committer James E. Blair <jeblair@redhat.com> 1511973898 -0800

Fix branch checkout order

Since we're deprecating override-branch in favor of override-checkout,
favor override-checkout when deciding which to use.

Also, change an if to elif to make sure we only do one of these.

Change-Id: I55a94188d9894df27d99416cd3cefff8f3a64718