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: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Julien Cretel <j.cretel@umail.ucc.ie>
Subject: [RFC/PATCH] log: decorate detached HEAD differently
Date: Wed, 18 Feb 2015 14:19:25 +0100	[thread overview]
Message-ID: <2df73f987d69531622681a560ce8ccbd88b15501.1424264942.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <54E46635.4060009@drmicha.warpmail.net>

"git status" and "git branch" let the user know when the HEAD is
detached, while "git log --decorate" does not.

Change the decoration by a detached HEAD to "detached HEAD". This can be
seen as giving more information about the decoration item itself in the
same way as we prefix tags by "tag: ".

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
This turned out to be easy to do, though I am still undecided.
Personally, I like to think of refs as objects (and have implemented refname
objects in the past), but that view is not too popular.

So, maybe the analogy between ref peeling and symref resolving (for HEAD) is
not that strong after all. They are both indirections, though different technically.

The RFC patch only checks HEAD for being a symref, the output is analogous to 
the summary of "git commit".

 log-tree.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/log-tree.c b/log-tree.c
index 7f0890e..2eac4b6 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -118,8 +118,14 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
 		type = DECORATION_REF_TAG;
 	else if (!strcmp(refname, "refs/stash"))
 		type = DECORATION_REF_STASH;
-	else if (!strcmp(refname, "HEAD"))
+	else if (!strcmp(refname, "HEAD")) {
+		char *junk_sha1[20];
+		char *head;
 		type = DECORATION_REF_HEAD;
+		head = resolve_ref_unsafe("HEAD", 0, junk_sha1, NULL);
+		if (!strcmp(head, "HEAD"))
+			refname = "detached HEAD";
+	}
 
 	if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
 		refname = prettify_refname(refname);
-- 
2.3.0.136.g92a3b58

  reply	other threads:[~2015-02-18 13:19 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       ` Michael J Gruber [this message]
2015-02-18 17:07       ` 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
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=2df73f987d69531622681a560ce8ccbd88b15501.1424264942.git.git@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).