Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

getBranchName works language independent #1409

Merged
merged 1 commit into from
Oct 30, 2016
Merged

getBranchName works language independent #1409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/app/FakeLib/Git/Information.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,13 @@ let isGitVersionHigherOrEqual referenceVersion =
/// Gets the git branch name
let getBranchName repositoryDir =
try
let ok,msg,errors = runGitCommand repositoryDir "status"
let ok,msg,errors = runGitCommand repositoryDir "status -s -b"
let s = msg |> Seq.head

let mutable replaceBranchString = "On branch "
let mutable replaceNoBranchString = "Not currently on any branch."

let replaceNoBranchString = "## HEAD ("
let noBranch = "NoBranch"

if isGitVersionHigherOrEqual "1.9" then replaceNoBranchString <- "HEAD detached"
if not <| isGitVersionHigherOrEqual "1.9" then replaceBranchString <- "# " + replaceBranchString

if startsWith replaceNoBranchString s then noBranch else s.Replace(replaceBranchString,"")
if startsWith replaceNoBranchString s then noBranch else s.Substring(3)
with _ when (repositoryDir = "" || repositoryDir = ".") && buildServer = TeamFoundation ->
match environVarOrNone "BUILD_SOURCEBRANCHNAME" with
| None -> reraise()
Expand Down