From cf009964cfa021e596e0ecb245ba10067ca9be21 Mon Sep 17 00:00:00 2001
From: Kirill Kirilenko <kirill@ultracoder.org>
Date: Fri, 4 Aug 2023 16:01:05 +0300
Subject: [PATCH] Discard local changes and untracked files on sync.

---
 sync.bat | 6 +++---
 sync.sh  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sync.bat b/sync.bat
index 169f049..03fa5e8 100644
--- a/sync.bat
+++ b/sync.bat
@@ -31,9 +31,9 @@ if not exist "webrtc" (
 
 echo Updating WebRTC to version %WEBRTC_REVISION%...
 cd %REPO_ROOT%\webrtc\src
-call gclient sync --with_branch_heads
+call gclient sync --with_branch_heads --reset
 git.exe fetch
-git.exe checkout -B %WEBRTC_REVISION% branch-heads/%WEBRTC_REVISION%
-call gclient sync --force -D
+git.exe checkout -f -B %WEBRTC_REVISION% branch-heads/%WEBRTC_REVISION%
+call gclient sync --force -D --reset
 
 cd %REPO_ROOT%
diff --git a/sync.sh b/sync.sh
index 9a14d89..8e46091 100755
--- a/sync.sh
+++ b/sync.sh
@@ -37,5 +37,5 @@ echo "Updating WebRTC to version ${WEBRTC_REVISION}..."
 cd ${REPO_ROOT}/webrtc/src
 gclient sync --with_branch_heads --reset
 git fetch
-git checkout -B ${WEBRTC_REVISION} branch-heads/${WEBRTC_REVISION}
+git checkout -f -B ${WEBRTC_REVISION} branch-heads/${WEBRTC_REVISION}
 gclient sync --force -D --reset