Title: [295654] trunk/Websites/perf.webkit.org/tools/sync-commits.py
- Revision
- 295654
- Author
- [email protected]
- Date
- 2022-06-17 20:46:55 -0700 (Fri, 17 Jun 2022)
Log Message
sync-commits.py should force reset to FETCH_HEAD instead.
Patch by Zhifei Fang <[email protected]> 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
Modified Paths
Diff
Modified: trunk/Websites/perf.webkit.org/tools/sync-commits.py (295653 => 295654)
--- trunk/Websites/perf.webkit.org/tools/sync-commits.py 2022-06-18 00:50:59 UTC (rev 295653)
+++ trunk/Websites/perf.webkit.org/tools/sync-commits.py 2022-06-18 03:46:55 UTC (rev 295654)
@@ -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:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
