Permalink
Browse files

[HEAD-673] illumos-live configure is using old git syntax, breaking mg

  • Loading branch information...
1 parent 190ae53 commit 6dfffae5534f991092b3b4b86196e7e72e1789ac @JohnSonnenschein JohnSonnenschein committed Sep 19, 2011
Showing with 1 addition and 8 deletions.
  1. +1 −8 configure
View
@@ -264,14 +264,7 @@ function update_branch
cd ${target_dir}
current=$(git branch | grep "^*" | cut -d' ' -f2)
if [[ "${current}" != "${target}" ]]; then
- if [[ -n $(git branch | grep " ${target}$") ]]; then
- # have branch already, checkout
- git checkout ${target}
- else
- # don't have, add to tracking and checkout
- git branch --track ${target} origin/${target}
- git checkout ${target}
- fi
+ git checkout ${target}
fi
cd ${oldwd}

0 comments on commit 6dfffae

Please sign in to comment.