From: Junio C Hamano <gitster@pobox.com>
To: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Cc: Johannes Sixt <j6t@kdbg.org>, git@vger.kernel.org
Subject: Re: [PATCH v2 1/1] completion: add remaining flags to checkout
Date: Wed, 25 Oct 2017 15:22:45 +0900 [thread overview]
Message-ID: <xmqqa80fiw5m.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqefprix2c.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 25 Oct 2017 15:03:07 +0900")
Junio C Hamano <gitster@pobox.com> writes:
> Johannes Sixt <j6t@kdbg.org> writes:
>
>>> The flags --force and --ignore-other-worktrees are not added as they are
>>> potentially dangerous.
>>>
>>> The flags --progress and --no-progress are only useful for scripting and are
>>> therefore also not included.
>>>
>>> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
>>> ---
>>> contrib/completion/git-completion.bash | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>>> index d934417475..eb6ade6974 100644
>>> --- a/contrib/completion/git-completion.bash
>>> +++ b/contrib/completion/git-completion.bash
>>> @@ -1250,7 +1250,8 @@ _git_checkout ()
>>> --*)
>>> __gitcomp "
>>> --quiet --ours --theirs --track --no-track --merge
>>> - --conflict= --orphan --patch
>>> + --conflict= --orphan --patch --detach --ignore-skip-worktree-bits
>>> + --recurse-submodules --no-recurse-submodules
>>> "
>>> ;;
>>> *)
>>>
>>
>> Looks good to me. Thanks,
>> -- Hannes
>
> Doesn't quite. This breaks t9902, doesn't it?
I've queued it with the following squashed in.
t/t9902-completion.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 2cb999ecfa..fc614dcbfa 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1245,6 +1245,10 @@ test_expect_success 'double dash "git checkout"' '
--conflict=
--orphan Z
--patch Z
+ --detach Z
+ --ignore-skip-worktree-bits Z
+ --recurse-submodules Z
+ --no-recurse-submodules Z
EOF
'
prev parent reply other threads:[~2017-10-25 6:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 12:20 [PATCH v1 1/1] completion: add remaining flags to checkout Thomas Braun
2017-10-12 16:50 ` Johannes Sixt
2017-10-12 20:30 ` Johannes Sixt
2017-10-24 13:18 ` Thomas Braun
2017-10-24 13:19 ` [PATCH v2 " Thomas Braun
2017-10-24 16:45 ` Johannes Sixt
2017-10-25 6:03 ` Junio C Hamano
2017-10-25 6:22 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa80fiw5m.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=thomas.braun@virtuell-zuhause.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.