diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-02-16 15:08:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-16 15:08:25 -0800 |
| commit | de6f0def506935811384a39fb0660095f5555e68 (patch) | |
| tree | b4772235b86b378bcf6f8528816a561fc971291b | |
| parent | pretend-sha1: grave bugfix. (diff) | |
| download | tgif-de6f0def506935811384a39fb0660095f5555e68.tar.xz | |
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>
| -rwxr-xr-x | git-merge.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/git-merge.sh b/git-merge.sh index 04a5eb0f29..498c938c45 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 |