diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-05 18:47:33 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-05 18:47:33 +0200 |
| commit | 27b1e88d06e5ed69b86ff705c10c2c8fe67b1cd1 (patch) | |
| tree | 634651413066102fdba3d2494a3bfdc912c1d9bc /update-common | |
| parent | 464fe150690a0d37a2e76e671edf1a3e39a991a8 (diff) | |
| download | gstreamer-common-27b1e88d06e5ed69b86ff705c10c2c8fe67b1cd1.tar.gz | |
Update update-common script to work with branch master too
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 |