diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aad471bbf8f894ea20a80c3be082012648b..17fda26721b7203faffd68bd178d5b757252d4d8 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
;;
?*' '?*)
var=`git repo-config --get pull.octopus`
;;
?*' '?*)
var=`git repo-config --get pull.octopus`
- if test '' = "$var"
+ if test -n "$var"
then
then
- strategy_default_args='-s octopus'
- else
strategy_default_args="-s $var"
fi
;;
*)
var=`git repo-config --get pull.twohead`
strategy_default_args="-s $var"
fi
;;
*)
var=`git repo-config --get pull.twohead`
- if test '' = "$var"
- then
- strategy_default_args='-s recursive'
- else
+ if test -n "$var"
+ then
strategy_default_args="-s $var"
fi
;;
strategy_default_args="-s $var"
fi
;;