Merge pull request #351 from ezwiebel/index-remove-directory

Implement git_index_remove_directory in index wrapper
This commit is contained in:
Carlos Martín Nieto 2016-10-31 20:03:05 +01:00 committed by GitHub
commit 42a90d4e68
2 changed files with 56 additions and 0 deletions

View File

@ -278,6 +278,22 @@ func (v *Index) RemoveByPath(path string) error {
return nil
}
// RemoveDirectory removes all entries from the index under a given directory.
func (v *Index) RemoveDirectory(dir string, stage int) error {
cstr := C.CString(dir)
defer C.free(unsafe.Pointer(cstr))
runtime.LockOSThread()
defer runtime.UnlockOSThread()
ret := C.git_index_remove_directory(v.ptr, cstr, C.int(stage))
if ret < 0 {
return MakeGitError(ret)
}
return nil
}
func (v *Index) WriteTreeTo(repo *Repository) (*Oid, error) {
oid := new(Oid)

View File

@ -109,6 +109,46 @@ func TestIndexAddAndWriteTreeTo(t *testing.T) {
}
}
func TestIndexRemoveDirectory(t *testing.T) {
repo := createTestRepo(t)
defer cleanupTestRepo(t, repo)
odb, err := repo.Odb()
checkFatal(t, err)
blobID, err := odb.Write([]byte("fou\n"), ObjectBlob)
checkFatal(t, err)
idx, err := NewIndex()
checkFatal(t, err)
entryCount := idx.EntryCount()
if entryCount != 0 {
t.Fatal("Index should count 0 entry")
}
entry := IndexEntry{
Path: "path/to/LISEZ_MOI",
Id: blobID,
Mode: FilemodeBlob,
}
err = idx.Add(&entry)
checkFatal(t, err)
entryCount = idx.EntryCount()
if entryCount != 1 {
t.Fatal("Index should count 1 entry")
}
err = idx.RemoveDirectory("path", 0)
entryCount = idx.EntryCount()
if entryCount != 0 {
t.Fatal("Index should count 0 entry")
}
}
func TestIndexAddAllNoCallback(t *testing.T) {
t.Parallel()
repo := createTestRepo(t)