diff options
| author | Carlos Martín Nieto <[email protected]> | 2014-10-27 15:12:18 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2014-10-28 11:29:31 +0100 |
| commit | 668aa5dae1690d1a061da728f83b2450485d47f4 (patch) | |
| tree | 1f8172827cc8306888d6678ffd8ccd7b09e1b4fa /merge.go | |
| parent | 9c6db70fc2836b6f5eb56c505f9cc82461b999c3 (diff) | |
Make the constants have types
While Go will assign the correct type to a const block when it
auto-creates the values, assigning makes the const be typeless and will
only gain it in each particular use.
Make each constant in the blocks have an assigned type.
Diffstat (limited to 'merge.go')
| -rw-r--r-- | merge.go | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -122,9 +122,9 @@ type MergeFileFavor int const ( MergeFileFavorNormal MergeFileFavor = C.GIT_MERGE_FILE_FAVOR_NORMAL - MergeFileFavorOurs = C.GIT_MERGE_FILE_FAVOR_OURS - MergeFileFavorTheirs = C.GIT_MERGE_FILE_FAVOR_THEIRS - MergeFileFavorUnion = C.GIT_MERGE_FILE_FAVOR_UNION + MergeFileFavorOurs MergeFileFavor = C.GIT_MERGE_FILE_FAVOR_OURS + MergeFileFavorTheirs MergeFileFavor = C.GIT_MERGE_FILE_FAVOR_THEIRS + MergeFileFavorUnion MergeFileFavor = C.GIT_MERGE_FILE_FAVOR_UNION ) func (r *Repository) Merge(theirHeads []*MergeHead, mergeOptions *MergeOptions, checkoutOptions *CheckoutOpts) error { @@ -150,18 +150,18 @@ type MergeAnalysis int const ( MergeAnalysisNone MergeAnalysis = C.GIT_MERGE_ANALYSIS_NONE - MergeAnalysisNormal = C.GIT_MERGE_ANALYSIS_NORMAL - MergeAnalysisUpToDate = C.GIT_MERGE_ANALYSIS_UP_TO_DATE - MergeAnalysisFastForward = C.GIT_MERGE_ANALYSIS_FASTFORWARD - MergeAnalysisUnborn = C.GIT_MERGE_ANALYSIS_UNBORN + MergeAnalysisNormal MergeAnalysis = C.GIT_MERGE_ANALYSIS_NORMAL + MergeAnalysisUpToDate MergeAnalysis = C.GIT_MERGE_ANALYSIS_UP_TO_DATE + MergeAnalysisFastForward MergeAnalysis = C.GIT_MERGE_ANALYSIS_FASTFORWARD + MergeAnalysisUnborn MergeAnalysis = C.GIT_MERGE_ANALYSIS_UNBORN ) type MergePreference int const ( - MergePreferenceNone MergePreference = C.GIT_MERGE_PREFERENCE_NONE - MergePreferenceNoFastForward = C.GIT_MERGE_PREFERENCE_NO_FASTFORWARD - MergePreferenceFastForwardOnly = C.GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY + MergePreferenceNone MergePreference = C.GIT_MERGE_PREFERENCE_NONE + MergePreferenceNoFastForward MergePreference = C.GIT_MERGE_PREFERENCE_NO_FASTFORWARD + MergePreferenceFastForwardOnly MergePreference = C.GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY ) func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, MergePreference, error) { @@ -287,9 +287,9 @@ type MergeFileFlags int const ( MergeFileDefault MergeFileFlags = C.GIT_MERGE_FILE_DEFAULT - MergeFileStyleMerge = C.GIT_MERGE_FILE_STYLE_MERGE - MergeFileStyleDiff = C.GIT_MERGE_FILE_STYLE_DIFF3 - MergeFileStyleSimplifyAlnum = C.GIT_MERGE_FILE_SIMPLIFY_ALNUM + MergeFileStyleMerge MergeFileFlags = C.GIT_MERGE_FILE_STYLE_MERGE + MergeFileStyleDiff MergeFileFlags = C.GIT_MERGE_FILE_STYLE_DIFF3 + MergeFileStyleSimplifyAlnum MergeFileFlags = C.GIT_MERGE_FILE_SIMPLIFY_ALNUM ) type MergeFileOptions struct { |