diff options
| author |   Markus Meier <maekke@gentoo.org> | 2015-10-03 10:59:01 +0200 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2015-10-03 10:59:01 +0200 |
| commit | 0605a75e3a426a1245900be171ae0f69fb743c7d (patch) | |
| tree | 26828baaf389170e37c5d442ca1d635478db8ed6 /scripts | |
| parent | fix commit message for stabilization (diff) | |
| download | maekke-0605a75e3a426a1245900be171ae0f69fb743c7d.tar.gz maekke-0605a75e3a426a1245900be171ae0f69fb743c7d.tar.bz2 maekke-0605a75e3a426a1245900be171ae0f69fb743c7d.zip | |
tweak pull push a bit and pull just before pushing to avoid conflicts
Signed-off-by: Markus Meier <maekke@gentoo.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/keyword.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" |