From: Michael J Gruber <git@drmicha.warpmail.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Julien Cretel <j.cretel@umail.ucc.ie>, git@vger.kernel.org
Subject: Re: Should "git log --decorate" indicate whether the HEAD is detached?
Date: Wed, 18 Feb 2015 20:45:08 +0100 [thread overview]
Message-ID: <54E4EBC4.6000802@drmicha.warpmail.net> (raw)
In-Reply-To: <xmqq8ufv408l.fsf@gitster.dls.corp.google.com>
Junio C Hamano venit, vidit, dixit 18.02.2015 18:07:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
>
>> "git branch" will tell you your branches and which one is checked out
>> (or HEAD); "git status" will tell you the latter.
>>
>> "git log" is about the DAG which has absolutely nothing to do with what
>> you have currently checked out.
>
> Yeah, that summarizes my reaction, too. More importantly, "log" is
> about showing commits and "--decorate" is a way to enrich the
> presentation of commits---it talks about commits in terms of refs;
> the command and the option is not about describing refs and their
> relationships.
>
> I do not terribly mind showing the fact that HEAD points at a branch
> when --decorate talks about HEAD, partly because we will be showing
> both HEAD and the branch name _anyway_ in the output. But I am not
> sure if the extra bit of information is more helpful to the readers
> or being distracting.
>
> Julien's "HEAD=master, other" vs "HEAD, master, other" may be
> subdued enough to be undistracting, I would guess. I do not think
> the distinction between "HEAD = master" and "HEAD -> master" would
> be useful, on the other hand. We already know that the names listed
> all refer to the same commit, which means that we do not have to say
> "HEAD is detached" explicitly as long as we have a way to say "HEAD
> points at this branch". If HEAD is listed and is not marked to
> point at another branch that is shown, by definition it is detached,
> no?
>
Yep, it very well is. Also, that approach would tell you which branch is
checked out, though I don't consider that git log's business.
OTOH, it's "backwards" in the sense that it marks the "ordinary" case
(HEAD is symref, branch is checked out) specially compared to the
"exceptional/dangerous" case (HEAD is ref, detached). And status, branch
will point out that latter case more verbously, too.
Michael
next prev parent reply other threads:[~2015-02-18 19:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-16 22:42 Should "git log --decorate" indicate whether the HEAD is detached? Julien Cretel
2015-02-16 23:15 ` Junio C Hamano
2015-02-16 23:40 ` Julien Cretel
2015-02-18 10:15 ` Michael J Gruber
2015-02-18 13:19 ` [RFC/PATCH] log: decorate detached HEAD differently Michael J Gruber
2015-02-18 17:07 ` Should "git log --decorate" indicate whether the HEAD is detached? Junio C Hamano
2015-02-18 19:45 ` Michael J Gruber [this message]
2015-02-18 19:49 ` Junio C Hamano
2015-02-19 9:52 ` Michael J Gruber
2015-02-19 11:13 ` Julien Cretel
2015-02-20 8:13 ` Junio C Hamano
2015-03-06 16:15 ` [PATCH] log: decorate detached HEAD differently Michael J Gruber
2015-03-06 16:20 ` Michael J Gruber
2015-03-06 19:03 ` Junio C Hamano
2015-03-09 9:16 ` Michael J Gruber
2015-03-10 2:03 ` Junio C Hamano
2015-03-10 10:34 ` Michael J Gruber
2015-03-10 13:53 ` [PATCHv2 0/2] log decorations for HEAD Michael J Gruber
2015-03-10 13:53 ` [PATCHv2 1/2] log-tree: properly reset colors Michael J Gruber
2015-03-10 13:53 ` [PATCHv2 2/2] log: decorate HEAD with branch name Michael J Gruber
2015-03-10 17:06 ` [PATCHv2 0/2] log decorations for HEAD Junio C Hamano
2015-03-11 8:02 ` Michael J Gruber
2015-03-23 10:36 ` Julien Cretel
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=54E4EBC4.6000802@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.cretel@umail.ucc.ie \
/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.