hasufell/paludis-gentoo-git-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use --ff-only instead of --ff

Browse Source
This commit is contained in:
hasufell 2015-11-10 14:31:28 +01:00
parent e87344f84d
commit a393321ea5
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/sync_post/02-sync_gentoo_dtd.bash
View File

@ -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

2
hooks/sync_post/03-sync_gentoo_glsa.bash
View File

@ -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

2
hooks/sync_post/05-sync_gentoo_news.bash
View File

@ -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