Merge pull request #22 from seth/sf/use-rev-parse

Use git rev-parse to obtain current branch name
esl · Feb 4, 2013 · 74bdbb3 · 74bdbb3
2 parents 35f8296 + 1bcdaff
commit 74bdbb3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/edown_doclet.erl b/src/edown_doclet.erl
@@ -225,11 +225,11 @@ do_redirect(Href, Prefix) ->
     end.
 
 get_git_branch() ->
-    case os:cmd("git describe --always --all") of
+    case os:cmd("git rev-parse --abbrev-ref HEAD") of
 	"fatal:" ++ _ -> "master";  % sensible default
 	Git ->
-	    case string:tokens(Git, " \n/") of
-		[_, Branch]	-> Branch;
+	    case string:tokens(Git, " \n") of
+		[Branch]	-> Branch;
 		Other		-> erlang:error({cannot_get_git_branch, Other})
 	    end
     end.