Commit 71dd6d92 authored by Willi Rath's avatar Willi Rath
Browse files

Merge branch 'develop' into 'master' 

Check out default branches rather than master

See merge request !59
parents 92f33dc5 801ff2de

data_repo_renderer/__init__.py

+4 −1
Original line number Diff line number Diff line
@@ -302,7 +302,10 @@ class GitUpdate(Renderer): 


    template = textwrap.dedent(

        """

        git checkout master

        git remote set-head origin -a

        default_branch=`git symbolic-ref \\

            --short refs/remotes/origin/HEAD | cut -d/ -f2-`

        git checkout ${{default_branch}}

        git pull

        git lfs pull

        git lfs track "data/**"

tests/test_full_yaml_file_and_cli.py

+4 −1
Original line number Diff line number Diff line
@@ -101,7 +101,10 @@ source "~/.data_repo_creds/SOTH.cred" 


echo "Not doing anything for pre-processing."



git checkout master

git remote set-head origin -a

default_branch=`git symbolic-ref \\

    --short refs/remotes/origin/HEAD | cut -d/ -f2-`

git checkout ${{default_branch}}

git pull

git lfs pull

git lfs track "data/**"