diff options
| author | Calin Seciu <[email protected]> | 2015-10-26 16:20:18 +0200 |
|---|---|---|
| committer | Calin Seciu <[email protected]> | 2015-10-26 16:20:18 +0200 |
| commit | 367cd8eb9b84538933774befa76c099298c32c81 (patch) | |
| tree | b0b8d11250139b37a76c6ead494114411c2970dc /index.go | |
| parent | c4868aef6c3e22a5c339dea4dd5406bfc0bd095b (diff) | |
Update libgit2 to 821131f
The API changes are:
- `*Remote.Connect`
```go
// from:
func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks) error
// to:
func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks, headers []string) error
```
- `*Remote.ConnectFetch` - `headers` was added as above
- `*Remote.ConnectPush` - `headers` was added as above
Diffstat (limited to 'index.go')
| -rw-r--r-- | index.go | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -26,6 +26,24 @@ const ( IndexAddCheckPathspec IndexAddOpts = C.GIT_INDEX_ADD_CHECK_PATHSPEC ) +type IndexStageOpts int + +const ( + // IndexStageAny matches any index stage. + // + // Some index APIs take a stage to match; pass this value to match + // any entry matching the path regardless of stage. + IndexStageAny IndexStageOpts = C.GIT_INDEX_STAGE_ANY + // IndexStageNormal is a normal staged file in the index. + IndexStageNormal IndexStageOpts = C.GIT_INDEX_STAGE_NORMAL + // IndexStageAncestor is the ancestor side of a conflict. + IndexStageAncestor IndexStageOpts = C.GIT_INDEX_STAGE_ANCESTOR + // IndexStageOurs is the "ours" side of a conflict. + IndexStageOurs IndexStageOpts = C.GIT_INDEX_STAGE_OURS + // IndexStageTheirs is the "theirs" side of a conflict. + IndexStageTheirs IndexStageOpts = C.GIT_INDEX_STAGE_THEIRS +) + type Index struct { ptr *C.git_index } |
