Update update-common script to work with branch master too
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 5 Apr 2012 16:47:33 +0000 (18:47 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 5 Apr 2012 16:47:33 +0000 (18:47 +0200)
update-common

index b7eb537..e3b95e4 100755 (executable)
@@ -52,12 +52,21 @@ do
     continue;
   fi
 
-  git checkout -b $BRANCH origin/$BRANCH
+  if test $BRANCH = 'master'; then
+    git checkout $BRANCH
+  else
+    git checkout -b $BRANCH origin/$BRANCH
+  fi
+
   git submodule init
   git submodule update
   cd $dir/$module/common
   ref_from=`git log --pretty=format:%h -n 1 HEAD`
-  git checkout -b $BRANCH origin/$BRANCH
+  if test $BRANCH = 'master'; then
+    git checkout $BRANCH
+  else
+    git checkout -b $BRANCH origin/$BRANCH
+  fi
   git pull origin
   ref_to=`git log --pretty=format:%h -n 1 HEAD`
   echo updating common from $ref_from to $ref_to