From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: [dpdk-test-report] |WARNING| pw94272 [PATCH] [v1, 2/2] devtools: auto detect branch to search fix patches
Date: Wed, 16 Jun 2021 00:58:18 -0400 (EDT) [thread overview]
Message-ID: <20210616045818.837626D45A@noxus.dpdklab.iol.unh.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 2198 bytes --]
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/94272
_apply patch failure_
Submitter: Xueming Li <xuemingl@nvidia.com>
Date: Wednesday, June 16 2021 04:03:22
Applied on: CommitID:2ca92f54410400af76a1f0bc3bfecc8077e282aa
Apply patch set 94272 failed:
Checking patch devtools/check-git-log.sh...
Checking patch devtools/git-log-fixes.sh...
error: while searching for:
done
shift $(($OPTIND - 1))
[ $# -ge 1 ] || usage_error 'range argument required'
range="$*"
# get major release version of a commit
commit_version () # <hash>
{
local VER="v*.*"
# use current branch as history reference
local refbranch=$(git rev-parse --abbrev-ref HEAD)
local tag=$( (git tag -l $VER --contains $1 --sort=creatordate --merged $refbranch 2>&- ||
# tag --merged option has been introduced in git 2.7.0
# below is a fallback in case of old git version
error: patch failed: devtools/git-log-fixes.sh:33
Hunk #4 succeeded at 49 (offset -10 lines).
Applied patch devtools/check-git-log.sh cleanly.
Applying patch devtools/git-log-fixes.sh with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
diff a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh (rejected hunks)
@@ -33,14 +34,23 @@ while getopts h ARG ; do
done
shift $(($OPTIND - 1))
[ $# -ge 1 ] || usage_error 'range argument required'
-range="$*"
+range="$1"
+branch="$2"
+
+if [ -z "$branch" ] ; then
+ # last commit in range
+ range_last=$(git log --oneline v21.05-rc3..v21.05 |head -n1|cut -d' ' -f1)
+ # use first branch contains the commit
+ refbranch=$(git branch --contains $range_last -r --sort=-authordate |head -n1)
+else
+ refbranch=$(git rev-parse --abbrev-ref $branch)
+fi
# get major release version of a commit
commit_version () # <hash>
{
local VER="v*.*"
# use current branch as history reference
- local refbranch=$(git rev-parse --abbrev-ref HEAD)
local tag=$( (git tag -l $VER --contains $1 --sort=creatordate --merged $refbranch 2>&- ||
# tag --merged option has been introduced in git 2.7.0
# below is a fallback in case of old git version
https://lab.dpdk.org/results/dashboard/patchsets/17401/
UNH-IOL DPDK Community Lab
reply other threads:[~2021-06-16 4:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210616045818.837626D45A@noxus.dpdklab.iol.unh.edu \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@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).