Oid: make NewOid take a string

This is the most common way of having an id that's not in Oid form, so
let's make it the "default" and rename to NewOidFromBytes() the one that
takes []byte.

2 files changed, 4 insertions, 4 deletions

diff --git a/git.go b/git.go
index 8f543b5..f3fb7e1 100644
--- a/git.go
+++ b/git.go
@@ -41,7 +41,7 @@ func newOidFromC(coid *C.git_oid) *Oid {
 	return oid
 }
 
-func NewOid(b []byte) *Oid {
+func NewOidFromBytes(b []byte) *Oid {
 	oid := new(Oid)
 	copy(oid[0:20], b[0:20])
 	return oid
@@ -51,7 +51,7 @@ func (oid *Oid) toC() *C.git_oid {
 	return (*C.git_oid)(unsafe.Pointer(oid))
 }
 
-func NewOidFromString(s string) (*Oid, error) {
+func NewOid(s string) (*Oid, error) {
 	o := new(Oid)
 	cs := C.CString(s)
 	defer C.free(unsafe.Pointer(cs))
diff --git a/odb_test.go b/odb_test.go
index a4f8943..17b3ad2 100644
--- a/odb_test.go
+++ b/odb_test.go
@@ -27,7 +27,7 @@ func TestOdbStream(t *testing.T) {
 	error = stream.Close()
 	checkFatal(t, error)
 
-	expectedId, error := NewOidFromString("30f51a3fba5274d53522d0f19748456974647b4f")
+	expectedId, error := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
 	checkFatal(t, error)
 	if stream.Id.Cmp(expectedId) != 0 {
 		t.Fatal("Wrong data written")
@@ -59,4 +59,4 @@ Initial commit.`;
 	if oid.Cmp(coid) != 0 {
 		t.Fatal("Hash and write Oids are different")
 	}
-}
\ No newline at end of file
+}