Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: improve patch filename remembering #23070

Merged
merged 1 commit into from Apr 13, 2020
Merged

Conversation

@nornagon
Copy link
Member

@nornagon nornagon commented Apr 10, 2020

Description of Change

This improves the quality of the system that handles remembering what filenames patches have. Previously, it would forget the filename of a patch if a stat block was included, e.g.

From 069f545fb7e14ad7149cdeea9865eeb76972fa48 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Thu, 9 Apr 2020 16:58:34 -0700
Subject: [PATCH] build: improve patch filename remembering

---
 script/lib/patches.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/lib/patches.py b/script/lib/patches.py
index c3035b88e..2365303de 100644
--- a/script/lib/patches.py
+++ b/script/lib/patches.py
@@ -8,11 +8,13 @@ def read_patch(patch_dir, patch_filename):
[...]

because it would add the Patch-Filename information after the --- separator, resulting in the information not being included in the commit message.

This additionally fixes an issue where the Patch-Filename header was being injected into the patch before every diff --git line, instead of only the first.

Checklist

  • PR description included and stakeholders cc'd
  • PR title follows semantic commit guidelines

Release Notes

Notes: none

zcbenz
zcbenz approved these changes Apr 13, 2020
@jkleinsc
Copy link
Contributor

@jkleinsc jkleinsc commented Apr 13, 2020

Merging as CI failures unrelated to PR change.

@jkleinsc jkleinsc merged commit 9055048 into master Apr 13, 2020
17 of 19 checks passed
@release-clerk
Copy link

@release-clerk release-clerk bot commented Apr 13, 2020

No Release Notes

@jkleinsc jkleinsc deleted the better-filename-remembering branch Apr 13, 2020
@trop
Copy link
Contributor

@trop trop bot commented Apr 13, 2020

I was unable to backport this PR to "6-1-x" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

@trop trop bot commented Apr 13, 2020

I was unable to backport this PR to "7-2-x" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

@trop trop bot commented Apr 13, 2020

I have automatically backported this PR to "9-x-y", please check out #23092

@trop
Copy link
Contributor

@trop trop bot commented Apr 13, 2020

I have automatically backported this PR to "8-x-y", please check out #23093

@trop
Copy link
Contributor

@trop trop bot commented Apr 20, 2020

@nornagon has manually backported this PR to "7-2-x", please check out #23184

@trop
Copy link
Contributor

@trop trop bot commented Apr 20, 2020

@nornagon has manually backported this PR to "6-1-x", please check out #23185

codebytere pushed a commit that referenced this issue Apr 22, 2020
* build: improve patch filename remembering (#23070)

* update patches

Co-authored-by: Electron Bot <anonymous@electronjs.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants