Use --ff-only instead of --ff
This commit is contained in:
parent
84d4c0a4b3
commit
d62a1eb2be
|
@ -10,7 +10,7 @@ source /lib/gentoo/functions.sh
|
||||||
DTDDIR="${repository_path}"/metadata/dtd
|
DTDDIR="${repository_path}"/metadata/dtd
|
||||||
ebegin "Updating DTDs"
|
ebegin "Updating DTDs"
|
||||||
if [[ -e ${DTDDIR} ]]; then
|
if [[ -e ${DTDDIR} ]]; then
|
||||||
git -C "${DTDDIR}" pull -q --ff
|
git -C "${DTDDIR}" pull -q --ff-only
|
||||||
else
|
else
|
||||||
git clone -q https://anongit.gentoo.org/git/data/dtd.git "${DTDDIR}"
|
git clone -q https://anongit.gentoo.org/git/data/dtd.git "${DTDDIR}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -10,7 +10,7 @@ source /lib/gentoo/functions.sh
|
||||||
GLSADIR="${repository_path}"/metadata/glsa
|
GLSADIR="${repository_path}"/metadata/glsa
|
||||||
ebegin "Updating GLSAs"
|
ebegin "Updating GLSAs"
|
||||||
if [[ -e ${GLSADIR} ]]; then
|
if [[ -e ${GLSADIR} ]]; then
|
||||||
git -C "${GLSADIR}" pull -q --ff
|
git -C "${GLSADIR}" pull -q --ff-only
|
||||||
else
|
else
|
||||||
git clone -q https://anongit.gentoo.org/git/data/glsa.git "${GLSADIR}"
|
git clone -q https://anongit.gentoo.org/git/data/glsa.git "${GLSADIR}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -10,7 +10,7 @@ source /lib/gentoo/functions.sh
|
||||||
NEWSDIR="${repository_path}"/metadata/news
|
NEWSDIR="${repository_path}"/metadata/news
|
||||||
ebegin "Updating news items"
|
ebegin "Updating news items"
|
||||||
if [[ -e ${NEWSDIR} ]]; then
|
if [[ -e ${NEWSDIR} ]]; then
|
||||||
git -C "${NEWSDIR}" pull -q --ff
|
git -C "${NEWSDIR}" pull -q --ff-only
|
||||||
else
|
else
|
||||||
git clone -q https://anongit.gentoo.org/git/data/gentoo-news.git "${NEWSDIR}"
|
git clone -q https://anongit.gentoo.org/git/data/gentoo-news.git "${NEWSDIR}"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue