diff options
Diffstat (limited to 'update-common')
-rwxr-xr-x | update-common | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/update-common b/update-common index b7eb537..e3b95e4 100755 --- a/update-common +++ b/update-common @@ -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 |