rebase: support --verify

Interactive rebase allows the '--verify' option to be passed, but it will
be ignored. Implement proper support for the option for both interactive
and non-interactive rebase by making it override any previous
'--no-verify'.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 30e5c0eb14470a5f72174b1071eac79c55fb0c41..96680c84561c434c4cf3a00cfe958b21f18a3d8d 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -279,6 +279,10 @@ which makes little sense.
 --no-verify::
        This option bypasses the pre-rebase hook.  See also linkgit:githooks[5].
 
 --no-verify::
        This option bypasses the pre-rebase hook.  See also linkgit:githooks[5].
 

+--verify::
+       Allows the pre-rebase hook to run, which is the default.  This option can
+       be used to override --no-verify.  See also linkgit:githooks[5].
+

 -C<n>::
        Ensure at least <n> lines of surrounding context match before
        and after each change.  When fewer lines of surrounding
 -C<n>::
        Ensure at least <n> lines of surrounding context match before
        and after each change.  When fewer lines of surrounding

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a27952d9fdfb517f684b7d304831bf74d0ce237b..4eabe54e36aece1d21d4e421416b48184b2f5a6b 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -28,6 +28,7 @@ continue           continue rebasing process
 abort              abort rebasing process and restore original branch
 skip               skip current patch and continue rebasing process
 no-verify          override pre-rebase hook from stopping the operation
 abort              abort rebasing process and restore original branch
 skip               skip current patch and continue rebasing process
 no-verify          override pre-rebase hook from stopping the operation

+verify             allow pre-rebase hook to run

 root               rebase all reachable commmits up to the root(s)
 autosquash         move commits that begin with squash!/fixup! under -i
 "
 root               rebase all reachable commmits up to the root(s)
 autosquash         move commits that begin with squash!/fixup! under -i
 "


@@ -727,6 +728,7 @@ do
                OK_TO_SKIP_PRE_REBASE=yes
                ;;
        --verify)
                OK_TO_SKIP_PRE_REBASE=yes
                ;;
        --verify)

+               OK_TO_SKIP_PRE_REBASE=

                ;;
        --continue)
                is_standalone "$@" || usage
                ;;
        --continue)
                is_standalone "$@" || usage

diff --git a/git-rebase.sh b/git-rebase.sh
index 10a238ae3cc942bc021db18195b7098e2866c266..7548f0cae4b21b8f645f0521258f579a081410e6 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -205,6 +205,9 @@ do
        --no-verify)
                OK_TO_SKIP_PRE_REBASE=yes
                ;;
        --no-verify)
                OK_TO_SKIP_PRE_REBASE=yes
                ;;

+       --verify)
+               OK_TO_SKIP_PRE_REBASE=
+               ;;

        --continue)
                test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
                        die "No rebase in progress?"
        --continue)
                test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
                        die "No rebase in progress?"