diff --git a/git-pull.sh b/git-pull.sh
index 0991d5f14cd6d903572a041cfbfe3cde219c738f..17fda26721b7203faffd68bd178d5b757252d4d8 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
exit 0
;;
?*' '?*)
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
then
- strategy_default_args='-s octopus'
- else
- strategy_default_args=$var
+ strategy_default_args="-s $var"
fi
;;
*)
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
fi
;;
esac