diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/git-pull.sh b/git-pull.sh index 6caf1aad47..29c14e148e 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -70,20 +70,16 @@ case "$merge_head" in exit 0 ;; ?*' '?*) - var=`git repo-config --get pull.octopus` - if test '' = "$var" + var=`git-repo-config --get pull.octopus` + if test -n "$var" then - strategy_default_args='-s octopus' - else strategy_default_args="-s $var" fi ;; *) - var=`git repo-config --get pull.twohead` - if test '' = "$var" - then - strategy_default_args='-s recursive' - else + var=`git-repo-config --get pull.twohead` + if test -n "$var" + then strategy_default_args="-s $var" fi ;; |