Merge branch 'master' into allinone-nb

1 files changed, 6 insertions, 5 deletions

diff --git a/make/git.mk b/make/git.mk
index 5595057..2c8c827 100644
--- a/make/git.mk
+++ b/make/git.mk
@@ -7,6 +7,7 @@ branches = $(master)
 # local name of origin
 origin = origin
 
+allbranches = $(sort $(master) $(branches))
 currentbranch := $(shell git branch | grep ^\* | awk '{ print $2 }')
 noncurrentbranches := $(filter-out $(currentbranch),$(branches))
 
@@ -15,15 +16,15 @@ localbranches := $(shell git branch | perl -ne 'm,^.\s+([a-z_]\S+)$$, && print "
 
 update:
 	git fetch $(origin)
-	for branch in $(filter-out $(localbranches),$(branches)); do \
-		git branch $$branch $(origin)/$(branch); \
+	for branch in $(filter-out $(localbranches),$(allbranches)); do \
+		git branch $$branch $(origin)/$$branch; \
 	done
-	git checkout $(master)
-	git pull $(origin)
 	for branch in $(noncurrentbranches); do \
-		git checkout $(branch); \
+		git checkout $$branch; \
 		git pull $(origin); \
 	done
+	git checkout $(master)
+	git pull $(origin)
 
 init:
 	git init