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>
This commit is contained in:
Martin von Zweigbergk 2010-11-22 21:21:01 +01:00 коммит произвёл Junio C Hamano
Родитель 03276d94bc
Коммит 7baf9c4b70
3 изменённых файлов: 9 добавлений и 0 удалений

Просмотреть файл

@ -279,6 +279,10 @@ which makes little sense.
--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

Просмотреть файл

@ -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
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
"
@ -727,6 +728,7 @@ do
OK_TO_SKIP_PRE_REBASE=yes
;;
--verify)
OK_TO_SKIP_PRE_REBASE=
;;
--continue)
is_standalone "$@" || usage

Просмотреть файл

@ -205,6 +205,9 @@ do
--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?"