feature finish: Handle empty branch correctly

It turned out that feature finish fails when called right after feature
start. This is taken care of from now on.

Change-Id: I9828c8a1a40d9eb647e70e581b3d526675e6097b
Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>