diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-22 07:46:47 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-22 07:46:47 -0300 |
| commit | 3a793f07314169104c3f8c121b78b1b4076b102f (patch) | |
| tree | e97f821b6d506a32da503d36859fc9a6aeee91d0 /tools/build_snapshots.sh | |
| parent | 3e05b544c797db1cdb2fa8db3806d89c5661ca2b (diff) | |
| download | pfsense-3a793f07314169104c3f8c121b78b1b4076b102f.zip pfsense-3a793f07314169104c3f8c121b78b1b4076b102f.tar.gz | |
Make sure local changes are reset before git pull, in some cases pull can fail due to conflicts
Diffstat (limited to 'tools/build_snapshots.sh')
| -rwxr-xr-x | tools/build_snapshots.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh index 5b74de8..41b7173 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -85,6 +85,7 @@ snapshots_sleep_between_runs() { wait ${_sleep_pid} _sleep_pid=0 # Update this repo + git -C "${BUILDER_ROOT}" reset --hard git -C "${BUILDER_ROOT}" pull -q git_last_commit if [ "${LAST_COMMIT}" != "${CURRENT_COMMIT}" ]; then |
