commit cb26e28f3b27a03a07c8390400985f33a06977ce
author Hidehiko Abe <hidehiko@chromium.org> Tue Aug 22 16:28:16 2017 +0900
committer chrome-bot <chrome-bot@chromium.org> Wed Aug 23 06:23:29 2017 -0700
tree 0fdaece97ae1415801c1120c956657901e9b1f8b
parent 3c993467007553e05e5c2adcb418772675bd2864

Run git reset --hard in case of git error.

In case of git error, there could be uncommitted changes.
Then, checkout will fail.
To avoid such a situation, run "git reset --hard" before
checkout.

BUG=None
TEST=Ran on bots.

Change-Id: Id9cbd76c7e66c2abc3eaae9dab7287b25a144dd4
Reviewed-on: https://chromium-review.googlesource.com/625600
Commit-Ready: Hidehiko Abe <hidehiko@chromium.org>
Tested-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/upload_prebuilts.py

diff --git a/scripts/upload_prebuilts.py b/scripts/upload_prebuilts.py
index 41a50f7..57f3906 100644
--- a/scripts/upload_prebuilts.py
+++ b/scripts/upload_prebuilts.py
@@ -170,6 +170,11 @@
     git.RunGit(cwd, ['commit', '-m', description])
     git.PushWithRetry(prebuilt_branch, cwd, dryrun=dryrun, retries=retries)
   finally:
+    # We reset the index and the working tree state in case there are any
+    # uncommitted or pending changes, but we don't change any existing commits.
+    git.RunGit(cwd, ['reset', '--hard'])
+
+    # Check out the last good commit as a sanity fallback.
     git.RunGit(cwd, ['checkout', commit])