Re: [PATCH] completion: suggest sequencer commands for revert
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 29, 2015, 19:50 UTC
- Message-ID
- <xmqq1thzcgde.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1432547975.4644.5.camel@virtuell-zuhause.de>
Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:
Show 7 quoted lines
> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> > --- > > Hi, > > I added the sequencer commands for git revert. These are handy in case a git > revert needs manual intervention.
This looks OK from a cursory read to me; asking opinions from those who have touched the file in the recent past (Ram also happens to be one of the people who were heavily involved in sequencer work).
Thanks.
Show 23 quoted lines
>
> Thanks,
> Thomas
>
> contrib/completion/git-completion.bash | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index bfc74e9..3c00acd 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -2282,6 +2282,11 @@ _git_reset ()
>
> _git_revert ()
> {
> + local dir="$(__gitdir)"
> + if [ -f "$dir"/REVERT_HEAD ]; then
> + __gitcomp "--continue --quit --abort"
> + return
> + fi
> case "$cur" in
> --*)
> __gitcomp "--edit --mainline --no-edit --no-commit --signoff"