trotFunky/Scripts
1
0
Fork 0
Code Activity

Correction du cas où on a des commits locaux donc le fetch indique quelque chose

Browse source 
Gestion de plusieurs dépôts par un script
Changements utilitaires pour le wall
This commit is contained in:
Teo-CD 2019-05-20 15:55:09 +02:00 • committed by trotFunky
parent a26a4e5eaa
commit 27776d5a12
1 changed files with 60 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Perso/INTech/gitUpdate.sh
View file

@ -1,12 +1,15 @@
#!/bin/bash
GIT_REPO="."
export LC_ALL=POSIX
WORK_DIR=$HOME"/.gitAutoPull"
work_array="."
if [ $# -gt 0 ]; then
GIT_REPO="$1"
work_array=$@
fi
for GIT_REPO in $work_array ; do
GIT_REPO_NAME="$(echo '$GIT_REPO' | tr '/' '_' | tr -d '~')"
CHECK_TIMER_FILE=$WORK_DIR/localCommitsCheck"$GIT_REPO_NAME"
@ -41,25 +44,28 @@ if [ -e $CHECK_TIMER_FILE ]; then
fi
fi
remoteStatus="$(git fetch --dry-run 2>&1)" # Empty if there are no commits to fetch
remoteStatus="$(git fetch --dry-run 2>&1 | tail -n 1 | grep -v -e'+')" # Empty if there are no commits to fetch
localStatus="$(git push -n --porcelain | grep -e'up to date')" # Empty if there are commits to push
{
if [ -z "$remoteStatus" ]; then
if [ -z "$localStatus" ]; then
echo "Pushing "$GIT_REPO" updates to origin" | wall
git push 2>&1 | wall
echo "Pushing "$GIT_REPO" updates to origin"
git push 2>&1
exit 1
fi
else
if [ -z "localStatus" ]; then
echo "Local and remote diverged, stopping auto-update for 30 iterations..." | wall
echo "Local and remote diverged, stopping auto-update for 30 iterations..."
echo 30 > $WORK_DIR/localCommitsCheck"$GIT_REPO_NAME"
else
echo "Updating "$GIT_REPO" with remote commits" | wall
git fetch --all 2>&1 | wall
git remote update 2>&1 | wall
echo "Updating "$GIT_REPO" with remote commits"
git fetch --all 2>&1
git remote update 2>&1
exit 1
fi
fi
fi } | wall
done
exit 0