From 1170bf409702f14e23ddd36ebfd029eaece36b99 Mon Sep 17 00:00:00 2001 From: Takuji Shimokawa Date: Thu, 4 Jun 2020 17:44:19 +0900 Subject: [PATCH 1/2] Add MergeTreeSkipREUC and MergeTreeNoRecursive flags to MergeTreeFlag. --- merge.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/merge.go b/merge.go index 06e98a0..9c804f7 100644 --- a/merge.go +++ b/merge.go @@ -126,6 +126,13 @@ const ( // continue resolving conflicts. The merge operation will fail with // GIT_EMERGECONFLICT and no index will be returned. MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_FAIL_ON_CONFLICT + // Do not write the REUC extension on the generated index + MergeTreeSkipREUC MergeTreeFlag = C.GIT_MERGE_SKIP_REUC + // If the commits being merged have multiple merge bases, do not build + // a recursive merge base (by merging the multiple merge bases), + // instead simply use the first base. This flag provides a similar + // merge base to `git-merge-resolve`. + MergeTreeNoRecursive MergeTreeFlag = C.GIT_MERGE_NO_RECURSIVE ) type MergeOptions struct { -- 2.45.2 From 9cbedf1d047ced89f49d93edb72dd04579fe76c7 Mon Sep 17 00:00:00 2001 From: Takuji Shimokawa Date: Fri, 5 Jun 2020 12:25:08 +0900 Subject: [PATCH 2/2] Change comments to conform to Go's convention. --- merge.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/merge.go b/merge.go index 9c804f7..6ca818e 100644 --- a/merge.go +++ b/merge.go @@ -126,12 +126,13 @@ const ( // continue resolving conflicts. The merge operation will fail with // GIT_EMERGECONFLICT and no index will be returned. MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_FAIL_ON_CONFLICT - // Do not write the REUC extension on the generated index + // MergeTreeSkipREUC specifies not to write the REUC extension on the + // generated index. MergeTreeSkipREUC MergeTreeFlag = C.GIT_MERGE_SKIP_REUC - // If the commits being merged have multiple merge bases, do not build - // a recursive merge base (by merging the multiple merge bases), - // instead simply use the first base. This flag provides a similar - // merge base to `git-merge-resolve`. + // MergeTreeNoRecursive specifies not to build a recursive merge base (by + // merging the multiple merge bases) if the commits being merged have + // multiple merge bases. Instead, the first base is used. + // This flag provides a similar merge base to `git-merge-resolve`. MergeTreeNoRecursive MergeTreeFlag = C.GIT_MERGE_NO_RECURSIVE ) -- 2.45.2