From f456f6f2a36f0e2ce82ef80819974cb9dc8b4e86 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 31 Jul 2020 16:38:57 +0200 Subject: [PATCH] SCRIPTS: git-show-backports: make -m most only show the left branch We've never used the output of the rightmost branch with this tool, and it systematically causes two identical outputs making the job harder during backport sessions. Let's simply remove the right part when it's identical to the left one. This also adds a few line feeds to make the output more readable. --- scripts/git-show-backports | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/git-show-backports b/scripts/git-show-backports index 4c6ccee76..d01f92ce1 100755 --- a/scripts/git-show-backports +++ b/scripts/git-show-backports @@ -248,13 +248,19 @@ dump_commit_matrix | column -t | \ if [ -n "$MISSING" -a ${#left_commits[@]} -eq 0 ]; then echo "No missing commit to apply." elif [ -n "$MISSING" ]; then + echo echo echo "In order to show and/or apply all leftmost commits to current branch :" echo " git show ${left_commits[@]}" + echo echo " git cherry-pick -sx ${left_commits[@]}" echo - echo "In order to show and/or apply all rightmost commits to current branch :" - echo " git show ${right_commits[@]}" - echo " git cherry-pick -sx ${right_commits[@]}" + if [ "${left_commits[*]}" != "${right_commits[*]}" ]; then + echo "In order to show and/or apply all rightmost commits to current branch :" + echo " git show ${right_commits[@]}" + echo + echo " git cherry-pick -sx ${right_commits[@]}" + echo + fi fi )