diff --git a/configuration/environments_scripts/repo/usr/local/bin/syncgit b/configuration/environments_scripts/repo/usr/local/bin/syncgit index d21d700cdd9..f32de8edbd0 100755 --- a/configuration/environments_scripts/repo/usr/local/bin/syncgit +++ b/configuration/environments_scripts/repo/usr/local/bin/syncgit @@ -9,27 +9,15 @@ else GIT_PATH="$1" fi cd "$GIT_PATH" -git fetch github main:main >/tmp/wiki-git.out 2>/tmp/wiki-git.err -if [ "$?" != "0" ]; then - cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not fetch github/main into local main" $ADMIN_EMAIL -fi git push origin main:main >/tmp/wiki-git.out 2>/tmp/wiki-git.err if [ "$?" != "0" ]; then cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not push main into sapsailing/main" $ADMIN_EMAIL fi git pull github main >/tmp/wiki-git.out 2>/tmp/wiki-git.err if [ "$?" != "0" ]; then - cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not merge github/main into sapsailing/master" $ADMIN_EMAIL + cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not merge github/main into local main" $ADMIN_EMAIL fi -git pull >/tmp/wiki-git.out 2>/tmp/wiki-git.err +git pull origin main >/tmp/wiki-git.out 2>/tmp/wiki-git.err if [ "$?" != "0" ]; then - cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not pull origin/master" $ADMIN_EMAIL -fi -git push origin master:main >>/tmp/wiki-git.out 2>/tmp/wiki-git.err -if [ "$?" != "0" ]; then - cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not push master to origin/main" $ADMIN_EMAIL -fi -git push >>/tmp/wiki-git.out 2>/tmp/wiki-git.err -if [ "$?" != "0" ]; then - cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not push master to origin/master" $ADMIN_EMAIL + cat /tmp/wiki-git.out /tmp/wiki-git.err | mail -s "Wiki git problem: could not pull origin/main" $ADMIN_EMAIL fi