mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
parent 2d3cfd77ad 109440c1bf
commit 2fe18392f0
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rev-parse.txt
View File

@ -243,6 +243,7 @@ Here is an illustration, by Jon Loeliger. Both commit nodes B
and C are parents of commit node A. Parent commits are ordered and C are parents of commit node A. Parent commits are ordered
left-to-right. left-to-right.
........................................
G H I J G H I J
\ / \ / \ / \ /
D E F D E F
@ -253,6 +254,7 @@ left-to-right.
\ / \ /
\ / \ /
A A
........................................
A = = A^0 A = = A^0
B = A^ = A^1 = A~1 B = A^ = A^1 = A~1

4
builtin-show-branch.c
View File

@ -782,8 +782,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
has_head++; has_head++;
} }
if (!has_head) { if (!has_head) {
int pfxlen = strlen("refs/heads/"); int offset = !prefixcmp(head, "refs/heads/") ? 11 : 0;
append_one_rev(head + pfxlen); append_one_rev(head + offset);
} }
} }