From: Junio C Hamano <gitster@pobox.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: paulus@samba.org, max@max630.net, git@vger.kernel.org
Subject: Re: [PATCH] gitk: fix --all behavior combined with --not
Date: Mon, 08 Jul 2019 12:01:35 -0700 [thread overview]
Message-ID: <xmqq4l3wz6y8.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190704080907.GA45656@book.hvoigt.net> (Heiko Voigt's message of "Thu, 4 Jul 2019 10:09:07 +0200")
Heiko Voigt <hvoigt@hvoigt.net> writes:
> In commit 4d5e1b1319 ("gitk: Show detached HEAD if --all is specified",
> 2014-09-09) the intention was to have detached HEAD shown when the --all
> argument is given.
The "do we have --all?" test added by that old commit is not quite
satisfying in the first place. E.g. we do not check if there is a
double-dash before it. This change also relies on an ancient design
mistake of allowing non-dashed options before a dashed one, adding
more to dissatisfaction by making a future change to correct the
design mistake harder.
I think in the longer term we should consider changing "git
rev-parse --all" to include HEAD in the concept of "all refs"
instead. But in the meantime, this patch is not making things
drastically wrong, so let's take it as is.
Thanks.
>
> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
> ---
> gitk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gitk b/gitk
> index a14d7a1..19d95cd 100755
> --- a/gitk
> +++ b/gitk
> @@ -295,7 +295,7 @@ proc parseviewrevs {view revs} {
> if {$revs eq {}} {
> set revs HEAD
> } elseif {[lsearch -exact $revs --all] >= 0} {
> - lappend revs HEAD
> + linsert revs 0 HEAD
> }
> if {[catch {set ids [eval exec git rev-parse $revs]} err]} {
> # we get stdout followed by stderr in $err
next prev parent reply other threads:[~2019-07-08 19:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 8:09 [PATCH] gitk: fix --all behavior combined with --not Heiko Voigt
2019-07-04 10:38 ` Johannes Schindelin
2019-07-04 11:31 ` Heiko Voigt
2019-07-08 19:01 ` Junio C Hamano [this message]
2019-07-09 4:55 ` Junio C Hamano
2019-07-09 5:16 ` Junio C Hamano
2019-07-10 7:58 ` Heiko Voigt
2019-07-10 18:40 ` Junio C Hamano
2019-07-11 12:24 ` Heiko Voigt
2019-07-11 18:55 ` Junio C Hamano
2019-07-11 17:11 ` Johannes Sixt
2019-07-10 7:44 ` Heiko Voigt
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=xmqq4l3wz6y8.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=max@max630.net \
--cc=paulus@samba.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).