Title: [240438] trunk/Tools
Revision
240438
Author
[email protected]
Date
2019-01-24 09:30:10 -0800 (Thu, 24 Jan 2019)

Log Message

test_exporter.py: webkitpy.common.system.executive.ScriptError from create_branch_with_patch
https://bugs.webkit.org/show_bug.cgi?id=193746

Reviewed by Youenn Fablet.

It calls 'git apply --index --abort', but --abort is not a valid argument to 'git apply',
so we'd best just not call it.

* Scripts/webkitpy/w3c/test_exporter.py:
(WebPlatformTestExporter.create_branch_with_patch):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (240437 => 240438)


--- trunk/Tools/ChangeLog	2019-01-24 17:25:57 UTC (rev 240437)
+++ trunk/Tools/ChangeLog	2019-01-24 17:30:10 UTC (rev 240438)
@@ -1,3 +1,16 @@
+2019-01-24  Michael Catanzaro  <[email protected]>
+
+        test_exporter.py: webkitpy.common.system.executive.ScriptError from create_branch_with_patch
+        https://bugs.webkit.org/show_bug.cgi?id=193746
+
+        Reviewed by Youenn Fablet.
+
+        It calls 'git apply --index --abort', but --abort is not a valid argument to 'git apply',
+        so we'd best just not call it.
+
+        * Scripts/webkitpy/w3c/test_exporter.py:
+        (WebPlatformTestExporter.create_branch_with_patch):
+
 2019-01-24  Ross Kirsling  <[email protected]>
 
         Move FileSystem to WTF

Modified: trunk/Tools/Scripts/webkitpy/w3c/test_exporter.py (240437 => 240438)


--- trunk/Tools/Scripts/webkitpy/w3c/test_exporter.py	2019-01-24 17:25:57 UTC (rev 240437)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_exporter.py	2019-01-24 17:30:10 UTC (rev 240438)
@@ -293,7 +293,6 @@
             self._git.apply_mail_patch([patch])
         except Exception as e:
             _log.warning(e)
-            self._git.apply_mail_patch(['--abort'])
             return False
         self._git.commit(['-a', '-m', self._commit_message])
         return True
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to