diff options
| author | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-02-26 19:40:07 +0000 |
|---|---|---|
| committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-03-11 11:35:14 +0000 |
| commit | 3c0a89523477fa14d47ddbe232b9edb3e924858d (patch) | |
| tree | eb987df7c82e764ca7f38c74a1abfd7a6c35fe61 | |
| parent | 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af (diff) | |
Do not consume errors
Change-Id: I89ea9a11ef579c26b9a0a2be0f7b2a7dd762e3c8
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| -rwxr-xr-x | scripts/coin/create_baseline/create_baseline.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/coin/create_baseline/create_baseline.sh b/scripts/coin/create_baseline/create_baseline.sh index 7d8be0f4..9b588f50 100755 --- a/scripts/coin/create_baseline/create_baseline.sh +++ b/scripts/coin/create_baseline/create_baseline.sh @@ -72,7 +72,9 @@ cd $repodir echo "Changed working directory:" $(pwd) # checkout current production head, update git refs and perform hard reset to discard local changes -git checkout production && git fetch && git reset --hard origin/production +git checkout production +git fetch +git reset --hard origin/production # merge master into production branch if [ -z "$master_commit_id" ]; then |