diff options
| author | Dylan Baker <[email protected]> | 2018-04-26 10:44:00 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-04-27 10:19:55 -0700 |
| commit | 0c23bd76d1f494956996d8c0d8f7dcdaa8bdc12f (patch) | |
| tree | e84d5be6a663360baebed7ce22371dcf63063558 | |
| parent | b3ad4b69715cccff3212dc5a2b4d73b13da4bb1c (diff) | |
bin: force git show to use default pretty setting
I have pretty default to short, which breaks this script.
v2: - Fix both places that don't define a --pretty (Emil)
cc: Juan A. Suarez <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Andres Gomez <[email protected]> (v1)
Reviewed-by: Emil Velikov <[email protected]>
| -rwxr-xr-x | bin/get-fixes-pick-list.sh | 4 |
1 files changed, 2 insertions, 2 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` |