jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Merge pull request #123 from ry/master 

Use Filemode type in TreeEntry and IndexEntry
This commit is contained in:
Carlos Martín Nieto 2014-10-23 19:17:23 +02:00
parent 0af2a39b4e 5539137e9a
commit 41008af54c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.go
View File

@ -19,7 +19,7 @@ type Index struct {
type IndexEntry struct { type IndexEntry struct {
Ctime time.Time Ctime time.Time
Mtime time.Time Mtime time.Time
Mode uint Mode Filemode
Uid uint Uid uint
Gid uint Gid uint
Size uint Size uint
@ -34,7 +34,7 @@ func newIndexEntryFromC(entry *C.git_index_entry) *IndexEntry {
return &IndexEntry{ return &IndexEntry{
time.Unix(int64(entry.ctime.seconds), int64(entry.ctime.nanoseconds)), time.Unix(int64(entry.ctime.seconds), int64(entry.ctime.nanoseconds)),
time.Unix(int64(entry.mtime.seconds), int64(entry.mtime.nanoseconds)), time.Unix(int64(entry.mtime.seconds), int64(entry.mtime.nanoseconds)),
uint(entry.mode), Filemode(entry.mode),
uint(entry.uid), uint(entry.uid),
uint(entry.gid), uint(entry.gid),
uint(entry.file_size), uint(entry.file_size),

12
tree.go
View File

@ -17,10 +17,10 @@ type Filemode int
const ( const (
FilemodeTree Filemode = C.GIT_FILEMODE_TREE FilemodeTree Filemode = C.GIT_FILEMODE_TREE
FilemodeBlob = C.GIT_FILEMODE_BLOB FilemodeBlob Filemode = C.GIT_FILEMODE_BLOB
FilemodeBlobExecutable = C.GIT_FILEMODE_BLOB_EXECUTABLE FilemodeBlobExecutable Filemode = C.GIT_FILEMODE_BLOB_EXECUTABLE
FilemodeLink = C.GIT_FILEMODE_LINK FilemodeLink Filemode = C.GIT_FILEMODE_LINK
FilemodeCommit = C.GIT_FILEMODE_COMMIT FilemodeCommit Filemode = C.GIT_FILEMODE_COMMIT
) )
type Tree struct { type Tree struct {
@ -32,7 +32,7 @@ type TreeEntry struct {
Name string Name string
Id *Oid Id *Oid
Type ObjectType Type ObjectType
Filemode int Filemode Filemode
} }
func newTreeEntry(entry *C.git_tree_entry) *TreeEntry { 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)), C.GoString(C.git_tree_entry_name(entry)),
newOidFromC(C.git_tree_entry_id(entry)), newOidFromC(C.git_tree_entry_id(entry)),
ObjectType(C.git_tree_entry_type(entry)), ObjectType(C.git_tree_entry_type(entry)),
int(C.git_tree_entry_filemode(entry)), Filemode(C.git_tree_entry_filemode(entry)),
} }
} }