Module: Mesa Branch: 18.1 Commit: a8297472762e9f1a38b17813a62e51d81656c1f2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8297472762e9f1a38b17813a62e51d81656c1f2
Author: Dylan Baker <[email protected]> Date: Thu Apr 26 10:44:00 2018 -0700 bin: force git show to use default pretty setting I have pretty default to short, which breaks this script. cc: Emil Velikov <[email protected]> cc: Andres Gomez <[email protected]> cc: Juan A. Suarez <[email protected]> Signed-off-by: Dylan Baker <[email protected]> --- bin/get-fixes-pick-list.sh | 4 ++-- bin/get-pick-list.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh index fb7ef22382..047ea3bec1 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` diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 1bd0b367d8..9e9a39e494 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -12,7 +12,7 @@ latest_branchpoint=`git merge-base origin/master HEAD` # Grep for commits with "cherry picked from commit" in the commit message. -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 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
