From 3af7f8275b806d42daaad6f700c3917f8e33d3e4 Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Wed, 5 Apr 2017 20:18:42 +0200 Subject: [PATCH] bin/get-{extra,fixes}-pick-list.sh: improve output Show the commit hash and the title in a way that it is easier to copy and paste in the bin/.cherry-ignore-extra file if we want to ignore those commits for the future. v2: - Use printf instead echo (Eric Engestrom) Reviewed-by: Eric Engestrom Reviewed-by: Emil Velikov --- bin/get-extra-pick-list.sh | 4 +++- bin/get-fixes-pick-list.sh | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh index dbd5474befa..b42085f2aba 100755 --- a/bin/get-extra-pick-list.sh +++ b/bin/get-extra-pick-list.sh @@ -36,7 +36,9 @@ do continue fi fi - echo Commit $candidate references $sha + printf "Commit \"%s\" references %s\n" \ + "`git log -n1 --pretty=oneline $candidate`" \ + "$sha" done done diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh index 73afd0c22a1..f1398f320c8 100755 --- a/bin/get-fixes-pick-list.sh +++ b/bin/get-fixes-pick-list.sh @@ -34,7 +34,8 @@ do # For each one try to extract the tag fixes_count=`git show $sha | grep -i "fixes:" | wc -l` if [ "x$fixes_count" != x1 ] ; then - echo WARNING: Commit $sha has more than one Fixes tag + printf "WARNING: Commit \"%s\" has more than one Fixes tag\n" \ + "`git log -n1 --pretty=oneline $sha`" fi fixes=`git show $sha | grep -i "fixes:" | head -n 1` # The following sed/cut combination is borrowed from GregKH @@ -59,7 +60,9 @@ do continue fi - echo Commit $sha fixes $id + printf "Commit \"%s\" fixes %s\n" \ + "`git log -n1 --pretty=oneline $sha`" \ + "$id" fi done -- 2.30.2