From 4a5723de2d57ff5c206bc3cffad63a70799c95a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Geisendo=CC=88rfer?= <felix@debuggable.com>
Date: Fri, 20 Feb 2015 10:12:54 +0100
Subject: [PATCH] ParseId -> ParseID

---
 format.go | 6 +++---
 repo.go   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/format.go b/format.go
index 967d67c..0c0a1c1 100644
--- a/format.go
+++ b/format.go
@@ -94,7 +94,7 @@ func (f *defaultFormat) DecodeTree(r io.Reader) (Tree, error) {
 			return nil, err
 		} else if id, err := b.ReadString(' '); err != nil {
 			return nil, err
-		} else if id, err := ParseId(id[:len(id)-1]); err != nil {
+		} else if id, err := ParseID(id[:len(id)-1]); err != nil {
 			return nil, err
 		} else if nameLen, err := b.ReadString(' '); err != nil {
 			return nil, err
@@ -154,13 +154,13 @@ fields:
 			field = field[:len(field)-1]
 			switch field {
 			case "tree":
-				if id, err := ParseId(val); err != nil {
+				if id, err := ParseID(val); err != nil {
 					return commit, err
 				} else {
 					commit.Tree = id
 				}
 			case "parent":
-				if id, err := ParseId(val); err != nil {
+				if id, err := ParseID(val); err != nil {
 					return commit, err
 				} else {
 					commit.Parents = append(commit.Parents, id)
diff --git a/repo.go b/repo.go
index 5dbfd06..88e4cc3 100644
--- a/repo.go
+++ b/repo.go
@@ -32,7 +32,7 @@ type Repo interface {
 }
 
 // ParseID parses the given hex id string into an ID, or returns an error.
-func ParseId(id string) (ID, error) {
+func ParseID(id string) (ID, error) {
 	if id == "" {
 		return nil, nil
 	} else if d, err := hex.DecodeString(id); err != nil {
@@ -44,7 +44,7 @@ func ParseId(id string) (ID, error) {
 
 // MustID returns the ID for the given hex id, or panics on error.
 func MustID(id string) ID {
-	r, err := ParseId(id)
+	r, err := ParseID(id)
 	if err != nil {
 		panic(err)
 	}