Merge branch 'maint'

* maint:
  Documentation: fix graph in git-rev-parse.txt
  show-branch --current: do not barf on detached HEAD
This commit is contained in:
Junio C Hamano
2008-05-26 19:49:01 -07:00
2 changed files with 14 additions and 12 deletions

View File

@ -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);
}
}