From a393321ea5dd1e627cc9852c6c9dee7b45d0ed87 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Tue, 10 Nov 2015 14:31:28 +0100
Subject: [PATCH] Use --ff-only instead of --ff

---
 hooks/sync_post/02-sync_gentoo_dtd.bash  | 2 +-
 hooks/sync_post/03-sync_gentoo_glsa.bash | 2 +-
 hooks/sync_post/05-sync_gentoo_news.bash | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hooks/sync_post/02-sync_gentoo_dtd.bash b/hooks/sync_post/02-sync_gentoo_dtd.bash
index 6c50bf3..a3fb280 100644
--- a/hooks/sync_post/02-sync_gentoo_dtd.bash
+++ b/hooks/sync_post/02-sync_gentoo_dtd.bash
@@ -7,7 +7,7 @@ if [[ ${TARGET} == gentoo ]] ; then
 	DTDDIR=${PORTDIR}/metadata/dtd
 	ebegin "Updating DTDs"
 	if [[ -e ${DTDDIR} ]]; then
-		git -C "${DTDDIR}" pull -q --ff
+		git -C "${DTDDIR}" pull -q --ff-only
 	else
 		git clone -q https://anongit.gentoo.org/git/data/dtd.git "${DTDDIR}"
 	fi
diff --git a/hooks/sync_post/03-sync_gentoo_glsa.bash b/hooks/sync_post/03-sync_gentoo_glsa.bash
index 9042159..415c768 100644
--- a/hooks/sync_post/03-sync_gentoo_glsa.bash
+++ b/hooks/sync_post/03-sync_gentoo_glsa.bash
@@ -7,7 +7,7 @@ if [[ ${TARGET} == gentoo ]] ; then
 	GLSADIR=${PORTDIR}/metadata/glsa
 	ebegin "Updating GLSAs"
 	if [[ -e ${GLSADIR} ]]; then
-		git -C "${GLSADIR}" pull -q --ff
+		git -C "${GLSADIR}" pull -q --ff-only
 	else
 		git clone -q https://anongit.gentoo.org/git/data/glsa.git "${GLSADIR}"
 	fi
diff --git a/hooks/sync_post/05-sync_gentoo_news.bash b/hooks/sync_post/05-sync_gentoo_news.bash
index 3f04e81..532b07f 100644
--- a/hooks/sync_post/05-sync_gentoo_news.bash
+++ b/hooks/sync_post/05-sync_gentoo_news.bash
@@ -7,7 +7,7 @@ if [[ ${TARGET} == gentoo ]] ; then
 	NEWSDIR="${PORTDIR}"/metadata/news
 	ebegin "Updating news items"
 	if [[ -e ${NEWSDIR} ]]; then
-		git -C "${NEWSDIR}" pull -q --ff
+		git -C "${NEWSDIR}" pull -q --ff-only
 	else
 		git clone -q https://anongit.gentoo.org/git/data/gentoo-news.git "${NEWSDIR}"
 	fi