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>
Martin von Zweigbergk committed
Nov 22, 2010 at 21:21 UTC
7baf9c4b70784920e05f9be6614084ef8f64674d
3 files changed
+9
Documentation/git-rebase.txt
+4
@@ -279,6 +279,10 @@ which makes little sense.
279
--no-verify::
280
This option bypasses the pre-rebase hook. See also linkgit:githooks[5].
281
282
+--verify::
283
+ Allows the pre-rebase hook to run, which is the default. This option can
284
+ be used to override --no-verify. See also linkgit:githooks[5].
285
+
286
-C<n>::
287
Ensure at least <n> lines of surrounding context match before
288
and after each change. When fewer lines of surrounding
git-rebase--interactive.sh
+2
@@ -28,6 +28,7 @@ continue continue rebasing process
28
abort abort rebasing process and restore original branch
29
skip skip current patch and continue rebasing process
30
no-verify override pre-rebase hook from stopping the operation
31
+verify allow pre-rebase hook to run
32
root rebase all reachable commmits up to the root(s)
33
autosquash move commits that begin with squash!/fixup! under -i
34
"
@@ -727,6 +728,7 @@ do
728
OK_TO_SKIP_PRE_REBASE=yes
729
;;
730
--verify)
731
+ OK_TO_SKIP_PRE_REBASE=
732
;;
733
--continue)
734
is_standalone "$@" || usage
git-rebase.sh
+3
@@ -205,6 +205,9 @@ do
205
--no-verify)
206
OK_TO_SKIP_PRE_REBASE=yes
207
;;
208
+ --verify)
209
+ OK_TO_SKIP_PRE_REBASE=
210
+ ;;
211
--continue)
212
test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
213
die "No rebase in progress?"