From: bluca@debian.org
To: stable@dpdk.org
Cc: yskoh@mellanox.com, christian.ehrhardt@canonical.com,
ktraynor@redhat.com, Luca Boccassi <bluca@debian.org>
Subject: [dpdk-stable] [PATCH stable-scripts] Add diff-of-diff below backported patch to 2-notice
Date: Mon, 20 Aug 2018 19:03:57 +0100 [thread overview]
Message-ID: <20180820180357.26095-1-bluca@debian.org> (raw)
From: Luca Boccassi <bluca@debian.org>
We noticed that it's not clear if a patch is cleanly cherry-picked or if
it gets adjusted due to merge conflicts.
This change will add to the backport notice email a diff-of-diffs, and
a note asking the developer/maintainer to review it.
This way it the work we do will be more transparent.
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
compose-notice | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/compose-notice b/compose-notice
index e5996f4..95260bd 100644
--- a/compose-notice
+++ b/compose-notice
@@ -41,6 +41,10 @@ Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before $(date --date="+2 days" "+%D"). So please
shout if anyone has objections.
$(cat notice-more 2>/dev/null | grep -v "^#")
+Also note that after the patch there's a diff of the upstream commit vs the patch applied
+to the branch. If the code is different (ie: not only metadata diffs), due for example to
+a change in context or macro names, please double check it.
+
Thanks.
${SIGNATURE}
@@ -54,6 +58,19 @@ construct_patch()
cat $patch
}
+construct_diff_of_diff()
+{
+ upstream_commit=$(grep "\[ upstream commit " $patch | sed "s/\[ upstream commit \(.*\) \]/\1/")
+ if [ -n "$upstream_commit" ]
+ then
+ echo "---"
+ echo " Diff of the applied patch vs upstream commit (please double-check if non-empty:"
+ echo "---"
+ $GIT format-patch --stdout -1 $upstream_commit | diff -Naur - $patch
+ fi
+}
+
construct_header
construct_notice
construct_patch
+construct_diff_of_diff
--
2.18.0
next reply other threads:[~2018-08-20 18:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-20 18:03 bluca [this message]
2018-08-20 18:28 ` Yongseok Koh
2018-08-22 12:33 ` Christian Ehrhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180820180357.26095-1-bluca@debian.org \
--to=bluca@debian.org \
--cc=christian.ehrhardt@canonical.com \
--cc=ktraynor@redhat.com \
--cc=stable@dpdk.org \
--cc=yskoh@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).