Merge branch 'maint'

gitster · gitster · commit 2fe18392f035 · 2008-05-26T19:49:01.000-07:00
* maint:
  Documentation: fix graph in git-rev-parse.txt
  show-branch --current: do not barf on detached HEAD
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
@@ -243,16 +243,18 @@ Here is an illustration, by Jon Loeliger.  Both commit nodes B
 and C are parents of commit node A.  Parent commits are ordered
 left-to-right.
 
-    G   H   I   J
-     \ /     \ /
-      D   E   F
-       \  |  / \ 
-        \ | /   |
-         \|/    |
-          B     C
-           \   /
-            \ /
-             A
+........................................
+G   H   I   J
+ \ /     \ /
+  D   E   F
+   \  |  / \
+    \ | /   |
+     \|/    |
+      B     C
+       \   /
+        \ /
+         A
+........................................
 
     A =      = A^0
     B = A^   = A^1     = A~1
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`