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

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