X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=29c14e148e1ff5b6f7bc0d8aca705961f0957eb8;hb=a3c57c9adb2844cebf2048b5ece356f3a091d4f9;hp=0991d5f14cd6d903572a041cfbfe3cde219c738f;hpb=806f36d4d7caf75b6d3e098cb0353d85d3477c7d;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 0991d5f1..29c14e14 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -70,21 +70,17 @@ case "$merge_head" in
 	exit 0
 	;;
 ?*' '?*)
-	var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'`
-	if test '' = "$var"
+	var=`git-repo-config --get pull.octopus`
+	if test -n "$var"
 	then
-		strategy_default_args='-s octopus'
-	else
-		strategy_default_args=$var
+		strategy_default_args="-s $var"
 	fi
 	;;
 *)
-	var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'`
-	if test '' = "$var"
-	then
-		strategy_default_args='-s recursive'
-	else
-		strategy_default_args=$var
+	var=`git-repo-config --get pull.twohead`
+	if test -n "$var"
+        then
+		strategy_default_args="-s $var"
 	fi
 	;;
 esac