SCRIPTS: git-show-backports: emit the shell command to backport a commit
authorWilly Tarreau <w@1wt.eu>
Fri, 31 Jul 2020 14:47:44 +0000 (16:47 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 11 Aug 2020 09:34:18 +0000 (11:34 +0200)
It's cumbersome to copy-paste a commit ID into another window after having
typed "git cherry-pick -sx", so let's have the suggested output format of
git-show prepare this line just before the subject line, it remains at a
stable position on the terminal when searching for "/^commit". One just
has to copy-paste the line into another terminal will result in the commit
being properly picked.

(cherry picked from commit 1f927d1bc228c78c322c94c8c2d5247297c6f6c4)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit 2d6847aa7e2f7704c44c57982ef383c00f77a7c6)
Signed-off-by: Willy Tarreau <w@1wt.eu>

scripts/git-show-backports

index 2a3f468..5b45df8 100755 (executable)
@@ -251,13 +251,13 @@ dump_commit_matrix | column -t | \
                echo
                echo
                echo "In order to show and/or apply all leftmost commits to current branch :"
-               echo "   git show ${left_commits[@]}"
+               echo "   git show --pretty=format:'%C(yellow)commit  %H%C(normal)%nAuthor: %an <%ae>%nDate:   %aD%n%n%C(green)%C(bold)git cherry-pick -sx %h%n%n%w(72,4,4)%B%N' ${left_commits[@]}"
                echo
                echo "   git cherry-pick -sx ${left_commits[@]}"
                echo
                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 "   git show --pretty=format:'%C(yellow)commit  %H%C(normal)%nAuthor: %an <%ae>%nDate:   %aD%n%n%C(green)%C(bold)git cherry-pick -sx %h%n%n%w(72,4,4)%B%N' ${right_commits[@]}"
                        echo
                        echo "   git cherry-pick -sx ${right_commits[@]}"
                        echo