]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
SCRIPTS: make git-show-backports also dump a "git show" command
authorWilly Tarreau <w@1wt.eu>
Tue, 25 Oct 2016 20:12:54 +0000 (22:12 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 25 Oct 2016 20:12:54 +0000 (22:12 +0200)
This is very convenient for backport reviews as in a single
command you get all the patches one at a time with their
changelog and backport instructions.

scripts/git-show-backports

index cbe40bbc296469d56130b23e2798087b15e4d906..6567b2f0243017bbcb6c5b2e76f9cf7326f4bc32 100755 (executable)
@@ -227,10 +227,12 @@ dump_commit_matrix | column -t | \
                echo "No missing commit to apply."
        elif [ -n "$MISSING" ]; then
                echo
-               echo "In order to apply all leftmost commits to current branch :"
+               echo "In order to show and/or apply all leftmost commits to current branch :"
+               echo "   git show ${left_commits[@]}"
                echo "   git cherry-pick -x ${left_commits[@]}"
                echo
-               echo "In order to apply all rightmost commits to current branch :"
+               echo "In order to show and/or apply all rightmost commits to current branch :"
+               echo "   git show ${right_commits[@]}"
                echo "   git cherry-pick -x ${right_commits[@]}"
        fi
 )