diff options
| author | Paul Menzel <paulepanter@users.sourceforge.net> | 2015-05-20 07:35:56 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-05-21 07:57:48 +0200 |
| commit | 54e6aa7216a6776daa67c94c97d8568e1d395861 (patch) | |
| tree | e815a94e0fa9c2da6eea975ad39e8a776ea882b4 /src/mainboard/google/parrot/thermal.h | |
| parent | 16c12c0a302a64c523e85d90a6f6e0269618093a (diff) | |
| download | coreboot-54e6aa7216a6776daa67c94c97d8568e1d395861.tar.xz | |
util/board_status: Fetch and rebase after failed push
Currently, when the remote master branch of the board-status
repository changes between cloning and pushing, `git push origin`
fails.
This race condition happens quite often with REACTS testing commits at
the same time on different systems.
If that happens, just download the objects and refs from the
board-status repository and rebase the local changes on it. Try that
three times before exiting with an error message.
Change-Id: I628ebce54895f44be6232b622d56acbcc421b847
Helped-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Helped-by: Patrick Georgi <pgeorgi@google.com>
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/10262
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Diffstat (limited to 'src/mainboard/google/parrot/thermal.h')
0 files changed, 0 insertions, 0 deletions