X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=17fda26721b7203faffd68bd178d5b757252d4d8;hb=228382aee45ec7f17db220e9099b46347ba2e1c7;hp=6caf1aad471bbf8f894ea20a80c3be082012648b;hpb=eac6c04ca54ed7f4fec2bb43cee893b7dca31b3a;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aad..17fda267 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -71,19 +71,15 @@ case "$merge_head" in
 	;;
 ?*' '?*)
 	var=`git repo-config --get pull.octopus`
-	if test '' = "$var"
+	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
+	if test -n "$var"
+        then
 		strategy_default_args="-s $var"
 	fi
 	;;