summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.go13
-rw-r--r--index.go4
-rw-r--r--tree.go12
m---------vendor/libgit20
4 files changed, 8 insertions, 21 deletions
diff --git a/config.go b/config.go
index 6b1f093..5bcb0f8 100644
--- a/config.go
+++ b/config.go
@@ -342,18 +342,6 @@ func OpenOndisk(parent *Config, path string) (*Config, error) {
return config, nil
}
-// Refresh refreshes the configuration to reflect any changes made externally e.g. on disk
-func (c *Config) Refresh() error {
- runtime.LockOSThread()
- defer runtime.UnlockOSThread()
-
- if ret := C.git_config_refresh(c.ptr); ret < 0 {
- return MakeGitError(ret)
- }
-
- return nil
-}
-
type ConfigIterator struct {
ptr *C.git_config_iterator
}
@@ -374,4 +362,3 @@ func (iter *ConfigIterator) Free() {
runtime.SetFinalizer(iter, nil)
C.free(unsafe.Pointer(iter.ptr))
}
-
diff --git a/index.go b/index.go
index e4ca9d6..230e159 100644
--- a/index.go
+++ b/index.go
@@ -35,7 +35,7 @@ type Index struct {
type IndexEntry struct {
Ctime time.Time
Mtime time.Time
- Mode uint
+ Mode Filemode
Uid uint
Gid uint
Size uint
@@ -50,7 +50,7 @@ func newIndexEntryFromC(entry *C.git_index_entry) *IndexEntry {
return &IndexEntry{
time.Unix(int64(entry.ctime.seconds), int64(entry.ctime.nanoseconds)),
time.Unix(int64(entry.mtime.seconds), int64(entry.mtime.nanoseconds)),
- uint(entry.mode),
+ Filemode(entry.mode),
uint(entry.uid),
uint(entry.gid),
uint(entry.file_size),
diff --git a/tree.go b/tree.go
index e5fe361..45de9f1 100644
--- a/tree.go
+++ b/tree.go
@@ -17,10 +17,10 @@ type Filemode int
const (
FilemodeTree Filemode = C.GIT_FILEMODE_TREE
- FilemodeBlob = C.GIT_FILEMODE_BLOB
- FilemodeBlobExecutable = C.GIT_FILEMODE_BLOB_EXECUTABLE
- FilemodeLink = C.GIT_FILEMODE_LINK
- FilemodeCommit = C.GIT_FILEMODE_COMMIT
+ FilemodeBlob Filemode = C.GIT_FILEMODE_BLOB
+ FilemodeBlobExecutable Filemode = C.GIT_FILEMODE_BLOB_EXECUTABLE
+ FilemodeLink Filemode = C.GIT_FILEMODE_LINK
+ FilemodeCommit Filemode = C.GIT_FILEMODE_COMMIT
)
type Tree struct {
@@ -32,7 +32,7 @@ type TreeEntry struct {
Name string
Id *Oid
Type ObjectType
- Filemode int
+ Filemode Filemode
}
func newTreeEntry(entry *C.git_tree_entry) *TreeEntry {
@@ -40,7 +40,7 @@ func newTreeEntry(entry *C.git_tree_entry) *TreeEntry {
C.GoString(C.git_tree_entry_name(entry)),
newOidFromC(C.git_tree_entry_id(entry)),
ObjectType(C.git_tree_entry_type(entry)),
- int(C.git_tree_entry_filemode(entry)),
+ Filemode(C.git_tree_entry_filemode(entry)),
}
}
diff --git a/vendor/libgit2 b/vendor/libgit2
-Subproject e0383fa35f981c656043976a43c61bff059cb70
+Subproject d09458f3e9f24afa0689ce90b7d419187237263