Attachment 459876 Details for Bug 241114 – Patch

[patch] Patch

bug-241114-20220531104743.patch (text/plain), 2.26 KB, created by Fujii Hironori on 2022-05-30 18:47:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2022-05-30 18:47:44 PDT

Size: 2.26 KB

patch

obsolete

>From 63c9aca836db736c8f06cc2f5dd98f6b3cbe091e Mon Sep 17 00:00:00 2001
>From: Fujii Hironori <Hironori.Fujii@sony.com>
>Date: Tue, 31 May 2022 10:40:36 +0900
>Subject: webkit-patch: `git am` strips prefixes (e.g. [CMake][WPE]) in a
> subject https://bugs.webkit.org/show_bug.cgi?id=241114
>
>Reviewed by NOBODY (OOPS!).
>
>Added `--keep` and `--keep-subject` options for `git am` and `git
>format-patch` commands.
>
>* Tools/Scripts/webkitpy/common/checkout/checkout.py:
>(apply_patch):
>* Tools/Scripts/webkitpy/common/checkout/scm/git.py:
>(Git.create_patch):
>---
> Tools/Scripts/webkitpy/common/checkout/checkout.py | 2 +-
> Tools/Scripts/webkitpy/common/checkout/scm/git.py  | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/Tools/Scripts/webkitpy/common/checkout/checkout.py b/Tools/Scripts/webkitpy/common/checkout/checkout.py
>index f71aa68c11b2..beee67f97994 100644
>--- a/Tools/Scripts/webkitpy/common/checkout/checkout.py
>+++ b/Tools/Scripts/webkitpy/common/checkout/checkout.py
>@@ -173,7 +173,7 @@ for l in lines[1:]:
>         num_commits = len(self.COMMIT_SUBJECT_RE.findall(encoded_patch))
>         if isinstance(self._scm, Git) and num_commits:
>             self._executive.run_command(
>-                ['git', 'am'],
>+                ['git', 'am', '--keep'],
>                 input=self.filter_patch_content(encoded_patch, reviewer=patch.reviewer().full_name if patch.reviewer() else None),
>                 cwd=self._scm.checkout_root,
>             )
>diff --git a/Tools/Scripts/webkitpy/common/checkout/scm/git.py b/Tools/Scripts/webkitpy/common/checkout/scm/git.py
>index a4a87497a063..fd9585e7ea62 100644
>--- a/Tools/Scripts/webkitpy/common/checkout/scm/git.py
>+++ b/Tools/Scripts/webkitpy/common/checkout/scm/git.py
>@@ -361,7 +361,7 @@ class Git(SCM, SVNRepository):
>         if not commit_message or merge_base == head:
>             command = [self.executable_name, 'diff', '--binary', '--no-color', '--no-ext-diff', '--full-index', '--no-renames']
>         else:
>-            command = [self.executable_name, 'format-patch', '--stdout', '--binary']
>+            command = [self.executable_name, 'format-patch', '--stdout', '--binary', '--keep-subject']
> 
>         # Put code changes at the top of the patch and layout tests
>         # at the bottom, this makes for easier reviewing.
>-- 
>2.25.1
>

Actions: View | Formatted Diff | Diff

Attachments on bug 241114: 459876 | 459944 | 460020