Merge pull request #320 from netnose/enum-mappings

Enum Mappings
2016-08-27 19:27:10 +02:00 · 2016-08-27 19:27:10 +02:00 · 0703dae9b2
parent 1670c49c7e 82f86f2f13
commit 0703dae9b2
2 changed files with 2 additions and 0 deletions
--- a/branch.go
+++ b/branch.go
@ -13,6 +13,7 @@ import (
 type BranchType uint

 const (
+	BranchAll    BranchType = C.GIT_BRANCH_ALL
 	BranchLocal  BranchType = C.GIT_BRANCH_LOCAL
 	BranchRemote BranchType = C.GIT_BRANCH_REMOTE
 )
--- a/status.go
+++ b/status.go
@ -25,6 +25,7 @@ const (
 	StatusWtTypeChange    Status = C.GIT_STATUS_WT_TYPECHANGE
 	StatusWtRenamed       Status = C.GIT_STATUS_WT_RENAMED
 	StatusIgnored         Status = C.GIT_STATUS_IGNORED
+	StatusConflicted      Status = C.GIT_STATUS_CONFLICTED
 )

 type StatusEntry struct {