[Android Compile Server] Add "-f" to git checkout
Change-Id: Ia70f4e4b62b305e60205fc03cd153d0a3fdab79d
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/218277
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
diff --git a/android_compile/go/android_compile/checkouts.go b/android_compile/go/android_compile/checkouts.go
index 5e2060e..5cf0e59 100644
--- a/android_compile/go/android_compile/checkouts.go
+++ b/android_compile/go/android_compile/checkouts.go
@@ -376,7 +376,7 @@
}
// Checkout Android's built in remote "goog/master" incase the checkout is
// tracking something else.
- if _, err := skiaCheckout.Git(ctx, "checkout", fmt.Sprintf("%s/master", android_skia_checkout.BUILT_IN_REMOTE)); err != nil {
+ if _, err := skiaCheckout.Git(ctx, "checkout", fmt.Sprintf("%s/master", android_skia_checkout.BUILT_IN_REMOTE), "-f"); err != nil {
return fmt.Errorf("Failed to checkout goog/master in %s: %s", checkoutPath, err)
}
if err := deleteTryBranch(ctx, skiaCheckout); err != nil {
