!dropme

Author: alvrogd

codee/merge-upstream.bash

@@ -104,7 +104,7 @@ if [ "$(_git status --porcelain)" != "" ]; then
 fi
 
 # In the first stage, sync up the remote branch
-if ! _git describe "${MERGE_WITH}" &>/dev/null; then
+if ! _git rev-parse --verify --quiet "${MERGE_WITH}" &>/dev/null; then
   _error "there is no upstream to merge with ('${MERGE_WITH}'). You can add it
 with: