1
0
mirror of https://github.com/aquatix/dotfiles.git synced 2025-12-07 04:45:09 +01:00

Cleanups and activated the git commands again

This commit is contained in:
Michiel Scholten
2014-07-26 14:16:04 +02:00
parent be637a2722
commit 61343e9e55

View File

@@ -68,29 +68,20 @@ for LINE in "${LINES[@]}"; do
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 elif [ $LOCAL = $REMOTE ]; then
#echo "Up-to-date" # Up-to-date
echo -e "[\e[32mN\e[0m] $GRP/$REPODIR" echo -e "[\e[32mN\e[0m] $GRP/$REPODIR"
elif [ $LOCAL = $BASE ]; then elif [ $LOCAL = $BASE ]; then
#echo "Need to pull" # Need to pull
#echo -e "[\e[32mU\e[0m] $GRP/$REPODIR"
echo -e "[\e[33mU\e[0m] $GRP/$REPODIR" echo -e "[\e[33mU\e[0m] $GRP/$REPODIR"
#git pull --quiet git pull --quiet
elif [ $REMOTE = $BASE ]; then elif [ $REMOTE = $BASE ]; then
#echo "Need to push" # Need to push
echo -e "[\e[33mP\e[0m] $GRP/$REPODIR pushing" echo -e "[\e[33mP\e[0m] $GRP/$REPODIR pushing"
#git push git push
else else
#echo "Diverged" # Diverged
echo -e "[\e[31mX\e[0m] $GRP/$REPODIR diverged - $WORKSPACE/$GRP/$REPODIR" echo -e "[\e[31mX\e[0m] $GRP/$REPODIR diverged - $WORKSPACE/$GRP/$REPODIR"
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