commit df5b48173b5dcbea660eff29a793b6b0f22e1c34 Author: Thomas Penteker <tek@serverop.de> Date: Fri Apr 1 22:12:49 2016 +0200 git: include updated git driver diff --git a/git/Pkgfile b/git/Pkgfile index 59d7b6e..2df4c20 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -1,13 +1,13 @@ # Description: Directory content manager -# URL: http://www.kernel.org/pub/software/scm/git/docs +# URL: http://www.kernel.org/pub/software/scm/git/docs # Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: Tilman Sauerbeck, tilman at crux dot nu -# Depends on: expat, curl, python +# Packager: Tilman Sauerbeck, tilman at crux dot nu +# Depends on: expat, curl, python # Nice to have: tk name=git version=2.8.0 -release=1 +release=2 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz git) diff --git a/git/git b/git/git index 4876e1c..9d1f85a 100644 --- a/git/git +++ b/git/git @@ -18,6 +18,10 @@ if [ -z "$NAME" ]; then echo "NAME not set in '$1'" >&2 exit 2 fi +if [ -z "$BRANCH" ]; then + echo "BRANCH not set in '$1'" >&2 + exit 2 +fi echo "Fetching updates from $URL" echo "Updating collection $NAME" @@ -25,13 +29,14 @@ echo "Updating collection $NAME" cd "$PORTS_DIR/$NAME" 2> "/dev/null" if [ $? -lt 1 ]; then + git checkout -q "$BRANCH" 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 clean -q -f git reset -q --hard origin/"$BRANCH" else - echo " Initial git clone, this may take a while" git clone -q -b "$BRANCH" "$URL" "$PORTS_DIR/$NAME" + ls /usr/ports/$NAME | sed "s/^/ Checkout /g" fi echo "Finished successfully"