From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 7197799FA for ; Mon, 31 Jul 2017 14:07:44 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E101D20914; Mon, 31 Jul 2017 08:07:43 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Mon, 31 Jul 2017 08:07:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=tLG9CPRDMox9LCe+92qJ7S4XFv8 XhI60hqHMgF8p9m0=; b=LHx+AasaqDfqQJPYg5xdy02A7M80U86Tj+NWVzDYoT2 9SKEWhgN3u8IyZ3HJ3KcDblr8ZYmlqfXZD4nY/3op8Ll6iUmX8dzS+8CHH414jlI USbdGzwaamyYKP4sZyXrApI9/PtTQhp8rTpYFR/CYYc6xBosNuTXGlvDPCGYq7qA = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=tLG9CP RDMox9LCe+92qJ7S4XFv8XhI60hqHMgF8p9m0=; b=fPl5Zff9kJnx1F548MMHP8 e3pCsWwZCmgCvBzJwYuKcddyNLWANPdNwBS21MPqMX5KRyMn1cwJ6tAw/01mybls oeF92ACFSJruIw1i61SOwABE4tgXZ/ZYJ49lal1EwP6OkOyzyLmrJfpxOkXEut1u M674Kz6EbDiZIdgt745htzVav2RtTb48qkpJY9RTjiwfedLTYUbx5F9n0olkguEQ BuRtomI78WKBv183dIIKC59p2nFxl2D/yT2Fjt/HmkVbZVRofyg0qw9NwTc7R4UZ YlJ/jNj7rQdtX6dmE4T5OgAGuN+UzN98kC7CUJnxbuKphFsQSiJrRYW5e/mpurBA == X-ME-Sender: X-Sasl-enc: NppvhGQyEl7zsHdNZjFkeKP57ACvxyH18GQ/4BXxEt6O 1501502863 Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 71A727E335 for ; Mon, 31 Jul 2017 08:07:43 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Date: Mon, 31 Jul 2017 14:07:38 +0200 Message-Id: <20170731120738.1278-1-thomas@monjalon.net> X-Mailer: git-send-email 2.13.2 Subject: [dpdk-dev] [PATCH] devtools: ignore non merged tags for backport X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2017 12:07:44 -0000 When checking if a buggy commit was introduced in an old version, the script compares last tag containing the bug and current version. The non merged tags from non related branches must be ignored. Signed-off-by: Thomas Monjalon --- devtools/git-log-fixes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 740494677..580068741 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -66,7 +66,7 @@ range="$*" # get major release version of a commit commit_version () # { - tag=$(git tag -l --contains $1 | head -n1) + tag=$(git tag -l --contains $1 --merged | head -n1) if [ -z "$tag" ] ; then # before -rc1 tag of release in progress make showversion | cut -d'.' -f-2 -- 2.13.2