git: make the git driver respect branches

This commit is contained in:
Thomas Penteker 2015-06-22 11:28:34 +02:00
parent 255b8ebc80
commit f4e4ff757a

View File

@ -26,12 +26,12 @@ cd "$PORTS_DIR/$NAME" 2> "/dev/null"
if [ $? -lt 1 ]; then
git fetch -q
git diff --pretty=format: --name-status $BRANCH origin/$BRANCH | sed "s/M\t/ Edit /g; s/A\t/ Checkout /g; s/D\t/ Delete /g" | sort
git diff --pretty=format: --name-status "$BRANCH" origin/"$BRANCH" | sed "s/M\t/ Edit /g; s/A\t/ Checkout /g; s/D\t/ Delete /g" | sort
git clean -q -f
git reset -q --hard origin/$BRANCH
git reset -q --hard origin/"$BRANCH"
else
echo " Initial git clone, this may take a while"
git clone -q "$URL" "$PORTS_DIR/$NAME"
git clone -q -b "$BRANCH" "$URL" "$PORTS_DIR/$NAME"
fi
echo "Finished successfully"