From 05634010e95fe111d0ed8e23ea55fde2137589f2 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Fri, 23 Mar 2018 16:32:24 -0700 Subject: [PATCH] Disable recipe echo and set -x for 'pullrebase' The echo commands at key points of the pullrebase should be sufficient for users to know what action pullrebase performed. Signed-off-by: Patrick McCarty --- Makefile.common | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index bf59096..f351632 100644 --- a/Makefile.common +++ b/Makefile.common @@ -126,17 +126,18 @@ $(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice # that a fetch/rebase is not attempted if the remote 'origin' is not # initialized locally, or if the remote contains no commits. pullrebase: - if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \ - set -x ; \ + @if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \ if ! git rev-parse --verify --quiet origin/master > /dev/null; then \ echo "Remote not yet initialized. Continuing."; \ exit 0; \ fi; \ + echo "Fetching origin"; \ git fetch; \ if ! git rev-parse --verify --quiet FETCH_HEAD > /dev/null; then \ echo "No commits exist in remote. Continuing."; \ exit 0; \ fi; \ + echo "Rebasing to origin/master"; \ if git status --porcelain | grep -q '^.[^?]'; \ then \ git stash save; \