Title: [282482] trunk/Tools
Revision
282482
Author
timothy_hor...@apple.com
Date
2021-09-15 17:26:33 -0700 (Wed, 15 Sep 2021)

Log Message

Remove the "core.webKitBranchBuild" prompt from setup-git-clone
https://bugs.webkit.org/show_bug.cgi?id=230323

Reviewed by Jonathan Bedard.

* Scripts/webkitpy/tool/commands/setupgitclone.py:
(SetupGitClone.execute):
"core.webKitBranchBuild" is an advanced feature and also doesn't work
at all for Apple folks (leading to a myriad of bizarro build problems).
Folks who want it can use the documentation (UsingGitWithWebKit on the Wiki),
but in general, until it's well supported, it's best if we don't encourage it.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (282481 => 282482)


--- trunk/Tools/ChangeLog	2021-09-16 00:03:51 UTC (rev 282481)
+++ trunk/Tools/ChangeLog	2021-09-16 00:26:33 UTC (rev 282482)
@@ -1,3 +1,17 @@
+2021-09-15  Tim Horton  <timothy_hor...@apple.com>
+
+        Remove the "core.webKitBranchBuild" prompt from setup-git-clone
+        https://bugs.webkit.org/show_bug.cgi?id=230323
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/tool/commands/setupgitclone.py:
+        (SetupGitClone.execute):
+        "core.webKitBranchBuild" is an advanced feature and also doesn't work
+        at all for Apple folks (leading to a myriad of bizarro build problems).
+        Folks who want it can use the documentation (UsingGitWithWebKit on the Wiki),
+        but in general, until it's well supported, it's best if we don't encourage it.
+
 2021-09-15  Geza Lore  <gezal...@gmail.com>
 
         Cache resource paths in run-jsc-stress-tests for speedup

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py (282481 => 282482)


--- trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py	2021-09-16 00:03:51 UTC (rev 282481)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py	2021-09-16 00:26:33 UTC (rev 282482)
@@ -73,10 +73,6 @@
         else:
             run_git(["config", "merge.changelog.driver", "perl Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %B %A"])
 
-        if tool.user.confirm("Do you want to append the git branch name to every build? (e.g. WebKitBuild/mybranch/; y/n)"):
-            run_git(["config", "core.webKitBranchBuild", "true"])
-            print("You can override this option via git config branch.$branchName.webKitBranchBuild (true|false)")
-
         print("Done")
 
     def _get_username_and_email(self, tool):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to