From 6c547ae0539327c683a9c2ce4e478dc966506dcc Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 12 Feb 2014 14:44:04 -0200 Subject: Adding git-subtree-update --- git-subtree-update | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100755 git-subtree-update diff --git a/git-subtree-update b/git-subtree-update new file mode 100755 index 0000000..f0ad28e --- /dev/null +++ b/git-subtree-update @@ -0,0 +1,33 @@ +#!/bin/bash +# +# Update a subtree. +# + +# Parameters +BASENAME="`basename $0`" +REMOTE="$1" +FOLDER="$2" + +# Syntax +if [ -z "$2" ]; then + echo "usage: $BASENAME " + exit 1 +fi + +# Check remote +if ! git remote | grep -qe '^remote'; then + echo "fatal: no such remote $REMOTE" + exit +fi + +# Fetch the remote +git fetch $REMOTE master + +# Process +if [ ! -d "$FOLDER" ]; then + # Add a subtree + git subtree add --prefix $FOLDER $REMOTE master --squash +else + # Update a subtree + git subtree pull --prefix $FOLDER $REMOTE master --squash +fi -- cgit v1.2.3