Add [v]iew patch in git-am interactive.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-am.sh b/git-am.sh
index fd0772d900211557200c542b882ead04842f6628..115ebaddf595f49059208ac890308b6ebe01aa42 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -270,14 +270,17 @@ do
                echo "--------------------------"
                cat "$dotest/final-commit"
                echo "--------------------------"
                echo "--------------------------"
                cat "$dotest/final-commit"
                echo "--------------------------"

-               echo -n "Apply? [y]es/[n]o/[e]dit/[a]ccept all "
+               echo -n "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

                read reply
                case "$reply" in
                read reply
                case "$reply" in

-               y*|Y*) action=yes ;;
-               a*|A*) action=yes interactive= ;;
-               n*|N*) action=skip ;;
-               e*|E*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
+               [yY]*) action=yes ;;
+               [aA]*) action=yes interactive= ;;
+               [nN]*) action=skip ;;
+               [eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"

                       action=again ;;
                       action=again ;;

+               [vV]*) action=again
+                      LESS=-S ${PAGER:-less} "$dotest/patch" ;;
+               *)     action=again ;;

                esac
            done
        else
                esac
            done
        else