git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
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: Thu, 19 Feb 2015 10:52:39 +0100	[thread overview]
Message-ID: <54E5B267.9090604@drmicha.warpmail.net> (raw)
In-Reply-To: <xmqq8ufv2e62.fsf@gitster.dls.corp.google.com>

Junio C Hamano venit, vidit, dixit 18.02.2015 20:49:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
>> 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).
> 
> Both are ordinary and there is nothing exceptional or dangerous
> about your HEAD temporarily being detached during a "rebase -i"
> session, for example.

Sure, that's why I put it in quotes. That's only how it is perceived by
some users, and I suppose it's that kind of users that we are trying to
help here.

>> And status, branch
>> will point out that latter case more verbously, too.
> 
> Yeah, but as you said, that is not "log"'s business.

I still think decorations "detached HEAD" resp. "HEAD" for the two cases
are more natural, if we want to include any additional information at
all. Just think of:

deadbeef (HEAD=master, topicbranch, tag: v1)

log/rev-list is about commit objects. All the refs above resolve to the
same commit, so why are only two of them equal?

In fact, they are very unequal, since HEAD would be "ref:
refs/heads/master" whereas master would "deadbeef". They are equal in
the other (detached) case! I'm not telling you any news here, I just
want to point out how badly misleading that notation is.

So, I would suggest to "decorate the decorations", by saying something
like "detached HEAD", and maybe some version of "HEAD at master" (I'd
prefer just "HEAD") and possibly more info on the tags ("s-tag" or
"signed tag" etc).

Michael

  reply	other threads:[~2015-02-19  9:52 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
2015-02-18 19:49           ` Junio C Hamano
2015-02-19  9:52             ` Michael J Gruber [this message]
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

  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=54E5B267.9090604@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.
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).