Changeset 295362 in webkit

Timestamp:

Jun 7, 2022 1:15:44 PM (2 years ago)

Author:

commit-queue@webkit.org

Message:

[git-webkit] git-webkit revert won't trigger pre-commit hook properly
​https://bugs..webkit.org/show_bug.cgi?id=241202
rdar://problem/94251413

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

• Tools/Scripts/hooks/prepare-commit-msg:

Canonical link: ​https://commits.webkit.org/251370@main

File:

• trunk/Tools/Scripts/hooks/prepare-commit-msg (modified) (1 diff)

trunk/Tools/Scripts/hooks/prepare-commit-msg

@@ -75 +75 @@
 
 def main(file_name=None, source=None, sha=None):
-    if source not in (None, 'commit', 'template'):
+    with open(file_name, 'r') as commit_message_file:
+        content = commit_message_file.read()
+
+    if source not in (None, 'commit', 'template', 'merge'):
+        return 0
+    
+    if source == 'merge' and not content.startswith('Revert'):
         return 0