From: Mark Hollomon <markhollomon@comcast.net>
Date: Wed, 15 Mar 2006 22:51:41 +0000 (+0000)
Subject: Let merge set the default strategy.
X-Git-Tag: v1.3.0-rc1~26^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8e2db00f9622af6e5f640443dfbe63bb1af39e0;p=thirdparty%2Fgit.git

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>
---

diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aad47..17fda26721 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
 	;;