[webkitscmpy] Allow repositories to define custom setup commands (Fol…

…low0-up)

https://bugs.webkit.org/show_bug.cgi?id=231345
<rdar://problem/83960249>

Unreviewed follow-up fix.


* Scripts/git-webkit: Do not specify OpenSource in Tools/Scripts path.


Canonical link: https://commits.webkit.org/243162@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284378 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,13 @@
+2021-10-18  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Allow repositories to define custom setup commands (Follow0-up)
+        https://bugs.webkit.org/show_bug.cgi?id=231345
+        <rdar://problem/83960249>
+
+        Unreviewed follow-up fix.
+
+        * Scripts/git-webkit: Do not specify OpenSource in Tools/Scripts path.
+
 2021-10-18  Alex Christensen  <achristensen@webkit.org>
 
         Regression (r284304) : [ iOS 15 Release ] http/tests/privateClickMeasurement tests are failing

Tools/Scripts/git-webkit

@@ -56,7 +56,7 @@ def additional_setup(args, repository):
         'config', 'merge.changelog.driver',
         'perl {} --merge-driver -c %O %A %B'.format(os.path.join(
             os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))),
-            'OpenSource', 'Tools', 'Scripts', 'resolve-ChangeLogs',
+            'Tools', 'Scripts', 'resolve-ChangeLogs',
         )),
     ], capture_output=True, cwd=repository.root_path).returncode:
         sys.stderr.write('Failed to set the git merging behaivor for changelogs...\n')