git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase -i: remove undocumented '--verify' flag

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 23, 2010, 20:14 UTC
Message-ID
<7vfwurvluh.fsf@alter.siamese.dyndns.org>
In-Reply-To
<alpine.DEB.1.10.1011222103290.17721@debian>
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
Show 13 quoted lines
> (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 <martin.von.zweigbergk@gmail.com>
Sounds like a sane thing to do.
Show 24 quoted lines
> 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 surrounding
> diff --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.
Previous: Junio C HamanoNext: Martin von Zweigbergk
Message 9 of 11 in “rebase -i: remove undocumented '--verify' flag”
  1. rebase -i: remove undocumented '--verify' flagMartin von Zweigbergk, Nov 22, 2010
  2. Matthieu MoyNov 22, 2010
  3. Thomas RastNov 22, 2010
  4. Matthieu MoyNov 22, 2010
  5. Martin von ZweigbergkNov 22, 2010
  6. Kevin BallardNov 23, 2010
  7. Jeff KingNov 23, 2010
  8. Junio C HamanoNov 23, 2010
  9. Junio C HamanoNov 23, 2010
  10. Martin von ZweigbergkNov 24, 2010
  11. Martin von ZweigbergkNov 22, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.