X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=17fda26721b7203faffd68bd178d5b757252d4d8;hb=81ea3ce2ace4d8b76dbfe2aa6b4199472115a115;hp=0991d5f14cd6d903572a041cfbfe3cde219c738f;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 0991d5f1..17fda267 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