From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: Luca Boccassi <bluca@debian.org>, dpdk stable <stable@dpdk.org>
Cc: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Subject: [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines
Date: Mon, 30 Jul 2018 18:24:47 +0200 [thread overview]
Message-ID: <20180730162447.17661-2-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20180730162447.17661-1-christian.ehrhardt@canonical.com>
In some cases like
7fa7216ed S mem: fix alignment of requested virtual areas (18.05)
d5dd22c9f S mem: fix alignment of requested virtual areas (18.05)
The current scripting will loose the former change.
It will create files based on format-patch and then later on import
them.
But due to the same subject line the later exported change will override
the former change.
Avoid that issue by using the commit-id as suffix for the filenames and
by that ensuring that they will be unique.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
import-commit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/import-commit b/import-commit
index 8d0763f..218924e 100644
--- a/import-commit
+++ b/import-commit
@@ -21,7 +21,7 @@ init()
exit 1
}
- patch=$($GIT format-patch -o $STABLE_DIR $commit -1)
+ patch=$($GIT format-patch --suffix="-$commit.patch" -o $STABLE_DIR $commit -1)
}
# add "[ upstream commit xxxx ]" tag
--
2.17.1
next prev parent reply other threads:[~2018-07-30 16:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 16:24 [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts Christian Ehrhardt
2018-07-30 16:24 ` Christian Ehrhardt [this message]
2018-07-30 16:29 ` [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines Luca Boccassi
2018-07-30 16:29 ` [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts Luca Boccassi
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=20180730162447.17661-2-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=bluca@debian.org \
--cc=stable@dpdk.org \
/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).