diff options
Diffstat (limited to 'scripts/include.sh/build-dep.sh')
| -rwxr-xr-x | scripts/include.sh/build-dep.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/include.sh/build-dep.sh b/scripts/include.sh/build-dep.sh index 5b762d28..6bc53804 100755 --- a/scripts/include.sh/build-dep.sh +++ b/scripts/include.sh/build-dep.sh @@ -59,6 +59,7 @@ build_git_ios() cd "$builddir/downloads" if test -d "$name" ; then cd "$name" + git checkout master git pull --rebase else git clone $url "$name" @@ -72,6 +73,11 @@ build_git_ios() cp -R "$builddir/downloads/$name" "$srcdir/$name" cd "$srcdir/$name" + if test "x$branch" != x ; then + if ! git checkout -b "$branch" "origin/$branch" ; then + git checkout "$branch" + fi + fi git checkout -q $rev echo building $name $version - $rev @@ -186,6 +192,7 @@ build_git_osx() cd "$builddir/downloads" if test -d "$name" ; then cd "$name" + git checkout master git pull --rebase else git clone $url "$name" @@ -199,6 +206,11 @@ build_git_osx() cp -R "$builddir/downloads/$name" "$srcdir/$name" cd "$srcdir/$name" + if test "x$branch" != x ; then + if ! git checkout -b "$branch" "origin/$branch" ; then + git checkout "$branch" + fi + fi git checkout -q $rev echo building $name $version - $rev |