From: Heiko Voigt <hvoigt@hvoigt.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: paulus@samba.org, max@max630.net, git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] gitk: fix --all behavior combined with --not
Date: Wed, 10 Jul 2019 09:58:35 +0200 [thread overview]
Message-ID: <20190710075835.GB65621@book.hvoigt.net> (raw)
In-Reply-To: <xmqqk1crwzwd.fsf@gitster-ct.c.googlers.com>
On Mon, Jul 08, 2019 at 10:16:50PM -0700, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > The "--all" in rev-list family (including "git log") unconditionally
> > include HEAD. The glitch here is that "--all" in rev-parse does
> > not. And 4d5e1b1319 was an attempt to "fix" that, i.e. make "--all"
> > imply "HEAD".
>
> And it becomes really tempting to get rid of that "let's tweak
> --all" hack and declare that "rev-parse --all" is simply buggy,
> proposing a simple "bugfix" that may look like this (not even
> compile tested, but you get the idea).
Thanks for this nice pointer.
Lets think about this a little more, because this would give us a proper
solution. There would be a need to be backwards compatible to not break
peoples scripts right? The documentation says --all "Show all refs found
in refs/" so IMO we need some extra option that changes the '--all'
behavior. How about '--all-include-head'. Then e.g.
git rev-parse --all-include-head --all --not origin/master
would include the head ref like you proposed below?
What do you think? Or would you rather go the route of changing
rev-parse behavior?
Cheers Heiko
>
> builtin/rev-parse.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
> index f8bbe6d47e..94f9a6efba 100644
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -766,6 +766,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
> }
> if (!strcmp(arg, "--all")) {
> for_each_ref(show_reference, NULL);
> + head_ref(show_reference, NULL);
> clear_ref_exclusion(&ref_excludes);
> continue;
> }
next prev parent reply other threads:[~2019-07-10 7:58 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
2019-07-09 4:55 ` Junio C Hamano
2019-07-09 5:16 ` Junio C Hamano
2019-07-10 7:58 ` Heiko Voigt [this message]
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=20190710075835.GB65621@book.hvoigt.net \
--to=hvoigt@hvoigt.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).