have prompt indicate non-zero return codes and handle more git states