summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorMark Hollomon <markhollomon@comcast.net>2006-03-15 22:51:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-16 00:14:33 (GMT)
commitc8e2db00f9622af6e5f640443dfbe63bb1af39e0 (patch)
tree7c32c149066695f8cfa08abaa7a7a31f5118b0ac /git-pull.sh
parentc982647310fc5acd0bd6ebc408e70470447b387f (diff)
downloadgit-c8e2db00f9622af6e5f640443dfbe63bb1af39e0.zip
git-c8e2db00f9622af6e5f640443dfbe63bb1af39e0.tar.gz
git-c8e2db00f9622af6e5f640443dfbe63bb1af39e0.tar.bz2
Let merge set the default strategy.
If the user does not set a merge strategy for git-pull, let git-merge calculate a default strategy. [jc: with minor stylistic tweaks] Signed-off-by: Mark Hollomon <markhollomon@comcast.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh10
1 files changed, 3 insertions, 7 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aa..17fda26 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -71,19 +71,15 @@ case "$merge_head" in
;;
?*' '?*)
var=`git repo-config --get pull.octopus`
- if test '' = "$var"
+ 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
+ if test -n "$var"
+ then
strategy_default_args="-s $var"
fi
;;