Re: [PATCH] rebase -i: remove undocumented '--verify' flag
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:05
Martin von Zweigbergk [off-list ref] writes:
(I hope this is the correct way of including a patch. I have only used 'git send-email before'. I noticed that Jeff seems to remove the first three lines and put a '-- 8> --' before, but others do not. What does the mysterious header mean?) -- >8 -- Subject: [PATCH] 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 <redacted>
Sounds like a sane thing to do.
quoted hunk
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f3753a8..1f5ce74 100644 --- 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]. +--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 surroundingdiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a27952d..4eabe54 100755 --- 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 +verify allow pre-rebase hook to run
Somehow this patch seems severely whitespace mangled---please check your MUA. I think I've seen Alpine send patches sanely; there should be a way to tell it to behave. No need to resend; I can unmunge this patch by hand.