diff options
| -rwxr-xr-x | helpers/git-refresh | 2 | ||||
| -rwxr-xr-x | helpers/llvm-prepare | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/helpers/git-refresh b/helpers/git-refresh index 100654f..d423812 100755 --- a/helpers/git-refresh +++ b/helpers/git-refresh @@ -17,6 +17,8 @@ trap popdq EXIT safe_run git checkout master echo " + Fetching origin..." safe_run git fetch origin +safe_run git remote update -p + if is_git_svn; then echo " + Rebasing SVN master..." safe_run git svn rebase -l diff --git a/helpers/llvm-prepare b/helpers/llvm-prepare index 4f57447..0281fd6 100755 --- a/helpers/llvm-prepare +++ b/helpers/llvm-prepare @@ -15,7 +15,7 @@ function prepare() { if [ ! -d $src/.git ]; then mkdir -p $src cd $src/.. - safe_run git clone $origin $src + safe_run git clone --no-checkout $origin $src fi # Link with upstream SVN if [[ $LLVM_GITRW = 'yes' && ! -d $src/.git/svn ]]; then |