From: Junio C Hamano <junkio@cox.net>
Date: Wed, 3 Jan 2007 09:09:34 +0000 (-0800)
Subject: git-status: show detached HEAD
X-Git-Tag: v1.5.0-rc1~5^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bda324cf6158672b91a478036731d332c1a14cac;p=git.git

git-status: show detached HEAD

This makes git-status to state when you are not on any branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/wt-status.c b/wt-status.c
index c48127dac..2a002baab 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -288,9 +288,18 @@ void wt_status_print(struct wt_status *s)
 	unsigned char sha1[20];
 	s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
 
-	if (s->branch)
+	if (s->branch) {
+		const char *on_what = "On branch ";
+		const char *branch_name = s->branch;
+		if (!strncmp(branch_name, "refs/heads/", 11))
+			branch_name += 11;
+		else if (!strcmp(branch_name, "HEAD")) {
+			branch_name = "";
+			on_what = "Not currently on any branch.";
+		}
 		color_printf_ln(color(WT_STATUS_HEADER),
-			"# On branch %s", s->branch);
+			"# %s%s", on_what, branch_name);
+	}
 
 	if (s->is_initial) {
 		color_printf_ln(color(WT_STATUS_HEADER), "#");