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

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 <junkio@cox.net>

Junio C Hamano committed Feb 16, 2007 at 15:08 UTC de6f0def506935811384a39fb0660095f5555e68
1 file changed +9 -6
git-merge.sh
+9 -6
@@ -254,12 +254,15 @@ esac
254
255 for s in $use_strategies
256 do
257 - case " $s " in
258 - *" $no_trivial_merge_strategies "*)
259 - index_merge=f
260 - break
261 - ;;
262 - esac
257 + for nt in $no_trivial_merge_strategies
258 + do
259 + case " $s " in
260 + *" $nt "*)
261 + index_merge=f
262 + break
263 + ;;
264 + esac
265 + done
266 done
267
268 case "$#" in