mirror of
https://github.com/clearlinux/common.git
synced 2026-09-07 22:31:39 +00:00
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 <patrick.mccarty@intel.com>
This commit is contained in:
+3
-2
@@ -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; \
|
||||
|
||||
Reference in New Issue
Block a user