Re: [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch

[Christian Ehrhardt <christian.ehrhardt@canonical.com>]

On Tue, Aug 10, 2021 at 6:57 PM Luca Boccassi <bluca@debian.org> wrote:
>
> On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
> wrote:
> > 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-)
>
> Acked-by: Luca Boccassi <bluca@debian.org>

Thanks, applied now

> --
> Kind regards,
> Luca Boccassi



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd