diff --git a/repo.postsync.d/sync_gentoo_dtd b/repo.postsync.d/sync_gentoo_dtd index 56ad70d..d94611e 100755 --- a/repo.postsync.d/sync_gentoo_dtd +++ b/repo.postsync.d/sync_gentoo_dtd @@ -10,7 +10,7 @@ source /lib/gentoo/functions.sh DTDDIR="${repository_path}"/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/repo.postsync.d/sync_gentoo_glsa b/repo.postsync.d/sync_gentoo_glsa index 775ca90..cabffb1 100755 --- a/repo.postsync.d/sync_gentoo_glsa +++ b/repo.postsync.d/sync_gentoo_glsa @@ -10,7 +10,7 @@ source /lib/gentoo/functions.sh GLSADIR="${repository_path}"/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/repo.postsync.d/sync_gentoo_news b/repo.postsync.d/sync_gentoo_news index bf24750..b598f9b 100755 --- a/repo.postsync.d/sync_gentoo_news +++ b/repo.postsync.d/sync_gentoo_news @@ -10,7 +10,7 @@ source /lib/gentoo/functions.sh NEWSDIR="${repository_path}"/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