From 1e8b7ef38075268665a7157b072a8760374787aa Mon Sep 17 00:00:00 2001 From: Hans Rødtang Date: Tue, 29 Mar 2016 20:37:22 +0200 Subject: Add "Conflicted" git.Delta and git.Status. --- diff.go | 1 + 1 file changed, 1 insertion(+) (limited to 'diff.go') 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 -- cgit v1.2.3 From 094bb3767b9168b81e5977ee0358c389e91f3920 Mon Sep 17 00:00:00 2001 From: Hans Rødtang Date: Tue, 29 Mar 2016 20:41:46 +0200 Subject: Add unimplemented diff delta/flag values. --- diff.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'diff.go') 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 -- cgit v1.2.3