diginaut/dotfiles
1
0
Fork 0
mirror of https://github.com/aquatix/dotfiles.git synced 2025-12-07 03:35:10 +01:00
Code Issues 1 Releases Wiki Activity

Better status report

Browse Source
This commit is contained in:
Michiel Scholten
2014-07-26 14:08:24 +02:00
parent 7046d2e552
commit be637a2722
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bin/update_repos
View File

@@ -57,13 +57,40 @@ for LINE in "${LINES[@]}"; do
REPODIR="${REPODIR%.*}" REPODIR="${REPODIR%.*}"
if [ -e $REPODIR ]; then if [ -e $REPODIR ]; then
cd $REPODIR cd $REPODIR
git remote update > /dev/null
LOCAL=$(git rev-parse @)
REMOTE=$(git rev-parse @{u})
BASE=$(git merge-base @ @{u})
# 31: red, 32: green, 33: orange/yellow
if ! git diff --quiet; then if ! git diff --quiet; then
echo -e "[\e[31mX\e[0m] $GRP/$REPODIR changed - $WORKSPACE/$GRP/$REPODIR" echo -e "[\e[31mX\e[0m] $GRP/$REPODIR changed - $WORKSPACE/$GRP/$REPODIR"
elif [ $LOCAL = $REMOTE ]; then
#echo "Up-to-date"
echo -e "[\e[32mN\e[0m] $GRP/$REPODIR"
elif [ $LOCAL = $BASE ]; then
#echo "Need to pull"
#echo -e "[\e[32mU\e[0m] $GRP/$REPODIR"
echo -e "[\e[33mU\e[0m] $GRP/$REPODIR"
#git pull --quiet
elif [ $REMOTE = $BASE ]; then
#echo "Need to push"
echo -e "[\e[33mP\e[0m] $GRP/$REPODIR pushing"
#git push
else else
echo -e "[\e[32mU\e[0m] $GRP/$REPODIR" #echo "Diverged"
git pull --quiet echo -e "[\e[31mX\e[0m] $GRP/$REPODIR diverged - $WORKSPACE/$GRP/$REPODIR"
#git push --quiet
fi fi
#if ! git diff --quiet; then
# echo -e "[\e[31mX\e[0m] $GRP/$REPODIR changed - $WORKSPACE/$GRP/$REPODIR"
#else
# echo -e "[\e[32mU\e[0m] $GRP/$REPODIR"
# git pull --quiet
# #git push --quiet
#fi
else else
echo -e "[\e[33mC\e[0m] $GRP/$REPODIR" echo -e "[\e[33mC\e[0m] $GRP/$REPODIR"
git clone --quiet $LINE git clone --quiet $LINE