Merge branch 'maint-1.5.4' into maint-1.5.5

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 019abd3527e7c573c69900a58313749e2ef2280a..a383323184bdcfb5258ed8d375ac22990f95877c 100644 (file)
--- 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);
                }
        }