From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
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: Thu, 4 Jul 2019 12:38:44 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1907041236200.44@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190704080907.GA45656@book.hvoigt.net>
Hi Heiko,
On Thu, 4 Jul 2019, Heiko Voigt wrote:
> 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.
>
> This was solved by appending HEAD to the revs list. By doing that the
> behavior using the --not argument is now broken, since that inverts the
> meaning of all following arguments passed to git rev-parse.
>
> Lets fix this by prepending HEAD instead of appending, this way there
> can not be any '--not' in front.
>
> This was discovered because
>
> gitk --all --not origin/master
>
> does not display the same revs as
>
> gitk --all ^origin/master
>
> which it should.
>
> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Good description.
> ---
> 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
For a moment, I wondered whether there is any case where `HEAD` might not
be appropriate as first argument, but you're right, the revision parsing
machinery allows mixing options and rev arguments.
In short: this patch looks good to me.
Thanks,
Dscho
> }
> if {[catch {set ids [eval exec git rev-parse $revs]} err]} {
> # we get stdout followed by stderr in $err
> --
> 2.21.0
>
>
next prev parent reply other threads:[~2019-07-04 10:38 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 [this message]
2019-07-04 11:31 ` Heiko Voigt
2019-07-08 19:01 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1907041236200.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).