Yuvipanda has submitted this change and it was merged.
Change subject: puppetmaster: Try to rebase from upstream even if it hasn't
changed
......................................................................
puppetmaster: Try to rebase from upstream even if it hasn't changed
Since local cherry-picked commits could have changed, making it
possible to rebase now when it caused conflicts before.
This will make the log a little more spammy, but eh.
Change-Id: I167614ca44d8ee63c9e75212841a2e1deecc3318
---
M modules/puppetmaster/templates/git-sync-upstream.erb
1 file changed, 1 insertion(+), 7 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/puppetmaster/templates/git-sync-upstream.erb
b/modules/puppetmaster/templates/git-sync-upstream.erb
index 5402297..27bcaef 100755
--- a/modules/puppetmaster/templates/git-sync-upstream.erb
+++ b/modules/puppetmaster/templates/git-sync-upstream.erb
@@ -28,13 +28,7 @@
cd ${REPO}
# Fetch new changes from origin
-git fetch --verbose origin 2>&1 |
-tee "${TEMPFILE}"
-
-if grep "${TRACK_BRANCH}" "${TEMPFILE}" | grep -q "up to date" ; then
- echo "Already up to date" 1>&2
- exit 0
-fi
+git fetch --verbose origin
# Hide any dirty local files
git stash save "rebase $(date +%Y-%m-%dT%H:%M)" 2>&1 |
--
To view, visit https://gerrit.wikimedia.org/r/188018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I167614ca44d8ee63c9e75212841a2e1deecc3318
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
