Minor git tweak

2010-05-20 03:20:49 -04:00 · 2010-05-20 03:20:49 -04:00 · 7a380fa160
commit 7a380fa160
parent 6b1d106285
1 changed files with 1 additions and 2 deletions
--- a/collects/meta/build/build
+++ b/collects/meta/build/build
@ -655,8 +655,7 @@ git_get() { # inputs: git repository, git branch, path in $maindir
  fi
  _cd "$dir"
  _run git checkout "$branch"
-  _run git pull --all
-  _run git checkout "$branch"
+  _run git pull --ff-only --all
  git status -s > "$tmpdir/git-st" || exit_error "problems running git status"
  if [[ -s "$tmpdir/git-st" ]]; then
    echo "------------"