We warn again if there is more than one line with the "fixes:" tag.
The warning is only silenced when the commit has landed already or we
output another message for every "fixes:" tag.
Signed-off-by: Andres Gomez <ago...@igalia.com>
---
bin/get-fixes-pick-list.sh | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh
index cf95f28377..3ea649a0a4 100755
--- a/bin/get-fixes-pick-list.sh
+++ b/bin/get-fixes-pick-list.sh
@@ -33,7 +33,14 @@ do
# For each one try to extract the tag
fixes_count=`git show $sha | grep -i "fixes:" | wc -l`
+ warn=`(test $fixes_count -gt 1 && echo $fixes_count) || echo 0`
while [ $fixes_count -gt 0 ] ; do
+ # Skip if it has been already landed.
+ if grep -q ^$sha already_picked ; then
+ warn=0
+ break
+ fi
+
fixes=`git show $sha | grep -i "fixes:" | tail -n $fixes_count
| head -n 1`
fixes_count=$(($fixes_count-1))
# The following sed/cut combination is borrowed from GregKH
@@ -53,19 +60,19 @@ do
if grep -q ^$id already_picked ||
grep -q ^$id already_landed ; then
- # Finally nominate the fix if it hasn't landed yet.
- if grep -q ^$sha already_picked ; then
- continue
- fi
-
printf "Commit \"%s\" fixes %s\n" \
"`git log -n1 --pretty=oneline $sha`" \
"$id"
- fixes_count=0
+ warn=$(($warn-1))
fi
done
+ if [ $warn -gt 0 ] ; then
+ printf "WARNING: Commit \"%s\" has more than one Fixes tag\n" \
+ "`git log -n1 --pretty=oneline $sha`"
+ fi
+
done
rm -f already_picked
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
