get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD

diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aad471bbf8f894ea20a80c3be082012648b..29c14e148e1ff5b6f7bc0d8aca705961f0957eb8 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -70,20 +70,16 @@ case "$merge_head" in
        exit 0
        ;;
 ?*' '?*)
-       var=`git repo-config --get pull.octopus`
-       if test '' = "$var"
+       var=`git-repo-config --get pull.octopus`
+       if test -n "$var"
        then
-               strategy_default_args='-s octopus'
-       else
                strategy_default_args="-s $var"
        fi
        ;;
 *)
-       var=`git repo-config --get pull.twohead`
-       if test '' = "$var"
-       then
-               strategy_default_args='-s recursive'
-       else
+       var=`git-repo-config --get pull.twohead`
+       if test -n "$var"
+        then
                strategy_default_args="-s $var"
        fi
        ;;