From: bibendi <bibe...@bk.ru>

Look in the config file .gittrees for a default repository and
refspec or commit when they are not provided on the command line.

Uses the .gittrees config file in a similar way to how git-submodule
uses the .gitmodules file.

Signed-off-by: Paul Campbell <pcampb...@kemitix.net>
---
 contrib/subtree/git-subtree.sh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7b70251..1aff956 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -708,21 +708,31 @@ cmd_merge()
 
 cmd_pull()
 {
-       ensure_clean
-       git fetch "$@" || exit $?
-       revs=FETCH_HEAD
-       set -- $revs
-       cmd_merge "$@"
+    if [ $# -ne 1 ]; then
+           die "You must provide <branch>"
+       fi
+       if [ -e "$dir" ]; then
+           ensure_clean
+           repository=$(git config -f .gittrees subtree.$prefix.url)
+           refspec=$1
+           git fetch $repository $refspec || exit $?
+           echo "git fetch using: " $repository $refspec
+           revs=FETCH_HEAD
+           set -- $revs
+           cmd_merge "$@"
+       else
+           die "'$dir' must already exist. Try 'git subtree add'."
+       fi
 }
 
 cmd_push()
 {
-       if [ $# -ne 2 ]; then
-           die "You must provide <repository> <refspec>"
+       if [ $# -ne 1 ]; then
+           die "You must provide <branch>"
        fi
        if [ -e "$dir" ]; then
-           repository=$1
-           refspec=$2
+           repository=$(git config -f .gittrees subtree.$prefix.url)
+           refspec=$1
            echo "git push using: " $repository $refspec
            git push $repository $(git subtree split 
--prefix=$prefix):refs/heads/$refspec
        else
-- 
1.8.2.rc1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to