@matheusbsbs / matheus-bagliano / commits / c8e2db00f9
Fork 0

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>

Mark Hollomon committed Mar 15, 2006 at 22:51 UTC c8e2db00f9622af6e5f640443dfbe63bb1af39e0
1 file changed +3 -7
git-pull.sh
+3 -7
@@ -71,19 +71,15 @@ case "$merge_head" in
71 ;;
72 ?*' '?*)
73 var=`git repo-config --get pull.octopus`
74 - if test '' = "$var"
74 + if test -n "$var"
75 then
76 - strategy_default_args='-s octopus'
77 - else
76 strategy_default_args="-s $var"
77 fi
78 ;;
79 *)
80 var=`git repo-config --get pull.twohead`
83 - if test '' = "$var"
84 - then
85 - strategy_default_args='-s recursive'
86 - else
81 + if test -n "$var"
82 + then
83 strategy_default_args="-s $var"
84 fi
85 ;;