X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=29c14e148e1ff5b6f7bc0d8aca705961f0957eb8;hb=83c137928c77b83a3d5557bcff467cd020424442;hp=6caf1aad471bbf8f894ea20a80c3be082012648b;hpb=c611db196a8830135e1a03e5b4fa6502714ded24;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aad..29c14e14 100755
--- 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
 	;;