git: introduce constants for index stages
Git can store multiple different versions of a file in the index. Normally, index stage 0 is the only version provided, but if there's a conflict, there can be three additional stages. Since we'll be working with these stages in a future commit, add constants for them to the git package.
This commit is contained in:
parent
48a931cc86
commit
c0a68086e9
@ -38,6 +38,15 @@ const (
|
|||||||
RefBeforeFirstCommit = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
|
RefBeforeFirstCommit = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type IndexStage int
|
||||||
|
|
||||||
|
const (
|
||||||
|
IndexStageDefault IndexStage = iota
|
||||||
|
IndexStageBase
|
||||||
|
IndexStageOurs
|
||||||
|
IndexStageTheirs
|
||||||
|
)
|
||||||
|
|
||||||
// Prefix returns the given RefType's prefix, "refs/heads", "ref/remotes",
|
// Prefix returns the given RefType's prefix, "refs/heads", "ref/remotes",
|
||||||
// etc. It returns an additional value of either true/false, whether or not this
|
// etc. It returns an additional value of either true/false, whether or not this
|
||||||
// given ref type has a prefix.
|
// given ref type has a prefix.
|
||||||
|
Loading…
Reference in New Issue
Block a user