patches for DPDK stable branches
 help / color / mirror / Atom feed
From: christian.ehrhardt@canonical.com
To: stable@dpdk.org, Thomas Monjalon <thomas@monjalon.net>,
	Luca Boccassi <bluca@debian.org>,
	Xueming Li <xuemingl@nvidia.com>
Cc: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Subject: [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch
Date: Tue, 10 Aug 2021 16:24:41 +0200	[thread overview]
Message-ID: <20210810142442.727267-1-christian.ehrhardt@canonical.com> (raw)

From: Christian Ehrhardt <christian.ehrhardt@canonical.com>

To select the proper maintainers - as of today - we recommend to check
out the main branch in $STABLE_DIR before calling 3-request-backport.
But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD
and thereby does not find any applied patch.

Instead we should use $RTE_VER_MAJOR that will correctly select the
branch name and therefore make 3-request-backport work in this case.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 3-request-backport | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3-request-backport b/3-request-backport
index a1725e5..67234d2 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -11,7 +11,7 @@ then
 	pushd $STABLE_DIR &>/dev/null
 	list=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ')
 	_parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id)
-	_applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\  -f2-)
+	_applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\  -f2-)
 	for _file in $list
 	do
 		_sub=$(grep Subject $_file | cut -d\  -f3-)
-- 
2.32.0


             reply	other threads:[~2021-08-10 14:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-10 14:24 christian.ehrhardt [this message]
2021-08-10 14:24 ` [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected christian.ehrhardt
2021-08-10 16:58   ` Luca Boccassi
2021-08-11  6:38     ` Christian Ehrhardt
2021-08-10 16:57 ` [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch Luca Boccassi
2021-08-11  6:38   ` 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=20210810142442.727267-1-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=bluca@debian.org \
    --cc=stable@dpdk.org \
    --cc=thomas@monjalon.net \
    --cc=xuemingl@nvidia.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).