[coreboot-gerrit] New patch to review for coreboot: 58f16be util/board_status: Fetch and rebase after failed push

[Paul Menzel (paulepanter@users.sourceforge.net)]

Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10262

-gerrit

commit 58f16be579b032439394463d10b13b4abcf69793
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Wed May 20 07:35:56 2015 +0200

    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.
    
    Note, `git push origin` might fail due to other reasons.
    Unfortunately, git doesn’t seem to return different error codes, so
    this is hard to detect. Use a counter or time-out might be helpful in
    that case.
    
    Change-Id: I628ebce54895f44be6232b622d56acbcc421b847
    Reported-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 util/board_status/board_status.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 2cb4e5c..2356e65 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -286,7 +286,9 @@ if [ $UPLOAD_RESULTS -eq 1 ]; then
 	echo "Uploading results"
 	git add "${vendor}"
 	git commit -a -m "${mainboard_dir}/${tagged_version}/${timestamp}"
-	git push origin
+	until git push origin; do
+		git pull --rebase
+	done
 
 	# Results have been uploaded so it's pointless to keep the
 	# temporary files around.