checkout to master branch since we have branch build now

m-labs · Feb 23, 2012 · a827122 · a827122
1 parent 23797fd
commit a827122
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/compile-flickernoise/Makefile b/compile-flickernoise/Makefile
@@ -193,10 +193,9 @@ milkymist-git-clone:
 	done
 
 milkymist-git-update:
-	cd $(MILKYMIST_GIT_DIR)/rtems && git fetch -a && \
-	    git reset --hard origin/master || exit 1;
-	for d in $(REPO_DIRS); \
-	    do (cd $(MILKYMIST_GIT_DIR)/$$d  && git fetch -a && \
+	for d in $(REPO_DIRS) rtems; \
+	    do (cd $(MILKYMIST_GIT_DIR)/$$d && git fetch -a && \
+		git checkout -f master && \
 	        git reset --hard origin/master) || exit 1; \
 	    done