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

gitster · gitster · commit f8fcb57bb45e · 2008-05-26T15:09:56.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -782,8 +782,8 @@ int cmd_show_branch(int ac, const char *av, const char prefix)`
`782`	`782`	`has_head++;`
`783`	`783`	`}`
`784`	`784`	`if (!has_head) {`
`785`		`- int pfxlen = strlen("refs/heads/");`
`786`		`- append_one_rev(head + pfxlen);`
	`785`	`+ int offset = !prefixcmp(head, "refs/heads/") ? 11 : 0;`
	`786`	`+ append_one_rev(head + offset);`
`787`	`787`	`}`
`788`	`788`	`}`
`789`	`789`