Unified · Split
| @@ -2,8 +2,11 @@ · 1 unmodified line | |||
| 2 | 2 | ||
| 3 | #If a version is set then we only try merging a source plugin with matching version as a generic one could change the ABI to master HEAD | 3 | #If a version is set then we only try merging a source plugin with matching version as a generic one could change the ABI to master HEAD |
| 4 | merge_internal(){ # $1=repository, $2=refspec | 4 | merge_internal(){ # $1=repository, $2=refspec |
| 5 | [ -n "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version | 5 | branch="sourceplugin-$2" |
| 6 | [ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2 | 6 | if [ -n "$version" ] ; then |
| 7 | branch="$branch-$version" | ||
| 8 | fi | ||
| 9 | git pull --no-rebase --log --stat --commit --no-edit "$1" "$branch" | ||
| 7 | } | 10 | } |
| 8 | 11 | ||
| 9 | unset succeeded failed version | 12 | unset succeeded failed version |