commit ef4c7d3d95f1c79fd62726d581aa94fe5a961561
Author: Kacper Kornet <[email protected]>
Date: Wed Sep 5 04:35:49 2012 +0200
builder: Merge only when it is a fast foward merge
builder.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/builder.sh b/builder.sh
index 3b9e03e..bf3d12f 100755
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/ef4c7d3d95f1c79fd62726d581aa94fe5a961561
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
