From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 May 2008 22:09:51 +0000 (-0700)
Subject: show-branch --current: do not barf on detached HEAD
X-Git-Tag: v1.5.5.3~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8fcb57bb45e8d3d8f7921377d6c2503590efc3c;p=git.git

show-branch --current: do not barf on detached HEAD

The code assumed that there always is the current branch, but the result
from resolve_ref() on detached HEAD does not even start with "refs/heads/".

Originally noticed and fixed by Stephan Beyer.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 019abd352..a38332318 100644
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -782,8 +782,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 				has_head++;
 		}
 		if (!has_head) {
-			int pfxlen = strlen("refs/heads/");
-			append_one_rev(head + pfxlen);
+			int offset = !prefixcmp(head, "refs/heads/") ? 11 : 0;
+			append_one_rev(head + offset);
 		}
 	}