diff --git a/Makefile.common b/Makefile.common index 4b98819..dea2245 100644 --- a/Makefile.common +++ b/Makefile.common @@ -286,8 +286,10 @@ koji: prekoji-checks kojidef @if ! git branch | grep -q -E '^\* master'; then \ echo "Error: Must be on the master branch to submit to koji" >&2; \ exit 1; \ + fi; \ + if git rev-parse --verify --quiet origin/master > /dev/null; then \ + git pull --rebase; \ fi - git pull --rebase git tag $(SRPMVERS) git push origin master refs/tags/$(SRPMVERS) $(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)