http-fetch: do not use curl_message after releasing it

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index e3b04a0e959676e513a7b7e902ea51927d76e2be..966e81ff7d353beb15ac2c9ed9a50a1ea45c876c 100755 (executable)
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -31,6 +31,12 @@ case "$remotes" in
        exit 2 ;;
 esac
 
+# Give up if this is a baseless merge.
+if test '' = "$bases"
+then
+       exit 2
+fi
+
 git-update-index --refresh 2>/dev/null
 git-read-tree -u -m $bases $head $remotes || exit 2
 echo "Trying simple merge."