From a8297472762e9f1a38b17813a62e51d81656c1f2 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 26 Apr 2018 10:44:00 -0700 Subject: bin: force git show to use default pretty setting I have pretty default to short, which breaks this script. cc: Emil Velikov cc: Andres Gomez cc: Juan A. Suarez Signed-off-by: Dylan Baker --- 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 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` diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 1bd0b367d8b..9e9a39e494b 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 -- cgit v1.2.3