X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bin%2Fget-fixes-pick-list.sh;h=047ea3bec1056ff9889a2a98fb08ad240fa19d24;hb=e8b91e99e9965fa717be25da66fba0cdc3aef5dc;hp=fb7ef2238201dbdacb8779faee7b0a5b21a204a8;hpb=5d87667fed1bd5ab850abdfb3a10db8c8c21c330;p=mesa.git

diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh
index fb7ef223820..047ea3bec10 100755
--- a/bin/get-fixes-pick-list.sh
+++ b/bin/get-fixes-pick-list.sh
@@ -16,7 +16,7 @@ latest_branchpoint=`git merge-base origin/master HEAD`
 git log --reverse --pretty=%H $latest_branchpoint > already_landed
 
 # ... and the ones cherry-picked.
-git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
+git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
 	grep "cherry picked from commit" |\
 	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//'  > already_picked
 
@@ -38,7 +38,7 @@ do
 
 	# Place every "fixes:" tag on its own line and join with the next word
 	# on its line or a later one.
-	fixes=`git show -s $sha | tr -d "\n" | sed -e 's/fixes:[[:space:]]*/\nfixes:/Ig' | grep "fixes:" | sed -e 's/\(fixes:[a-zA-Z0-9]*\).*$/\1/'`
+	fixes=`git show --pretty=medium -s $sha | tr -d "\n" | sed -e 's/fixes:[[:space:]]*/\nfixes:/Ig' | grep "fixes:" | sed -e 's/\(fixes:[a-zA-Z0-9]*\).*$/\1/'`
 
 	# For each one try to extract the tag
 	fixes_count=`echo "$fixes" | wc -l`