diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2013-11-04 17:00:54 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-01-21 12:04:03 +0100 |
| commit | 2d1e8d2e4938a74264c471aadd6d2e350c755a7f (patch) | |
| tree | 90fac1c3e05d935be4b870322b92117e5ece387f /install/ui/util/prepare-dojo.sh | |
| parent | bdb3095ade037daa1942c16e906eda62da720b77 (diff) | |
| download | freeipa.git-2d1e8d2e4938a74264c471aadd6d2e350c755a7f.tar.gz freeipa.git-2d1e8d2e4938a74264c471aadd6d2e350c755a7f.tar.xz freeipa.git-2d1e8d2e4938a74264c471aadd6d2e350c755a7f.zip | |
Update Dojo to 1.9.1
https://fedorahosted.org/freeipa/ticket/3904
Diffstat (limited to 'install/ui/util/prepare-dojo.sh')
| -rwxr-xr-x | install/ui/util/prepare-dojo.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/install/ui/util/prepare-dojo.sh b/install/ui/util/prepare-dojo.sh index 03c9b593..78a3d933 100755 --- a/install/ui/util/prepare-dojo.sh +++ b/install/ui/util/prepare-dojo.sh @@ -164,7 +164,8 @@ if [[ $DOJO = $YES ]] ; then git clean -dfx git checkout master git fetch --tags - git pull + git fetch + git branch -D $BRANCH git checkout $BRANCH fi popd @@ -185,7 +186,7 @@ if [[ $UTIL = $YES ]] ; then git checkout master git fetch --tags git fetch - git pull + git branch -D $BRANCH git checkout $BRANCH fi |