commit 442916f47344fc0ff7c4549ac906176c38b03119
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Jun 18 03:46:55 2022 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Jun 18 03:46:55 2022 +0000
tree 20492cdb4c17ae264690e8b1cb1e190ca554a467
parent ddaf1af157f5565f593ba8c11f9bba8855490b59

sync-commits.py should force reset to FETCH_HEAD instead.

Patch by Zhifei Fang <facetothefate@gmail.com> on 2022-06-17
Reviewed by Jonathan Bedard.

* Websites/perf.webkit.org/tools/sync-commits.py:
(GitRepository._fetch_remote):

Canonical link: https://commits.webkit.org/251659@main

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@295654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Websites/perf.webkit.org/tools/sync-commits.py

diff --git a/Websites/perf.webkit.org/tools/sync-commits.py b/Websites/perf.webkit.org/tools/sync-commits.py
index 4aca8d1..089bc5e 100755
--- a/Websites/perf.webkit.org/tools/sync-commits.py
+++ b/Websites/perf.webkit.org/tools/sync-commits.py
@@ -303,7 +303,8 @@
 
     def _fetch_remote(self):
         if self._report_svn_revision:
-            self._run_git_command(['pull'])
+            self._run_git_command(['fetch', 'origin', self._git_branch])
+            self._run_git_command(['reset', '--hard', 'FETCH_HEAD'])
             subprocess.check_call(['rm', '-rf', os.path.join(self._git_checkout, '.git/svn')])
             self._run_git_command(['svn', 'fetch'])
         else: