From 1e8b7ef38075268665a7157b072a8760374787aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20R=C3=B8dtang?= Date: Tue, 29 Mar 2016 20:37:22 +0200 Subject: [PATCH 1/5] Add "Conflicted" git.Delta and git.Status. --- diff.go | 1 + status.go | 1 + 2 files changed, 2 insertions(+) diff --git a/diff.go b/diff.go index 565fcee..38505d2 100644 --- a/diff.go +++ b/diff.go @@ -34,6 +34,7 @@ const ( DeltaIgnored Delta = C.GIT_DELTA_IGNORED DeltaUntracked Delta = C.GIT_DELTA_UNTRACKED DeltaTypeChange Delta = C.GIT_DELTA_TYPECHANGE + DeltaConflicted Delta = C.GIT_DELTA_CONFLICTED ) type DiffLineType int diff --git a/status.go b/status.go index 068a474..e68e6e9 100644 --- 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 { -- 2.45.2 From 094bb3767b9168b81e5977ee0358c389e91f3920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20R=C3=B8dtang?= Date: Tue, 29 Mar 2016 20:41:46 +0200 Subject: [PATCH 2/5] Add unimplemented diff delta/flag values. --- diff.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.go b/diff.go index 38505d2..5b96fac 100644 --- a/diff.go +++ b/diff.go @@ -20,6 +20,7 @@ const ( DiffFlagBinary DiffFlag = C.GIT_DIFF_FLAG_BINARY DiffFlagNotBinary DiffFlag = C.GIT_DIFF_FLAG_NOT_BINARY DiffFlagValidOid DiffFlag = C.GIT_DIFF_FLAG_VALID_ID + DiffFlagExists DiffFlag = C.GIT_DIFF_FLAG_EXISTS ) type Delta int @@ -34,6 +35,7 @@ const ( DeltaIgnored Delta = C.GIT_DELTA_IGNORED DeltaUntracked Delta = C.GIT_DELTA_UNTRACKED DeltaTypeChange Delta = C.GIT_DELTA_TYPECHANGE + DeltaUnreadable Delta = C.GIT_DELTA_UNREADABLE DeltaConflicted Delta = C.GIT_DELTA_CONFLICTED ) @@ -373,6 +375,7 @@ const ( DiffIgnoreFilemode DiffOptionsFlag = C.GIT_DIFF_IGNORE_FILEMODE DiffIgnoreSubmodules DiffOptionsFlag = C.GIT_DIFF_IGNORE_SUBMODULES DiffIgnoreCase DiffOptionsFlag = C.GIT_DIFF_IGNORE_CASE + DiffIncludeCaseChange DiffOptionsFlag = C.GIT_DIFF_INCLUDE_CASECHANGE DiffDisablePathspecMatch DiffOptionsFlag = C.GIT_DIFF_DISABLE_PATHSPEC_MATCH DiffSkipBinaryCheck DiffOptionsFlag = C.GIT_DIFF_SKIP_BINARY_CHECK -- 2.45.2 From b99dbb1361938e74312ec8a432730a8bb6ee801f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20R=C3=B8dtang?= Date: Tue, 29 Mar 2016 20:42:19 +0200 Subject: [PATCH 3/5] Add Repository.IsHeadUnborn --- repository.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/repository.go b/repository.go index 2e6b81d..caf7bbe 100644 --- a/repository.go +++ b/repository.go @@ -268,6 +268,17 @@ func (v *Repository) IsHeadDetached() (bool, error) { return ret != 0, nil } +func (v *Repository) IsHeadUnborn() (bool, error) { + runtime.LockOSThread() + defer runtime.UnlockOSThread() + + ret := C.git_repository_head_unborn(v.ptr) + if ret < 0 { + return false, MakeGitError(ret) + } + return ret != 0, nil +} + func (v *Repository) Walk() (*RevWalk, error) { var walkPtr *C.git_revwalk -- 2.45.2 From 726331dfde5cddabb8ded9967b581efcea77b765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20R=C3=B8dtang?= Date: Tue, 29 Mar 2016 20:42:30 +0200 Subject: [PATCH 4/5] Add Repository.IsEmpty --- repository.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/repository.go b/repository.go index caf7bbe..6ed6066 100644 --- a/repository.go +++ b/repository.go @@ -279,6 +279,18 @@ func (v *Repository) IsHeadUnborn() (bool, error) { return ret != 0, nil } +func (v *Repository) IsEmpty() (bool, error) { + runtime.LockOSThread() + defer runtime.UnlockOSThread() + + ret := C.git_repository_is_empty(v.ptr) + if ret < 0 { + return false, MakeGitError(ret) + } + + return ret != 0, nil +} + func (v *Repository) Walk() (*RevWalk, error) { var walkPtr *C.git_revwalk -- 2.45.2 From 2be7d7987b40fad0ee064e2feb5a132fd9ed3c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20R=C3=B8dtang?= Date: Tue, 29 Mar 2016 20:42:41 +0200 Subject: [PATCH 5/5] Add Repository.IsShallow --- repository.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/repository.go b/repository.go index 6ed6066..f0a2c74 100644 --- a/repository.go +++ b/repository.go @@ -291,6 +291,17 @@ func (v *Repository) IsEmpty() (bool, error) { return ret != 0, nil } +func (v *Repository) IsShallow() (bool, error) { + runtime.LockOSThread() + defer runtime.UnlockOSThread() + + ret := C.git_repository_is_shallow(v.ptr) + if ret < 0 { + return false, MakeGitError(ret) + } + return ret != 0, nil +} + func (v *Repository) Walk() (*RevWalk, error) { var walkPtr *C.git_revwalk -- 2.45.2