diff --git a/git-pull.sh b/git-pull.sh
index 0991d5f14cd6d903572a041cfbfe3cde219c738f..6caf1aad471bbf8f894ea20a80c3be082012648b 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
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