Title: [277115] trunk/Tools
- Revision
- 277115
- Author
- jbed...@apple.com
- Date
- 2021-05-06 13:42:42 -0700 (Thu, 06 May 2021)
Log Message
[webkit-patch] setup-git-clone uses master instead of main
https://bugs.webkit.org/show_bug.cgi?id=225460
<rdar://problem/77616439>
Reviewed by Aakash Jain.
* Scripts/webkitpy/tool/commands/setupgitclone.py:
(SetupGitClone.execute): Pair the remote branch ref with the Svn remote.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (277114 => 277115)
--- trunk/Tools/ChangeLog 2021-05-06 20:40:56 UTC (rev 277114)
+++ trunk/Tools/ChangeLog 2021-05-06 20:42:42 UTC (rev 277115)
@@ -1,3 +1,14 @@
+2021-05-06 Jonathan Bedard <jbed...@apple.com>
+
+ [webkit-patch] setup-git-clone uses master instead of main
+ https://bugs.webkit.org/show_bug.cgi?id=225460
+ <rdar://problem/77616439>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/webkitpy/tool/commands/setupgitclone.py:
+ (SetupGitClone.execute): Pair the remote branch ref with the Svn remote.
+
2021-05-06 Chris Dumez <cdu...@apple.com>
Add API test for FileSystem::fileExists() on a broken symbolic link
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py (277114 => 277115)
--- trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py 2021-05-06 20:40:56 UTC (rev 277114)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py 2021-05-06 20:42:42 UTC (rev 277115)
@@ -46,12 +46,13 @@
return
username, email = self._get_username_and_email(tool)
+ remote_branch = tool.scm().remote_branch_ref()
# FIXME: We shouldn't be using a private method.
run_git = tool.scm()._run_git
run_git(["pull"])
run_git(["svn", "init", "--prefix=origin/", "-T", "trunk", "https://svn.webkit.org/repository/webkit"])
- run_git(["config", "--replace", "svn-remote.svn.fetch", "trunk:refs/remotes/origin/master"])
+ run_git(["config", "--replace", "svn-remote.svn.fetch", "trunk:{}".format(remote_branch)])
run_git(["svn", "fetch"])
run_git(["config", "user.name", username])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
