kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2007-02-16 15:08:25 -08:00
parent efa13f7b7e
commit de6f0def50
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-merge.sh
View File

@ -254,12 +254,15 @@ esac


for s in $use_strategies for s in $use_strategies
do do
for nt in $no_trivial_merge_strategies
do
case " $s " in case " $s " in
*" $no_trivial_merge_strategies "*) *" $nt "*)
index_merge=f index_merge=f
break break
;; ;;
esac esac
done
done done


case "$#" in case "$#" in