From: Thomas Monjalon <thomas.monjalon@6wind.com>
Date: Wed, 29 Jun 2016 14:39:50 +0000 (+0200)
Subject: scripts: check fixed commit branch
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=b647da1064d88d1c5104e918b960a3f97f154ca9;p=dpdk.git

scripts: check fixed commit branch

The commit id of a fixed commit must be in the current branch.
It avoids referencing a local branch or a next-* branch when
pushing in the master.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---

diff --git a/scripts/check-git-log.sh b/scripts/check-git-log.sh
index 9a0d0683ff..7d2c7ee83b 100755
--- a/scripts/check-git-log.sh
+++ b/scripts/check-git-log.sh
@@ -140,7 +140,11 @@ IFS='
 fixtags=$(echo "$tags" | grep '^Fixes: ')
 bad=$(for fixtag in $fixtags ; do
 	hash=$(echo "$fixtag" | sed 's,^Fixes: \([0-9a-f]*\).*,\1,')
-	good="Fixes: $hash "$(git log --format='("%s")' -1 $hash 2>&-)
+	if git branch --contains $hash | grep -q '^\*' ; then
+		good="Fixes: $hash "$(git log --format='("%s")' -1 $hash 2>&-)
+	else
+		good="reference not in current branch"
+	fi
 	printf "$fixtag" | grep -v "^$good$"
 done | sed 's,^,\t,')
 [ -z "$bad" ] || printf "Wrong 'Fixes' reference:\n$bad\n"