commit: 0605a75e3a426a1245900be171ae0f69fb743c7d
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 08:59:01 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct 3 08:59:01 2015 +0000
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=0605a75e
tweak pull push a bit and pull just before pushing to avoid conflicts
Signed-off-by: Markus Meier <maekke <AT> gentoo.org>
scripts/keyword.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/keyword.sh b/scripts/keyword.sh
index e18f3a5..59629bd 100755
--- a/scripts/keyword.sh
+++ b/scripts/keyword.sh
@@ -66,7 +66,6 @@ for pkg in ${pkgs} ; do
[[ -n "${revision}" ]] && version="${version}-${revision}"
cd "${REPODIR}/${cpn}" || die "package ${cpn} not found"
- git pull --rebase=preserve || die "git pull failed"
[[ -e ${pn}-${version}.ebuild ]] || die "ebuild (${pn}-${version}) not
found"
repoman full --include-arches "${arches//\~/}" || die "repoman full
failed on non-modified tree"
@@ -91,6 +90,7 @@ for pkg in ${pkgs} ; do
repoman manifest || die "repoman manifest failed"
repoman full --include-arches "${arches//\~/}" || die "repoman
full failed on modified tree"
repoman commit --include-arches "${arches//\~/}" -m "${msg}" ||
die "repoman commit failed"
+ git pull --rebase=preserve || die "git pull failed"
git push --signed || die "git push failed"
else
echo "nothing to do here"
