From de6f0def506935811384a39fb0660095f5555e68 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 16 Feb 2007 15:08:25 -0800 Subject: [PATCH] git-merge: minor fix for no_trivial_merge_strategies. The shell loop to determine if we should skip the trivial in-index merge stage based on what strategy is given was not prepared to have more than one strategy listed in the variable $no_trivial_merge_strategies. This does not trigger unless you use a modified git but the fix is simple and straightforward, so let's fix it before 1.5.0.1. Signed-off-by: Junio C Hamano --- git-merge.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/git-merge.sh b/git-merge.sh index 04a5eb0f297..498c938c450 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -254,12 +254,15 @@ esac for s in $use_strategies do - case " $s " in - *" $no_trivial_merge_strategies "*) - index_merge=f - break - ;; - esac + for nt in $no_trivial_merge_strategies + do + case " $s " in + *" $nt "*) + index_merge=f + break + ;; + esac + done done case "$#" in