builder: Merge only when it is a fast foward merge

diff --git a/builder.sh b/builder.sh
index 3b9e03efd18ca557644bed889c989b90895492db..bf3d12f2066547fb1ee21ec6c2503d6a0a715220 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -958,7 +958,7 @@ get_spec() {
                if [ $(git rev-parse "$CVSTAG") != $(git rev-parse HEAD) ]; then
                        Exit_error "err_no_checkut" "$CVSTAG"
                fi
-                       git merge '@{u}'
+                       git merge --ff-only '@{u}'
                git symbolic-ref -q HEAD > /dev/null && [ "$NOCVSSPEC" != "yes" ] &&
                if [ -n "$CVSDATE" ]; then
                        git checkout $(git rev-list -n1 --before="'$CVSDATE'" $CVSTAG) || exit 1