From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BDA22A0A0E for ; Wed, 28 Apr 2021 08:40:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9270140041; Wed, 28 Apr 2021 08:40:35 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id A8DA640041 for ; Wed, 28 Apr 2021 08:40:34 +0200 (CEST) Received: from mail-qk1-f200.google.com ([209.85.222.200]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lbdsA-0004bX-9z for stable@dpdk.org; Wed, 28 Apr 2021 06:40:34 +0000 Received: by mail-qk1-f200.google.com with SMTP id v7-20020a05620a0a87b02902e02f31812fso24726841qkg.6 for ; Tue, 27 Apr 2021 23:40:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3uUL2kkuZBLJB89C8/SBOOqkd7ZApLrkR4PclVph+DM=; b=gHYhXN3n84gM5mUyh5MubyMT+qszX9s2903M1KCUm/EqylIhTxFGliomUN2OTCvWWs 6zaP/16WMpst6DSZLoB1DqzdT9lS+S0PCA2ZuN3FYDdWTnD8Ls4VtjtbiAsXdq1ZbdVh 1wEwRUClhLhbnoFKLGVubaMCUqmVjleWXT8gKN1k5cmVjPstoMd/LrHHyacAxOvuy3cj EPv+MVcndsHXrfVLX1n2bdIE0YkMCKZkJuPvYPejmqxrJ9gF1maVHaIkmKgm/DeD2spq dpRhJjoJFJP4x3lDYBAhcZJpznq63Hr7PLBUawHkeIKHdqKo7tGDz2qvBGp734tgp3ej yisg== X-Gm-Message-State: AOAM532DhajfOboZZ0YY4TpGIUpEzUCxuKpsH+5apcdDj9IdJQrAxwjU GtQxLsAlve8En3yzaJgqV7P0zDyqTOH4zRMAjWiMXZb0k1wqTBRghugrYKlJq3aEQGil3LLqv3B Enyy62oSm8AgQj0I4WjjwhRlJdy6WORe1O/lqlDlG X-Received: by 2002:ac8:6d1b:: with SMTP id o27mr25167186qtt.112.1619592033375; Tue, 27 Apr 2021 23:40:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeE81VSWTortFBGgq6e9bOUpCtBaEXDy73dOPkklTKRyQLI4k130tv4SHK7OSkqFJdXZktnEttn9dU53YoEjY= X-Received: by 2002:ac8:6d1b:: with SMTP id o27mr25167176qtt.112.1619592033113; Tue, 27 Apr 2021 23:40:33 -0700 (PDT) MIME-Version: 1.0 References: <1619589811-9458-1-git-send-email-xuemingl@nvidia.com> In-Reply-To: <1619589811-9458-1-git-send-email-xuemingl@nvidia.com> From: Christian Ehrhardt Date: Wed, 28 Apr 2021 08:40:06 +0200 Message-ID: To: Xueming Li Cc: dpdk stable , Luca Boccassi Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-stable] [scripts] README: clean DPDK clone and main branch to generate list X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Wed, Apr 28, 2021 at 8:03 AM Xueming Li wrote: > > Tags of "dirty" repository confuse git-log-fixes.sh. > The script also expects current branch to contains end tag of range. > > > Signed-off-by: Xueming Li > --- > README | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/README b/README > index 70f4320..911f169 100644 > --- a/README > +++ b/README > @@ -26,11 +26,15 @@ as tmp dir for the patches and mails. > 1.A > --- > A list of commits to backport should be generated. This can be generated > -from "git-log-fixes.sh" script from DPDK. Normally the start of range is > +from "git-log-fixes.sh" script from DPDK. The DPDK repository should be > +clean to avoid additional tags confuse script. Normally the start of range is I agree with the overall hint being useful, but dirty/clean have a very specific meaning in git and I wonder if that makes this confusing. How about: "The repository this is executed in needs to be free of conflicting tags - since developers accumulate remote repositories, branches and tags a fresh git clone is the most reliable source to use." ^^ This (using a new clone) also matches your extended example that you've added > the end tag of last generated range, branch tag if working on the first > stable release. The end of range is latest release tag. Assuming v17.11-rc1 > -is out you can prepare a commit list for v17.08.1 stable release with: > +is out, you should checkout a branch that contains end of range, normally > +main branch. Hmm, you are right it is needed to be on a branch containing those. I never realized that and got lucky by accident it seems. I tried a different branch and it indeed returns an empty list. It is the function commit_version and therein the --merged that otherwise fails. One could provide a commit to --merged, but then how would we reliably know how the repository and branches are called. I agree that asking for the main branch to be checked out is a simple solution until someone wants to improve git-log-fixes.sh in that regard. Thereby ack to this section. > Then prepare a commit list for v17.08.1 stable release with: > > + $ git clone http://dpdk.org/git/dpdk > + $ cd dpdk Ack to this, while everyone can do it differently - this example works "for sure" > $ ./devtools/git-log-fixes.sh v17.08..v17.11-rc1 > /tmp/list > > > -- > 2.25.1 > -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd